kernelpanic/iglunix
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

lots of package moving

Browse source
This commit is contained in:
Ella-0 2021-10-25 11:26:07 +00:00
parent b3fa8f77d8
commit 5c6531dc76
21 changed files with 0 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
base/go/build.sh
View file

@ -1,32 +0,0 @@
pkgname=go
pkgver=1.16
# TODO(Ella): should be loaded from `/etc/iglupkg.d/go.conf`
GOROOT_BOOTSTRAP=/usr/lib/go
fetch() {
curl -L "https://golang.org/dl/go${pkgver/_/}.src.tar.gz" -o $pkgname-$pkgver.tar.xz
tar -xf $pkgname-$pkgver.tar.xz
mv go go-$pkgver
}
build() {
cd $pkgname-$pkgver
cd src
GOROOT_BOOTSTRAP=/usr/lib/go ./make.bash
}
package() {
cd $pkgname-$pkgver
install -d $pkgdir/usr/bin
install -d $pkgdir/usr/lib/go
cp -a bin pkg src lib misc api test $pkgdir/usr/lib/go
ln -sr $pkgdir/usr/lib/go/bin/go $pkgdir/usr/bin/go
ln -sr $pkgdir/usr/lib/go/bin/gofmt $pkgdir/usr/bin/gofmt
}
license() {
cd $pkgname-$pkgver
cat LICENSE
}

28
base/libexecinfo/build.sh
View file

@ -1,28 +0,0 @@
pkgname=libexecinfo
pkgver=20180201
fetch() {
curl -L "https://github.com/resslinux/libexecinfo/archive/refs/tags/v$pkgver.tar.gz" -o $pkgname-$pkgver.tar.xz
tar -xf $pkgname-$pkgver.tar.xz
}
build() {
cd $pkgname-$pkgver
./configure \
--prefix=/usr \
--build=$TRIPLE \
--host=$TRIPLE
make
}
package() {
cd $pkgname-$pkgver
make install DESTDIR=$pkgdir
}
license() {
cd $pkgname-$pkgver
cat LICENSE
# cat COPYING
}

28
base/openpam/build.sh
View file

@ -1,28 +0,0 @@
pkgname=openpam
pkgver=20190224
fetch() {
curl "https://www.openpam.org/downloads/38" -o $pkgname-$pkgver.tar.xz
tar -xf $pkgname-$pkgver.tar.xz
}
build() {
cd $pkgname-$pkgver
./configure \
--prefix=/usr \
--build=$TRIPLE \
--host=$TRIPLE
make
}
package() {
cd $pkgname-$pkgver
make install DESTDIR=$pkgdir
}
license() {
cd $pkgname-$pkgver
cat LICENSE
# cat COPYING
}

22
base/pfetch/build.sh
View file

@ -1,22 +0,0 @@
pkgname=pfetch
pkgver=master
fetch() {
curl -L "https://github.com/dylanaraps/pfetch/archive/refs/heads/$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
tar -xf $pkgname-$pkgver.tar.gz
}
build() {
cd $pkgname-$pkgver
echo "Nothing to do"
}
package() {
cd $pkgname-$pkgver
install -Dm755 pfetch $pkgdir/usr/bin/
}
license() {
cd $pkgname-$pkgver
cat LICENSE.md
}

10
base/rust/abyss-install-template-shebang.patch
View file

@ -1,10 +0,0 @@
The script seems to be POSIX-sh (+ local) compatible.
--- a/src/tools/rust-installer/install-template.sh
+++ b/src/tools/rust-installer/install-template.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
# file at the top-level directory of this distribution and at
# http://rust-lang.org/COPYRIGHT.

38
base/rust/abyss-libunwind.patch
View file

