diff options
| author | davidovski <david@davidovski.xyz> | 2022-03-06 22:34:39 +0000 |
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-03-06 22:34:39 +0000 |
| commit | 3602ce227f784f1c6233ef6ad3cd8f5ccad28e66 (patch) | |
| tree | 61c86a7d065c0e15519ce810636b42197ce3f2c1 /repo/devel | |
| parent | 75e7bb9c72d562d397f9fb62072ab114cfbc6244 (diff) | |
added patches for rustc
Diffstat (limited to 'repo/devel')
| -rw-r--r-- | repo/devel/clang.xibuild | 3 | ||||
| -rw-r--r-- | repo/devel/llvm.xibuild | 8 | ||||
| -rw-r--r-- | repo/devel/rustc.xibuild | 21 |
3 files changed, 11 insertions, 21 deletions
diff --git a/repo/devel/clang.xibuild b/repo/devel/clang.xibuild index c729c9a..8b9c9b0 100644 --- a/repo/devel/clang.xibuild +++ b/repo/devel/clang.xibuild @@ -1,6 +1,6 @@ #!/bin/sh -MAKEDEPS="cmake llvm libxml2 ninja python3" +MAKEDEPS="cmake llvm libxml2 ninja python3 python-markupsafe" DEPS="curl gcc libssh2 openssl" PKG_VER=13.0.1 @@ -27,7 +27,6 @@ build () { python_version=$(python3 -V | sed 's/.*\([0-9]\{1,\}\.[0-9]\{1,\}\)\..*/\1/') - cmake .. -G Ninja -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_FLAGS_RELEASE_INIT="$CFLAGS -O2" \ diff --git a/repo/devel/llvm.xibuild b/repo/devel/llvm.xibuild index 82496a4..f1eaf13 100644 --- a/repo/devel/llvm.xibuild +++ b/repo/devel/llvm.xibuild @@ -35,6 +35,7 @@ build () { -DLLVM_ENABLE_ZLIB=ON \ -DLLVM_HOST_TRIPLE="x86_64-linux-musl" \ -DLLVM_INCLUDE_EXAMPLES=OFF \ + -DLLVM_INSTALL_UTILS=ON \ -DLLVM_LINK_LLVM_DYLIB=ON \ -DLLVM_APPEND_VC_REV=OFF \ -Wno-dev -G Ninja .. && @@ -50,11 +51,4 @@ package () { cd build python3 ../utils/lit/setup.py install --prefix=/usr --root=$PKG_DEST - - mkdir $PKG_DEST/usr/bin - for path in bin/*; do - name=${path##*/} - ln -s ../lib/llvm/bin/$name $PKG_DEST/usr/bin/$name - done - } diff --git a/repo/devel/rustc.xibuild b/repo/devel/rustc.xibuild index 9667aa3..bab5553 100644 --- a/repo/devel/rustc.xibuild +++ b/repo/devel/rustc.xibuild @@ -8,7 +8,14 @@ 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 + patches/rustc/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch + patches/rustc/0007-do-not-install-libunwind-source.patch + patches/rustc/install-template-shebang.patch + patches/rustc/link-musl-dynamically.patch + patches/rustc/musl-fix-linux_musl_base.patch + patches/rustc/need-rpath.patch + patches/rustc/need-ssp_nonshared.patch + patches/rustc/need-ssp_nonshared.patch " prepare () { @@ -17,23 +24,13 @@ prepare () { 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" - - #sed -i "s/$checksum_before/$checksum_after/g" vendor/openssl-sys/.cargo-checksum.json - } build () { export RUSTFLAGS="$RUSTFLAGS -C link-arg=-lffi" && target=x86_64-unknown-linux-musl build=x86_64-unknown-linux-musl - ./configure \ + CFLAGS="-fPIE" CXXFLAGS="-fPIE" ./configure \ --build="$build" \ --host="$target" \ --target="$target" \ |