diff options
Diffstat (limited to 'repo/devel')
| -rw-r--r-- | repo/devel/gcc.xibuild | 22 | ||||
| -rw-r--r-- | repo/devel/rustc.xibuild | 23 |
2 files changed, 25 insertions, 20 deletions
diff --git a/repo/devel/gcc.xibuild b/repo/devel/gcc.xibuild index bceb9c2..18b6e2e 100644 --- a/repo/devel/gcc.xibuild +++ b/repo/devel/gcc.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="grep make dejagnu inetutils" +MAKEDEPS="grep make dejagnu inetutils flex" DEPS="musl binutils mpc mpfr gmp" PKG_VER=11.2.0 @@ -19,10 +19,8 @@ ADDITIONAL=" $PATCH_SRC/0007-Enable-Wtrampolines-by-default.patch $PATCH_SRC/0009-Ensure-that-msgfmt-doesn-t-encounter-problems-during.patch $PATCH_SRC/0010-Don-t-declare-asprintf-if-defined-as-a-macro.patch - $PATCH_SRC/0011-libiberty-copy-PIC-objects-during-build-process.patch $PATCH_SRC/0012-libitm-disable-FORTIFY.patch $PATCH_SRC/0013-libgcc_s.patch - $PATCH_SRC/0014-nopie.patch $PATCH_SRC/0015-libffi-use-__linux__-instead-of-__gnu_linux__-for-mu.patch $PATCH_SRC/0016-dlang-update-zlib-binding.patch $PATCH_SRC/0017-dlang-fix-fcntl-on-mips-add-libucontext-dep.patch @@ -79,11 +77,8 @@ prepare () { tar xf isl-$ISL_VER.tar.xz mv isl-$ISL_VER isl - - for p in *.patch; do - patch -Np1 -i $p || true - done - + + apply_patches } build () { @@ -115,7 +110,6 @@ build () { export FON+="--enable-tls " export FON+="--enable-libstdcxx-time " export FON+="--enable-fully-dynamic-string " - export FON+="--enable-default-pie " export FON+="--enable-default-ssp " export FON+="--enable-linker-build-id " export FON+="--enable-checking=release " @@ -137,9 +131,9 @@ build () { make && cd .. && - cc -fpie getent.c -o getent && - cc -fpie getconf.c -o getconf && - cc -fpie iconv.c -o iconv + cc getent.c -o getent && + cc getconf.c -o getconf && + cc iconv.c -o iconv } check () { @@ -177,5 +171,9 @@ package () { mkdir -p $PKG_DEST/usr/share/gdb/auto-load/usr/lib #mv $PKG_DEST/usr/lib/*gdb.py $PKG_DEST/usr/share/gdb/auto-load/usr/lib + for p in gcov gcc-ar gcc gcc-ranlib c++ g++ gcc-nm lto-dump gcov-tools gcov-dump cpp; do + ln -s $TRUPLE-$p $PKG_DEST/usr/bin/$p + done + } diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild index d8cebf5..1e4df28 100644 --- a/repo/devel/rustc.xibuild +++ b/repo/devel/rustc.xibuild @@ -7,18 +7,25 @@ PKG_VER=1.58.1 SOURCE=https://static.rust-lang.org/dist/rustc-$PKG_VER-src.tar.gz DESC="Systems programming language focused on safety, speed and concurrency" +ADDITIONAL=" + https://git.alpinelinux.org/aports/plain/community/rust/link-musl-dynamically.patch +" + prepare () { + + apply_patches + mkdir -p $PKG_DEST/opt/rustc-$PKG_VER && ln -sf rustc-$PKG_VER $PKG_DEST/opt/rustc - openssl_file=vendor/openssl-sys/build/main.rs - checksum_before=$(sha256sum $openssl_file | cut -d' ' -f1) - sed -i "240i (3, 4, _) => ('3', '4', 'x')," $openssl_file - checksum_after=$(sha256sum $openssl_file | cut -d' ' -f1) - echo "checksum before: $checksum_before" - echo "checksum after: $checksum_after" + #openssl_file=vendor/openssl-sys/build/main.rs + #checksum_before=$(sha256sum $openssl_file | cut -d' ' -f1) + #sed -i "240i (3, 4, _) => ('3', '4', 'x')," $openssl_file + #checksum_after=$(sha256sum $openssl_file | cut -d' ' -f1) + #echo "checksum before: $checksum_before" + #echo "checksum after: $checksum_after" - sed -i "s/$checksum_before/$checksum_after/g" vendor/openssl-sys/.cargo-checksum.json + #sed -i "s/$checksum_before/$checksum_after/g" vendor/openssl-sys/.cargo-checksum.json } @@ -43,7 +50,7 @@ build () { --set="rust.musl-root=/usr" \ --set="rust.codegen-units=1" \ --set="rust.codegen-units-std=1" \ - --set="rust.parallel-compiler=false" \ + --set="rust.parallel-compiler=true" \ --set="target.$target.llvm-config=/usr/bin/llvm-config" \ --set="target.$target.musl-root=/usr" \ --set="target.$target.crt-static=false" \ |