@ -1,38 +0,0 @@
diff --git a/library/unwind/build.rs b/library/unwind/build.rs
index 24bcd40c..51777664 100644
--- a/library/unwind/build.rs
+++ b/library/unwind/build.rs
@@ -19,7 +19,7 @@
} else if target.contains("linux") {
// linking for Linux is handled in lib.rs
if target.contains("musl") {
- llvm_libunwind::compile();
+ println!("cargo:rustc-link-lib=unwind");
} else if target.contains("android") {
let build = cc::Build::new();
diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs
index dbdefa47..dca1897b 100644
--- a/library/unwind/src/lib.rs
+++ b/library/unwind/src/lib.rs
@@ -39,7 +39,7 @@ cfg_if::cfg_if! {
#[cfg(target_env = "musl")]
#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))]
-#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
+#[link(name = "unwind", cfg(not(target_feature = "crt-static")))]
extern "C" {}
// When building with crt-static, we get `gcc_eh` from the `libc` crate, since
diff -Naur rustc-1.48.0-src.orig/src/bootstrap/dist.rs rustc-1.48.0-src/src/bootstrap/dist.rs
--- rustc-1.48.0-src.orig/src/bootstrap/dist.rs 2020-12-22 16:39:30.504249113 +0100
+++ rustc-1.48.0-src/src/bootstrap/dist.rs 2020-12-22 16:42:08.663006830 +0100
@@ -1016,7 +1016,7 @@
copy_src_dirs(
builder,
&builder.src,
- &["library", "src/llvm-project/libunwind"],
+ &["library"],
&[
// not needed and contains symlinks which rustup currently
// chokes on when unpacking.

11
base/rust/alpine-crt.patch
View file

@ -1,11 +0,0 @@
--- a/compiler/rustc_target/src/spec/linux_musl_base.rs
+++ b/compiler/rustc_target/src/spec/linux_musl_base.rs
@@ -10,7 +10,7 @@
base.crt_objects_fallback = Some(CrtObjectsFallback::Musl);
// These targets statically link libc by default
- base.crt_static_default = true;
+ base.crt_static_default = false;
base
}

23
base/rust/alpine-move-py.patch
View file

@ -1,23 +0,0 @@
--- a/src/etc/rust-gdb
+++ b/src/etc/rust-gdb
@@ -12,7 +12,7 @@
# Find out where the pretty printer Python module is
RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
-GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust/etc"
# Run GDB with the additional arguments that load the pretty printers
# Set the environment variable `RUST_GDB` to overwrite the call to a
# Set the environment variable `RUST_GDB` to overwrite the call to a
--- a/src/etc/rust-lldb
+++ b/src/etc/rust-lldb
@@ -8,7 +8,7 @@
# Find out where to look for the pretty printer Python module
RUSTC_SYSROOT=$(rustc --print sysroot)
-RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
+RUST_LLDB="$RUSTC_SYSROOT/share/rust/etc"
lldb=lldb
if [ -f "$RUST_LLDB" ]; then

104
base/rust/build.sh
View file

@ -1,104 +0,0 @@
# Based on Abyss OS phase1/devel/rust APKBUILD:
#
# Copyright (c) 2019 by the Abyss Authors
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
pkgname=rust
pkgver=beta
_clear_vendor_checksums() {
sed -i 's/\("files":{\)[^}]*/\1/' vendor/$1/.cargo-checksum.json
}
# export RUSTROOT="/usr"
export RUSTROOT="/usr/src/rust-bootstrap/build/rust-root"
fetch() {
curl "https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz" -o $pkgname-$pkgver.tar.xz
tar -xf $pkgname-$pkgver.tar.xz
mv rustc-$pkgver-src $pkgname-$pkgver
cp ../*.patch .
cd $pkgname-$pkgver
patch -p1 < ../alpine-move-py.patch
patch -p1 < ../abyss-install-template-shebang.patch
patch -p1 < ../alpine-crt.patch
patch -p1 < ../libexec.patch
patch -p1 < ../llvm_crt.patch
patch -p1 < ../unfreeze.patch
patch -p1 < ../libresslssl.patch
sed -i /LD_LIBRARY_PATH/d src/bootstrap/bootstrap.py
_clear_vendor_checksums libc
_clear_vendor_checksums openssl-sys
_clear_vendor_checksums openssl-src
_clear_vendor_checksums openssl
cd ..
}
build() {
cd $pkgname-$pkgver
OPENSSL_LIB_DIR=/usr/lib/ ./configure \
--build="$TRIPLE" \
--host="$TRIPLE" \
--target="$TRIPLE" \
--prefix="/usr" \
--musl-root="/usr" \
--release-channel="beta" \
--enable-local-rust \
--local-rust-root=$RUSTROOT \
--disable-docs \
--enable-extended \
--tools="cargo,rls,rustfmt,src" \
--enable-vendor \
--disable-locked-deps \
--enable-option-checking \
--python="python" \
--llvm-root="/usr" \
--llvm-libunwind="system" \
--enable-llvm-link-shared \
--set="target.$TRIPLE.llvm-config=/usr/bin/llvm-config" \
--set="rust.musl-root=/usr" \
--set="target.$TRIPLE.musl-root=/usr" \
--set="target.$TRIPLE.crt-static=false" \
--set="target.$TRIPLE.cc=cc" \
--set="target.$TRIPLE.cxx=c++" \
--set="target.$TRIPLE.ar=ar" \
--set="target.$TRIPLE.linker=cc" \
--set="target.$TRIPLE.crt-static=false" \
--set="target.$TRIPLE.cc=cc" \
--set="target.$TRIPLE.cxx=c++" \
--set="target.$TRIPLE.ar=ar" \
--set="target.$TRIPLE.linker=cc"
sed 's/#deny-warnings = .*/deny-warnings = false/' -i config.toml
# sed 's|deny(warnings,|deny(|' -i src/bootstrap/lib.rs
./x.py build
}
package() {
cd $pkgname-$pkgver
DESTDIR="$pkgdir" ./x.py install
}
license() {
cd $pkgname-$pkgver
cat LICENSE-MIT
# cat COPYING
}

22
base/rust/libexec.patch
View file

@ -1,22 +0,0 @@
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -980,7 +980,7 @@
for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
let dirent = dirent.expect("read dir entry");
if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
- tarball.add_file(&dirent.path(), "libexec", 0o755);
+ tarball.add_file(&dirent.path(), "lib", 0o755);
}
}
--- a/src/tools/cargo/src/cargo/ops/registry/auth.rs
+++ b/src/tools/cargo/src/cargo/ops/registry/auth.rs
@@ -223,7 +223,7 @@
.parent()
.and_then(|p| p.parent())
.ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?;
- let exe = root.join("libexec").join(format!(
+ let exe = root.join("lib").join(format!(
"cargo-credential-{}{}",
cred_name,
std::env::consts::EXE_SUFFIX

10
base/rust/libressl.patch
View file

@ -1,10 +0,0 @@
--- a/vendor/openssl-sys/build/main.rs
+++ b/vendor/openssl-sys/build/main.rs
@@ -232,6 +232,7 @@
(3, 2, _) => ('3', '2', 'x'),
(3, 3, 0) => ('3', '3', '0'),
(3, 3, 1) => ('3', '3', '1'),
+ (3, 3, 2) => ('3', '3', '2'),
_ => version_error(),
};

45
base/rust/llvm_crt.patch
View file

@ -1,45 +0,0 @@
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -185,7 +185,7 @@
// to using gcc from a glibc-targeting toolchain for linking.
// To do that we have to distribute musl startup objects as a part of Rust toolchain
// and link with them manually in the self-contained mode.
- if target.contains("musl") {
+ if false {
let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple)
});
--- a/compiler/rustc_target/src/spec/crt_objects.rs
+++ b/compiler/rustc_target/src/spec/crt_objects.rs
@@ -64,24 +64,17 @@
pub(super) fn pre_musl_fallback() -> CrtObjects {
new(&[
- (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
- (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o", "crtbeginS.o"]),
- (LinkOutputKind::StaticNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
- (LinkOutputKind::StaticPicExe, &["rcrt1.o", "crti.o", "crtbeginS.o"]),
- (LinkOutputKind::DynamicDylib, &["crti.o", "crtbeginS.o"]),
- (LinkOutputKind::StaticDylib, &["crti.o", "crtbeginS.o"]),
+ (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o"]),
+ (LinkOutputKind::DynamicPicExe, &["Scrt1.o", "crti.o"]),
+ (LinkOutputKind::StaticNoPicExe, &["crt1.o", "crti.o"]),
+ (LinkOutputKind::StaticPicExe, &["rcrt1.o", "crti.o"]),
+ (LinkOutputKind::DynamicDylib, &["crti.o"]),
+ (LinkOutputKind::StaticDylib, &["crti.o"]),
])
}
pub(super) fn post_musl_fallback() -> CrtObjects {
- new(&[
- (LinkOutputKind::DynamicNoPicExe, &["crtend.o", "crtn.o"]),
- (LinkOutputKind::DynamicPicExe, &["crtendS.o", "crtn.o"]),
- (LinkOutputKind::StaticNoPicExe, &["crtend.o", "crtn.o"]),
- (LinkOutputKind::StaticPicExe, &["crtendS.o", "crtn.o"]),
- (LinkOutputKind::DynamicDylib, &["crtendS.o", "crtn.o"]),
- (LinkOutputKind::StaticDylib, &["crtendS.o", "crtn.o"]),
- ])
+ all("crtn.o")
}
pub(super) fn pre_mingw_fallback() -> CrtObjects {

23
base/rust/unfreeze.patch
View file

@ -1,23 +0,0 @@
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -889,8 +889,6 @@
args.append("--verbose")
if self.use_locked_deps:
args.append("--locked")
- if self.use_vendored_sources:
- args.append("--frozen")
run(args, env=env, verbose=self.verbose)
def build_triple(self):
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -1459,9 +1459,6 @@
if self.config.locked_deps {
cargo.arg("--locked");
}
- if self.config.vendor || self.is_sudo {
- cargo.arg("--frozen");
- }
// Try to use a sysroot-relative bindir, in case it was configured absolutely.
cargo.env("RUSTC_INSTALL_BINDIR", self.config.bindir_relative());

65
base/rust/vendored-ssl.patch
View file

@ -1,65 +0,0 @@
--- a/vendor/openssl-sys/Cargo.toml
+++ b/vendor/openssl-sys/Cargo.toml
@@ -33,12 +33,11 @@
[build-dependencies.openssl-src]
version = "111.0.1"
-optional = true
[build-dependencies.pkg-config]
version = "0.3.9"
[features]
-vendored = ["openssl-src"]
+vendored = []
[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
version = "0.2.8"
Only in ../../rust-1.49.0/vendor/openssl-sys: Cargo.toml.1
--- a/vendor/openssl-sys/build/main.rs
+++ b/vendor/openssl-sys/build/main.rs
@@ -2,7 +2,6 @@
extern crate autocfg;
extern crate cc;
-#[cfg(feature = "vendored")]
extern crate openssl_src;
extern crate pkg_config;
#[cfg(target_env = "msvc")]
@@ -16,7 +15,6 @@
mod cfgs;
mod find_normal;
-#[cfg(feature = "vendored")]
mod find_vendored;
enum Version {
@@ -44,15 +42,14 @@
}
fn find_openssl(target: &str) -> (PathBuf, PathBuf) {
- #[cfg(feature = "vendored")]
{
// vendor if the feature is present, unless
// OPENSSL_NO_VENDOR exists and isn't `0`
- if env("OPENSSL_NO_VENDOR").map_or(true, |s| s == "0") {
+ //if env("OPENSSL_NO_VENDOR").map_or(true, |s| s == "0") {
return find_vendored::get_openssl(target);
- }
+ //}
}
- find_normal::get_openssl(target)
+ //find_normal::get_openssl(target)
}
fn main() {
--- a/vendor/openssl-src/src/lib.rs
+++ b/vendor/openssl-src/src/lib.rs
@@ -58,7 +58,7 @@
{
Command::new("gmake")
} else {
- Command::new("make")
+ Command::new("gmake")
}
}

40
base/zig/build.sh
View file

@ -1,40 +0,0 @@
pkgname=zig
pkgver=0.8.0
fetch() {
curl "https://ziglang.org/download/$pkgver/zig-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.gz
tar -xf $pkgname-$pkgver.tar.gz
mkdir $pkgname-$pkgver/build
cp ../llvm-req-arch.patch .
cd $pkgname-$pkgver
patch -p1 < ../llvm-req-arch.patch
}
build() {
cd $pkgname-$pkgver
cd build
cmake -G Ninja ../ \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib
samu
}
package() {
cd $pkgname-$pkgver
cd build
DESTDIR=$pkgdir samu install
rm -rf $pkgdir/usr/lib/zig/libc/glibc
rm -rf $pkgdir/usr/lib/zig/libc/mingw
rm -rf $pkgdir/usr/lib/zig/libc/wasi
rm -rf $pkgdir/usr/lib/zig/libc/include/*gnu*
rm -rf $pkgdir/usr/lib/zig/libc/include/*glibc*
rm -rf $pkgdir/usr/lib/zig/libc/include/*windows*
}
license() {
cd $pkgname-$pkgver
cat LICENSE
# cat COPYING
}

25
base/zig/llvm-req-arch.patch
View file

@ -1,25 +0,0 @@
--- a/cmake/Findllvm.cmake
+++ b/cmake/Findllvm.cmake
@@ -107,22 +107,8 @@
endif()
endfunction(NEED_TARGET)
NEED_TARGET("AArch64")
- NEED_TARGET("AMDGPU")
- NEED_TARGET("ARM")
- NEED_TARGET("AVR")
- NEED_TARGET("BPF")
- NEED_TARGET("Hexagon")
- NEED_TARGET("Lanai")
- NEED_TARGET("Mips")
- NEED_TARGET("MSP430")
- NEED_TARGET("NVPTX")
- NEED_TARGET("PowerPC")
NEED_TARGET("RISCV")
- NEED_TARGET("Sparc")
- NEED_TARGET("SystemZ")
- NEED_TARGET("WebAssembly")
NEED_TARGET("X86")
- NEED_TARGET("XCore")
if(ZIG_STATIC_LLVM)
execute_process(