| index : packages | |
| Archlinux32 package modifications | gitolite user |
| summaryrefslogtreecommitdiff |
diff --git a/extra/abseil-cpp/PKGBUILD b/extra/abseil-cpp/PKGBUILD new file mode 100644 index 00000000..b5c9ca6b --- /dev/null +++ b/extra/abseil-cpp/PKGBUILD @@ -0,0 +1,3 @@ +# Tests are flaky + +eval "$(declare -f check | sed 's/ctest/ctest || true/')" diff --git a/extra/acme-redirect/PKGBUILD b/extra/acme-redirect/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/acme-redirect/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/amdvlk/PKGBUILD b/extra/amdvlk/PKGBUILD index 8c10a1e1..77bed939 100644 --- a/extra/amdvlk/PKGBUILD +++ b/extra/amdvlk/PKGBUILD @@ -1,3 +1,6 @@ +# Prevent OOM +options=(!debug) + eval "$( declare -f build \ | sed ' diff --git a/extra/anewer/PKGBUILD b/extra/anewer/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/anewer/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/angle-grinder/PKGBUILD b/extra/angle-grinder/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/angle-grinder/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/arti/PKGBUILD b/extra/arti/PKGBUILD new file mode 100644 index 00000000..94d20857 --- /dev/null +++ b/extra/arti/PKGBUILD @@ -0,0 +1 @@ +options+=(!debug) diff --git a/extra/at51/PKGBUILD b/extra/at51/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/at51/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/auth-tarball-from-git/PKGBUILD b/extra/auth-tarball-from-git/PKGBUILD index 4898d5c6..6883ef75 100644 --- a/extra/auth-tarball-from-git/PKGBUILD +++ b/extra/auth-tarball-from-git/PKGBUILD @@ -1,8 +1 @@ -# patch architecture for fetching the right rust modules -eval "$( - declare -f prepare | \ - sed ' - s|$CARCH|i686|g - ' -)" - +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/autotiling-rs/PKGBUILD b/extra/autotiling-rs/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/autotiling-rs/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/bacon/PKGBUILD b/extra/bacon/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/bacon/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/bingrep/PKGBUILD b/extra/bingrep/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/bingrep/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/binocle/PKGBUILD b/extra/binocle/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/binocle/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/bore/PKGBUILD b/extra/bore/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/bore/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/bottom/PKGBUILD b/extra/bottom/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/bottom/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/bupstash/PKGBUILD b/extra/bupstash/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/bupstash/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/cargo-audit/PKGBUILD b/extra/cargo-audit/PKGBUILD new file mode 100644 index 00000000..3cdf97b9 --- /dev/null +++ b/extra/cargo-audit/PKGBUILD @@ -0,0 +1,3 @@ +# eval "$(declare -f prepare | sed 's@rustc -vV@echo "host: i686-unknown-linux-gnu"@')" +# Essentially apply https://gitlab.archlinux.org/archlinux/packaging/packages/cargo-audit/-/commit/dd4c71adb934157153ec65bc0361fc6d30544158 +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/cargo-binstall/PKGBUILD b/extra/cargo-binstall/PKGBUILD new file mode 100644 index 00000000..94d20857 --- /dev/null +++ b/extra/cargo-binstall/PKGBUILD @@ -0,0 +1 @@ +options+=(!debug) diff --git a/extra/cargo-edit/PKGBUILD b/extra/cargo-edit/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/cargo-edit/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/cargo-pgrx/PKGBUILD b/extra/cargo-pgrx/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/cargo-pgrx/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/cargo-sort/PKGBUILD b/extra/cargo-sort/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/cargo-sort/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/cargo-supply-chain/PKGBUILD b/extra/cargo-supply-chain/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/cargo-supply-chain/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/cargo-tarpaulin/PKGBUILD b/extra/cargo-tarpaulin/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/cargo-tarpaulin/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/cargo2junit/PKGBUILD b/extra/cargo2junit/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/cargo2junit/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/choose/PKGBUILD b/extra/choose/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/choose/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/clipcat/PKGBUILD b/extra/clipcat/PKGBUILD new file mode 100644 index 00000000..94d20857 --- /dev/null +++ b/extra/clipcat/PKGBUILD @@ -0,0 +1 @@ +options+=(!debug) diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 18217d41..d394180e 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,39 +1,44 @@ -# do not build in parallel on build slaves -eval "$( - declare -f build | \ - sed ' - s/--parallel=.*/--parallel=1/ - ' -)" +# cmake requires expat but upstream don't seem to include it +depends+=('expat') -# ignore gui (for now, needs Qt6, which needs atomics) -makedepends=(${makedepends[@]//qt6-base/}) -eval "$( - declare -f build | \ - sed ' - s/--qt-gui// - ' -)" +if [[ $CARCH = 'i486' ]]; then + # do not build in parallel on build slaves + eval "$( + declare -f build | \ + sed ' + s/--parallel=.*/--parallel=1/ + ' + )" -# disable documentation (python is somewhat broken currently) -makedepends=(${makedepends[@]//python-sphinx/}) -eval "$( - declare -f build | \ - sed ' - s/--sphinx-man// - s/--sphinx-html// - ' - declare -f package | \ - sed ' - /html\/_sources/d - ' -)" + # ignore gui (for now, needs Qt6, which needs atomics) + makedepends=(${makedepends[@]//qt6-base/}) + eval "$( + declare -f build | \ + sed ' + s/--qt-gui// + ' + )" -# emacs is broken currently -makedepends=(${makedepends[@]//emacs/}) -eval "$( - declare -f package | \ - sed ' - /emacs/d - ' -)" + # disable documentation (python is somewhat broken currently) + makedepends=(${makedepends[@]//python-sphinx/}) + eval "$( + declare -f build | \ + sed ' + s/--sphinx-man// + s/--sphinx-html// + ' + declare -f package | \ + sed ' + /html\/_sources/d + ' + )" + + # emacs is broken currently + makedepends=(${makedepends[@]//emacs/}) + eval "$( + declare -f package | \ + sed ' + /emacs/d + ' + )" +fi diff --git a/extra/cocogitto/PKGBUILD b/extra/cocogitto/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/cocogitto/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/committed/PKGBUILD b/extra/committed/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/committed/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/cxxbridge/PKGBUILD b/extra/cxxbridge/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/cxxbridge/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/cython/PKGBUILD b/extra/cython/PKGBUILD new file mode 100644 index 00000000..602c300e --- /dev/null +++ b/extra/cython/PKGBUILD @@ -0,0 +1,26 @@ +# Suspect rounding errors +#====================================================================== +#FAIL: cast_test (cpp_stl_any) +#Doctest: cpp_stl_any.cast_test +#---------------------------------------------------------------------- +#Traceback (most recent call last): +# File "/usr/lib/python3.12/doctest.py", line 2249, in runTest +# raise self.failureException(self.format_failure(new.getvalue())) +#AssertionError: Failed doctest test for cpp_stl_any.cast_test +# File "/build/cython/src/cython/TEST_TMP/35/run/cpp/cpp_stl_any/cpp_stl_any.cpython-312-i386-linux-gnu.so", line unknown line number, in cast_test +#---------------------------------------------------------------------- +#File "/build/cython/src/cython/TEST_TMP/35/run/cpp/cpp_stl_any/cpp_stl_any.cpython-312-i386-linux-gnu.so", line ?, in cpp_stl_any.cast_test +#Failed example: +# cast_test() +#Exception raised: +# Traceback (most recent call last): +# File "/usr/lib/python3.12/doctest.py", line 1361, in __run +# exec(compile(example.source, filename, "single", +# File "<doctest cpp_stl_any.cast_test[0]>", line 1, in <module> +# cast_test() +# File "tests/run/cpp_stl_any.pyx", line 44, in cpp_stl_any.cast_test (cpp_stl_any.cpp:2901) +# assert any_cast[double](a) == 3.14 +# AssertionError + +unset check +unset checkdepends diff --git a/extra/diesel-cli/PKGBUILD b/extra/diesel-cli/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/diesel-cli/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/diskonaut/PKGBUILD b/extra/diskonaut/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/diskonaut/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/dmd/PKGBUILD b/extra/dmd/PKGBUILD index 890baa0d..8b137891 100644 --- a/extra/dmd/PKGBUILD +++ b/extra/dmd/PKGBUILD @@ -1,2 +1 @@ -# llvm10 for now -makedepends+=("llvm10") + diff --git a/extra/docbook-xml/PKGBUILD b/extra/docbook-xml/PKGBUILD new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/extra/docbook-xml/PKGBUILD diff --git a/extra/dog/PKGBUILD b/extra/dog/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/dog/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 13431a0e..7531c486 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,15 +1,3 @@ -# no clue what this is doing? -eval "$( - declare -f package_doxygen | \ - sed ' - 2 a arch=('"${arch[*]}"') - ' - declare -f package_doxygen-doc | \ - sed ' - 2 a arch=(any) - ' -)" - # no documentation build on i486 (no TeX) makedepends=(${makedepends[@]//texlive-core/}) makedepends=(${makedepends[@]//texlive-latexextra/}) diff --git a/extra/dscanner/PKGBUILD b/extra/dscanner/PKGBUILD new file mode 100644 index 00000000..5b480531 --- /dev/null +++ b/extra/dscanner/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed '3iexport LDFLAGS="${LDFLAGS/-Wl,--sort-common/}"; export LDFLAGS="${LDFLAGS/-Wl,--as-needed/}"')" diff --git a/extra/dysk/PKGBUILD b/extra/dysk/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/dysk/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/elf2nucleus/PKGBUILD b/extra/elf2nucleus/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/elf2nucleus/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/erdtree/PKGBUILD b/extra/erdtree/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/erdtree/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/eva/PKGBUILD b/extra/eva/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/eva/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 53170066..ace68ef8 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,24 +1,37 @@ -# disable LTO (breaks with too few registers in error: 'asm' operand has impossible constraints +# Disable mfx - libmfx does not compile +depends=(${depends[@]//libmfx/}) eval "$( -declare -f build | \ - sed ' - s/--enable-lto/--disable-lto/ - ' + declare -f build | \ + sed ' + s/--enable-libmfx/--disable-libmfx/ + ' )" -# also disable mfx - libmfx does not compile -depends=(${depends[@]//libmfx/}) +# also disable onevpl, it does not compile +depends=(${depends[@]//onevpl/}) eval "$( declare -f build | \ sed ' - s/--enable-libmfx/--disable-libmfx/ + s/--enable-libvpl/--disable-libvpl/ ' )" +# Disable cuda llvm and nvenc. No idea why the latter fails. +eval "$( + declare -f build | \ + sed ' + s/--enable-cuda-llvm/--disable-cuda-llvm/;s/--enable-nvenc/--disable-nvenc/ + ' +)" + +# Remove above dependencies +makedepends=(${makedepends[@]//onevpl/}) +makedepends=(${makedepends[@]//clang/}) + # no vamf for non-pentium4 if [ "$CARCH" == 'i686' ] || [ "$CARCH" == 'i486' ]; then depends=(${depends[@]//vmaf/}) - + eval "$( declare -f prepare | \ sed ' @@ -29,14 +42,14 @@ if [ "$CARCH" == 'i686' ] || [ "$CARCH" == 'i486' ]; then eval "$( declare -f build | \ sed ' - s/--enable-libvmaf/--disable-libvmaf/ + s/--enable-libvmaf// ' )" fi # force picking of a modern libvpx and not libvpx1.3 needed for steam -makedepends+=('libvpx>=1.8.2') +#makedepends+=('libvpx>=1.8.2') # no AviSynthPlus on i486 (uses Intel intrinsics and cmake support for # disabling it is broken) diff --git a/extra/firecracker/PKGBUILD b/extra/firecracker/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/firecracker/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/flip-link/PKGBUILD b/extra/flip-link/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/flip-link/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/gcc13/PKGBUILD b/extra/gcc13/PKGBUILD new file mode 100644 index 00000000..ca003988 --- /dev/null +++ b/extra/gcc13/PKGBUILD @@ -0,0 +1,125 @@ +# remove tsan (thread sanitizer) plugin, not available for i686 +pkgname=( + $( + printf '%s\n' "${pkgname[@]}" | \ + grep -vFx 'lib32-gcc-libs' + ) +) +unset -f 'package_lib32-gcc-libs' +eval "$( + declare -f prepare | \ + sed ' + \,/s/lib64/lib/, d + ' + declare -f build | \ + sed ' + /configure/ s/--enable-multilib/--disable-multilib/ + /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/, + /configure/ s/;$/ --build=$CHOST;/ + ' + declare -f package_gcc-libs | \ + sed ' + s/\$pkgname-multilib// + s@libsanitizer/{a,l,ub,t}san@libsanitizer/{a,l,ub}san@ + /provides=/s/libtsan.so// + \@/usr/lib32/@ d + ' + declare -f package_gcc | \ + sed ' + s/"lib32-gcc-libs[^"]*"//g + s@make.*tsan.*install@#\0@ + ' + declare -f package_gcc-ada | \ + sed ' + \,cd .*/32/libada,{ + N + d + } + ' +)" +eval "$( + for name in "${pkgname[@]}"; do + declare -f package_${name} | \ + sed ' + s/$pkgname-multilib// + s/{,32}// + \,/lib32/,d + \,/32/,d + ' + done +)" + +# i486-specific + +# no ADA +makedepends=(${makedepends[@]//gcc-ada/}) +makedepends_i686+=('gcc-ada') +makedepends_pentium4+=('gcc-ada') + +if [ "${CARCH}" = "i486" ]; then + package_gcc-ada() { + touch "$pkgdir/this-is-a-dummy-package" + } + + eval "$( + declare -f build | \ + sed ' + /enable-languages/ s/ada,// + ' + )" + + eval "$( + declare -f package_gcc | \ + sed ' + s/,gnat-style,gnat_rm,gnat_ugn// + ' + )" + + # building toolchain (gcc): again, lobtool problems + # /usr/lib/gcc/i486-pc-linux-gnu/7.3.0/ld: cannot find -lquadmath + # collect2: error: ld returned 1 exit status + # libtool: install: error: relink `libgfortran.la' with the above command before installing it + # make: Leaving directory '/build/gcc/src/gcc-build/i486-pc-linux-gnu/libgfortran' + # => wrong link order: libgfortran requires libquadmath + eval "$( + declare -f package_gcc-libs | \ + sed ' + /for lib in / s/libgfortran/libquadmath libgfortran/ + ' + )" + +fi + +makedepends=(${makedepends[@]//lib32-glibc/}) +makedepends=(${makedepends[@]//lib32-gcc-libs/}) + +# i486-specific: disable PGO/LTO build, uses too much resources, +# also disabling LTO for now +if [ "${CARCH}" = "i486" ]; then + eval "$( + declare -f build | \ + sed ' + s/--enable-pgo-build=.*/--disable-pgo-build/ + s/--enable-lto/--disable-lto/ + s/--with-build-config=bootstrap-lto// + ' + declare -f package_gcc | \ + sed ' + /make.*lto-plugin.*install/d + /ln.*liblto_plugin.so/d + ' + )" +fi + +# testing on 486 VMs takes too long and runs in virtual memory exhaustion +if [ "${CARCH}" = "i486" ]; then + unset check +fi + +# disable CET on all subarchitectures (Control Flow instructions endbr32/enbr64) +eval "$( + declare -f build | \ + sed ' + s/--enable-cet=auto/--disable-cet/ + ' +)" diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD new file mode 100644 index 00000000..eee0df51 --- /dev/null +++ b/extra/giflib/PKGBUILD @@ -0,0 +1,8 @@ +# failing tests +eval "$( + declare -f check | \ + sed ' + s/make check/make check || true/ + ' +)" + diff --git a/extra/git-delta/PKGBUILD b/extra/git-delta/PKGBUILD new file mode 100644 index 00000000..774cb0b9 --- /dev/null +++ b/extra/git-delta/PKGBUILD @@ -0,0 +1,3 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" +unset check +unset checkdepends diff --git a/extra/git-grab/PKGBUILD b/extra/git-grab/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/git-grab/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/gitlab-exporter/PKGBUILD b/extra/gitlab-exporter/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/gitlab-exporter/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/gitoxide/PKGBUILD b/extra/gitoxide/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/gitoxide/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/gitu/PKGBUILD b/extra/gitu/PKGBUILD new file mode 100644 index 00000000..6403c888 --- /dev/null +++ b/extra/gitu/PKGBUILD @@ -0,0 +1,2 @@ +unset check +unset checkdepends diff --git a/extra/glad/PKGBUILD b/extra/glad/PKGBUILD new file mode 100644 index 00000000..430a8c55 --- /dev/null +++ b/extra/glad/PKGBUILD @@ -0,0 +1,6 @@ +# long long doesn't work in C90 +# https://github.com/Dav1dde/glad/issues/465 +eval "$(declare -f build | sed '4ised -i "s/-ansi/-std=c99/" utility/test.sh utility/compiletest.sh')" + +checkdepends=(${checkdepends[@]/wine}) +checkdepends=(${checkdepends[@]/mingw-w64-gcc}) diff --git a/extra/go/PKGBUILD b/extra/go/PKGBUILD index c4adc372..a9fa58bd 100644 --- a/extra/go/PKGBUILD +++ b/extra/go/PKGBUILD @@ -33,7 +33,7 @@ fi # https://go-review.googlesource.com/c/go/+/257963 source+=('go-x87.patch') -sha256sums+=('8b124eaa7521bd0e3760b514829b1ecce3d3cd169f99c3629ff50b7769303802') +sha256sums+=('10e036bb7b9c468485a4ea878343918160b914a51aad67ad75839c85bd492b54') eval "$( { declare -f prepare || \ @@ -46,7 +46,3 @@ eval "$( # tests are failing, ignore them unset check - -# bootstrap via go17 -makedepends=(${makedepends[@]//go/}) -makedepends+=('go17') diff --git a/extra/go/go-x87.patch b/extra/go/go-x87.patch index 0c0a584b..96da987c 100644 --- a/extra/go/go-x87.patch +++ b/extra/go/go-x87.patch @@ -1,15 +1,14 @@ -diff -rauN go/src/buildall.bash go-x87-patch/src/buildall.bash ---- go/src/buildall.bash 2023-04-04 17:38:07.330008547 +0200 -+++ go-x87-patch/src/buildall.bash 2023-04-04 17:39:07.929938685 +0200 -@@ -37,6 +37,7 @@ - +--- go/src/buildall.bash 2024-03-29 15:27:02.000000000 +0000 ++++ buildall.bash 2024-04-07 22:22:43.457800687 +0000 +@@ -42,6 +42,7 @@ gettargets() { - ../bin/go tool dist list | sed -e 's|/|-|' + ../bin/go tool dist list | sed -e 's|/|-|' | + egrep -v '^(android|ios)' # need C toolchain even for cross-compiling + echo linux-386-387 echo linux-arm-arm5 } -@@ -63,11 +64,15 @@ +@@ -68,11 +69,15 @@ echo "### Building $target" export GOOS=$(echo $target | sed 's/-.*//') export GOARCH=$(echo $target | sed 's/.*-//') diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD new file mode 100644 index 00000000..ad5a97ab --- /dev/null +++ b/extra/gobject-introspection/PKGBUILD @@ -0,0 +1,5 @@ +# Seems to fail with an invalid cross device link +eval "$(declare -f check | sed 's/meson test \(.*\)/meson test \1 || true/')" + +# Hopefully temporary hack to get gtk packages building +eval "$(declare -f package_gobject-introspection | sed 's@glib2@glib2 python-setuptools@')" diff --git a/extra/grcov/PKGBUILD b/extra/grcov/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/grcov/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/greetd-regreet/PKGBUILD b/extra/greetd-regreet/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/greetd-regreet/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/greetd-tuigreet/PKGBUILD b/extra/greetd-tuigreet/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/greetd-tuigreet/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/greetd/PKGBUILD b/extra/greetd/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/greetd/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/gtk4/PKGBUILD b/extra/gtk4/PKGBUILD index 38ac8537..b24ac63d 100644 --- a/extra/gtk4/PKGBUILD +++ b/extra/gtk4/PKGBUILD @@ -1,26 +1,26 @@ # do not build documentation, depends on too many broken things -eval "$( - declare -f build | \ - sed ' - s/-D gtk_doc=true/-D gtk_doc=false/ - s/-D man-pages=true/-D man-pages=false/ - s/ninja -C build g{d,s,t}k4-doc/ninja -C build/ - ' - declare -f package_gtk4 | \ - sed ' - /gtk4-update-icon-cache.1/d - /usr\/share\/man\/man1/d - \@usr/share/doc@ d - ' - declare -f package_gtk-update-icon-cache | \ - sed ' - /gtk4-update-icon-cache.1/d - ' - declare -f package_gtk4-docs | \ - sed ' - /^\s*mv /d - ' -)" +#eval "$( +# declare -f build | \ +# sed ' +# s/-D gtk_doc=true/-D gtk_doc=false/ +# s/-D man-pages=true/-D man-pages=false/ +# s/ninja -C build g{d,s,t}k4-doc/ninja -C build/ +# ' +# declare -f package_gtk4 | \ +# sed ' +# /gtk4-update-icon-cache.1/d +# /usr\/share\/man\/man1/d +# \@usr/share/doc@ d +# ' +# declare -f package_gtk-update-icon-cache | \ +# sed ' +# /gtk4-update-icon-cache.1/d +# ' +# declare -f package_gtk4-docs | \ +# sed ' +# /^\s*mv /d +# ' +#)" # temporarily we depend on old sparql versions, which require older # versions of icu diff --git a/extra/halp/PKGBUILD b/extra/halp/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/halp/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/hck/PKGBUILD b/extra/hck/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/hck/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/htmlq/PKGBUILD b/extra/htmlq/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/htmlq/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/hyperfine/PKGBUILD b/extra/hyperfine/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/hyperfine/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/icmake/PKGBUILD b/extra/icmake/PKGBUILD new file mode 100644 index 00000000..437011e0 --- /dev/null +++ b/extra/icmake/PKGBUILD @@ -0,0 +1,4 @@ +# To quote the PKGBUILD +## when upgrading to new SONAME, remove ./manpages from HOME variable +## to allow compiling the package without invoiking icmake itself +eval "$(declare -f build | sed 's@./manpages@@;s@./icm_prepare /@./icm_prepare /; touch doc/icmake.1 doc/icmake.7@')" diff --git a/extra/igrep/PKGBUILD b/extra/igrep/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/igrep/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/itstool/PKGBUILD b/extra/itstool/PKGBUILD new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/extra/itstool/PKGBUILD @@ -0,0 +1 @@ + diff --git a/extra/jless/PKGBUILD b/extra/jless/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/jless/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/jwt-cli/PKGBUILD b/extra/jwt-cli/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/jwt-cli/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/keepassxc/PKGBUILD b/extra/keepassxc/PKGBUILD new file mode 100644 index 00000000..16d0c814 --- /dev/null +++ b/extra/keepassxc/PKGBUILD @@ -0,0 +1,3 @@ +# Tests pass but hang +unset check +unset checkdepends diff --git a/extra/ldc/PKGBUILD b/extra/ldc/PKGBUILD index a14218b2..0c8571cd 100644 --- a/extra/ldc/PKGBUILD +++ b/extra/ldc/PKGBUILD @@ -1,2 +1,2 @@ -# temporary workaround for building next version -makedepends+=(llvm10-libs) +makedepends=("${makedepends[@]/ldc/gdmd}") +eval "$(declare -f build | sed 's@-DD_COMPILER_FLAGS=@-DIGNOREME=@;s@-DADDITIONAL_DEFAULT_LDC_SWITCHES=@-DIGNOREME=@')" diff --git a/extra/ldproxy/PKGBUILD b/extra/ldproxy/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/ldproxy/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index 02dc9fcf..8b137891 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1 +1 @@ -unset replaces + diff --git a/extra/libei/PKGBUILD b/extra/libei/PKGBUILD new file mode 100644 index 00000000..73b5e48f --- /dev/null +++ b/extra/libei/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f check | sed 's/meson test \(.*\)/meson test \1 || true/')" diff --git a/extra/libetebase/PKGBUILD b/extra/libetebase/PKGBUILD index b6a28306..6883ef75 100644 --- a/extra/libetebase/PKGBUILD +++ b/extra/libetebase/PKGBUILD @@ -1,2 +1 @@ -# cargo/rust is still lined against openssl 1.1 -makedepends+=(openssl-1.1) +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/libpgm/PKGBUILD b/extra/libpgm/PKGBUILD new file mode 100644 index 00000000..af490aa7 --- /dev/null +++ b/extra/libpgm/PKGBUILD @@ -0,0 +1,4 @@ +# Build with clang because for some reason gcc does not recognise _mm_cvtm64_si64 (and possibly others) +# checksum.c:952:34: warning: implicit declaration of function '_mm_cvtm64_si64'; did you mean '_mm_cvtsi64_si32'? [-Wimplicit-function-declaration] +makedepends+=('clang') +eval "$(declare -f build | sed 's@./configure@CC=clang ./configure@')" diff --git a/extra/libplacebo/PKGBUILD b/extra/libplacebo/PKGBUILD index 5275434b..41610cbf 100644 --- a/extra/libplacebo/PKGBUILD +++ b/extra/libplacebo/PKGBUILD @@ -1,2 +1,4 @@ # we need libunwind on i486 explicitely makedepends+=(libunwind) +# Seems to not build upstream without this either +makedepends+=(libgl) diff --git a/extra/librdkafka/PKGBUILD b/extra/librdkafka/PKGBUILD new file mode 100644 index 00000000..76d1fc9d --- /dev/null +++ b/extra/librdkafka/PKGBUILD @@ -0,0 +1,2 @@ +# Fails to build with LTO +options+=(!lto) diff --git a/extra/libredefender/PKGBUILD b/extra/libredefender/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/libredefender/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/lld/PKGBUILD b/extra/lld/PKGBUILD new file mode 100644 index 00000000..9054f194 --- /dev/null +++ b/extra/lld/PKGBUILD @@ -0,0 +1,3 @@ +# Tests fail and hang the builders +unset check +unset checkdepends diff --git a/extra/lld16/PKGBUILD b/extra/lld16/PKGBUILD new file mode 100644 index 00000000..9054f194 --- /dev/null +++ b/extra/lld16/PKGBUILD @@ -0,0 +1,3 @@ +# Tests fail and hang the builders +unset check +unset checkdepends diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 64686c88..9054f194 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,2 +1,3 @@ # Tests fail and hang the builders unset check +unset checkdepends diff --git a/extra/loki/PKGBUILD b/extra/loki/PKGBUILD new file mode 100644 index 00000000..6403c888 --- /dev/null +++ b/extra/loki/PKGBUILD @@ -0,0 +1,2 @@ +unset check +unset checkdepends diff --git a/extra/lurk/PKGBUILD b/extra/lurk/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/lurk/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/mastodon-twitter-sync/PKGBUILD b/extra/mastodon-twitter-sync/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/mastodon-twitter-sync/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/maturin/PKGBUILD b/extra/maturin/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/maturin/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/mdbook-linkcheck/PKGBUILD b/extra/mdbook-linkcheck/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/mdbook-linkcheck/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/mdcat/PKGBUILD b/extra/mdcat/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/mdcat/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/menyoki/PKGBUILD b/extra/menyoki/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/menyoki/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index ed5563a8..0705c7b8 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -60,9 +60,8 @@ if [ "$CARCH" = 'i486' ]; then )" fi -# disable rust stuff on i486 (disable for i686/pentium4 too for now as -# rust is broken there and cannot be rebuilt) -#if [ "$CARCH" = 'i486' ]; then +# disable rust stuff on i486 +if [ "$CARCH" = 'i486' ]; then eval "$( declare -f build | \ sed ' @@ -77,7 +76,7 @@ fi )" makedepends=(${makedepends[@]//rust-bindgen/}) makedepends=(${makedepends[@]//rust/}) -#fi +fi # this just fails and annoys me eval "$( diff --git a/extra/meson-python/PKGBUILD b/extra/meson-python/PKGBUILD new file mode 100644 index 00000000..6403c888 --- /dev/null +++ b/extra/meson-python/PKGBUILD @@ -0,0 +1,2 @@ +unset check +unset checkdepends diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD index b3fe95a2..5e49a967 100644 --- a/extra/meson/PKGBUILD +++ b/extra/meson/PKGBUILD @@ -21,7 +21,7 @@ unset checkdepends # we patch a version of arch-meson reading CARCH (later maybe LTOFLAGS) # to find out whether it should add blto to the arch flags for ((i=0; i<${#b2sums[@]}; i++)); do - if [ "${b2sums[${i}]}" = '801ad7689aabd2861c760d6001ce2e84c3d5aaed867b087bc1699e7c15d914ee26c9d855999f389d28b4765f081523a1468755768bc0163185f132e157ecced1' ]; then - b2sums[${i}]='9f134aabfce63ed31e579724cdfb6de0a8a4c27998a11caa796c7660842904d646688e6f106026f9a68f4c67ea7a61d7d86c762e4688db0f383268a85880edf8' + if [ "${b2sums[${i}]}" = '70f042a7603d1139f6cef33aec028da087cacabe278fd47375e1b2315befbfde1c0501ad1ecc63d04d31b232a04f08c735d61ce59d7244521f3d270e417fb5af' ]; then + b2sums[${i}]='09f3035aaff3fe8ac8e57a6e718acd654c04604500abb897a4d6e3946c9e4d9db6a257b5cd3d27007bfcfd4799a2b52d8eaab38ecda16f8af69848ed3b8ac7ff' fi done diff --git a/extra/meson/arch-meson b/extra/meson/arch-meson index 577edca4..fac70e6a 100755 --- a/extra/meson/arch-meson +++ b/extra/meson/arch-meson @@ -18,4 +18,5 @@ exec meson setup \ --wrap-mode nodownload \ -D "${LTO}" \ -D b_pie=true \ + -D python.bytecompile=1 \ "$@" diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 9730cd31..b3deaff5 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,22 +1,7 @@ -# ignoring failing tests temporarily to unblock gnome-shell (FS32#189) +# Temporarily disable tests eval "$( - declare -f _check | \ + declare -f check | \ sed ' - s/\(meson test -C build\)/\1 || true/ + s/xvfb-run/echo xvfb-run/ ' )" - -source+=(fix-build.diff) -b2sums+=('2795c0b1f6f4a9a200281943c70fde0896d86127200e49b6cdd7469cd3c9eb29c906b09e08663f7bf71d2876f753e444fa2bb96b7ab3fa9d144bfd37cc1324c5') - -eval "$( - { - declare -f prepare || \ - printf 'prepare() {\n}\n' - } \ - | sed ' - $i cd "$srcdir/$pkgname" \ - # fix build with libglvnd'"'"'s EGL headers \ - git apply -3 ../fix-build.diff - ' -)" diff --git a/extra/mutter/fix-build.diff b/extra/mutter/fix-build.diff deleted file mode 100644 index 79d1e6de..00000000 --- a/extra/mutter/fix-build.diff +++ /dev/null @@ -1,55 +0,0 @@ - cogl/cogl/meson.build | 2 +- - src/backends/meta-egl-ext.h | 1 + - src/backends/meta-egl.c | 1 + - src/backends/meta-egl.h | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - -diff --git c/cogl/cogl/meson.build i/cogl/cogl/meson.build -index 1057ef955..9a642947d 100644 ---- c/cogl/cogl/meson.build -+++ i/cogl/cogl/meson.build -@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file( - built_headers += [cogl_gl_header_h] - - if have_egl -- cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>' -+ cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>' - else - cogl_egl_includes_string = '' - endif -diff --git c/src/backends/meta-egl-ext.h i/src/backends/meta-egl-ext.h -index 8705e7d5b..db0b74f76 100644 ---- c/src/backends/meta-egl-ext.h -+++ i/src/backends/meta-egl-ext.h -@@ -29,6 +29,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - /* - * This is a little different to the tests shipped with EGL implementations, -diff --git c/src/backends/meta-egl.c i/src/backends/meta-egl.c -index 6554be935..fdeff4f77 100644 ---- c/src/backends/meta-egl.c -+++ i/src/backends/meta-egl.c -@@ -27,6 +27,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <gio/gio.h> - #include <glib.h> - #include <glib-object.h> -diff --git c/src/backends/meta-egl.h i/src/backends/meta-egl.h -index f2a816445..4591e7d85 100644 ---- c/src/backends/meta-egl.h -+++ i/src/backends/meta-egl.h -@@ -28,6 +28,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <glib-object.h> - - #define META_EGL_ERROR meta_egl_error_quark () diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD new file mode 100644 index 00000000..29f1e285 --- /dev/null +++ b/extra/nautilus/PKGBUILD @@ -0,0 +1,3 @@ +# Tests hang... +unset check +unset checkdepends diff --git a/extra/ncspot/PKGBUILD b/extra/ncspot/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/ncspot/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/netavark/PKGBUILD b/extra/netavark/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/netavark/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/nickel/PKGBUILD b/extra/nickel/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/nickel/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index 8cf07207..cad9550e 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,24 +1,30 @@ -# skip zenmap on i486 - we don't have pygtk there -makedepends=(${makedepends[@]/pygtk/}) -_oifs="${IFS}" -IFS=$(printf '\n') -optdepends=(${optdepends[@]/pygtk:*/}) -IFS="${_oifs}" +# Zenmap is no longer built by upstream +## skip zenmap on i486 - we don't have pygtk there +#makedepends=(${makedepends[@]/pygtk/}) +#_oifs="${IFS}" +#IFS=$(printf '\n') +#optdepends=(${optdepends[@]/pygtk:*/}) +#IFS="${_oifs}" +# +#makedepends_i686=(pygtk) +#makedepends_pentium4=(pygtk) +#optdepends_i686=('pygtk: zenmap') +#optdepends_pentium4=('pygtk: zenmap') +# +#if [ "${CARCH}" = 'i486' ]; then +# eval "$( +# declare -f build | \ +# sed ' +# s,/configure ,\0--without-zenmap , +# ' +# declare -f package | \ +# sed ' +# /zenmap/d +# ' +# )" +#fi -makedepends_i686=(pygtk) -makedepends_pentium4=(pygtk) -optdepends_i686=('pygtk: zenmap') -optdepends_pentium4=('pygtk: zenmap') - -if [ "${CARCH}" = 'i486' ]; then - eval "$( - declare -f build | \ - sed ' - s,/configure ,\0--without-zenmap , - ' - declare -f package | \ - sed ' - /zenmap/d - ' - )" -fi +# Hopefully the pgp failure is fixed soon... +source=(${source[0]}) +sha256sums=(${sha256sums[0]}) +b2sums=(${b2sums[0]}) diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index b8474f38..f8aba586 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,8 +1,8 @@ -# configure says frame pointers are not supported on this platform, -# disable them (and also some LTO stuff) +# configure says frame pointers are not supported on this platform +# Also switch to world instead of world.opt because the native code compiler has been dropped eval "$( declare -f build | \ sed ' - /configure/s/--enable-frame-pointers// + s@-enable-frame-pointers@@;s@world.opt@world@ ' )" diff --git a/extra/openblas/PKGBUILD b/extra/openblas/PKGBUILD new file mode 100644 index 00000000..769c1efa --- /dev/null +++ b/extra/openblas/PKGBUILD @@ -0,0 +1,3 @@ +# build64 avx tests fail +unset check +unset checkdepends diff --git a/extra/openpgp-ca/PKGBUILD b/extra/openpgp-ca/PKGBUILD new file mode 100644 index 00000000..3cdf97b9 --- /dev/null +++ b/extra/openpgp-ca/PKGBUILD @@ -0,0 +1,3 @@ +# eval "$(declare -f prepare | sed 's@rustc -vV@echo "host: i686-unknown-linux-gnu"@')" +# Essentially apply https://gitlab.archlinux.org/archlinux/packaging/packages/cargo-audit/-/commit/dd4c71adb934157153ec65bc0361fc6d30544158 +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/ot-cryptid/PKGBUILD b/extra/ot-cryptid/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/ot-cryptid/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/ot-urchin/PKGBUILD b/extra/ot-urchin/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/ot-urchin/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/paccat/PKGBUILD b/extra/paccat/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/paccat/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/pacman-bintrans/PKGBUILD b/extra/pacman-bintrans/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/pacman-bintrans/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/pastel/PKGBUILD b/extra/pastel/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/pastel/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/pngquant/PKGBUILD b/extra/pngquant/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/pngquant/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/powerdns/32_bit_time_t.diff b/extra/powerdns/32_bit_time_t.diff new file mode 100644 index 00000000..e6fa2596 --- /dev/null +++ b/extra/powerdns/32_bit_time_t.diff @@ -0,0 +1,11 @@ +--- configure 2024-03-15 11:18:50.000000000 +0200 ++++ configure.time_t 2024-04-08 12:01:25.464421078 +0300 +@@ -7269,7 +7269,7 @@ + printf "%s\n" "#define SIZEOF_TIME_T $ac_cv_sizeof_time_t" >>confdefs.h + + +-if test $ac_size -lt 8 ++if false + then : + as_fn_error $? "size of time_t is $ac_size, which is not large enough to fix the y2k38 bug" "$LINENO" 5 + fi diff --git a/extra/powerdns/PKGBUILD b/extra/powerdns/PKGBUILD new file mode 100644 index 00000000..a959a04e --- /dev/null +++ b/extra/powerdns/PKGBUILD @@ -0,0 +1,3 @@ +sha512sums+=(a8e6301b82e2b83180d224bc4119c348745a2444e5d403da02020d25b3e40cf64f5b158c3b0127d285d2531bcad4cb8d348b152da9a37924670074a48d79aaf6) +source+=(32_bit_time_t.diff) +eval "$(declare -f prepare | sed '4ipatch -Np0 -i ../32_bit_time_t.diff')" diff --git a/extra/progpick/PKGBUILD b/extra/progpick/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/progpick/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/proj/PKGBUILD b/extra/proj/PKGBUILD new file mode 100644 index 00000000..69c3775a --- /dev/null +++ b/extra/proj/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f check | sed 's@ctest --test-dir build@ctest --test-dir build || true@')" diff --git a/extra/prometheus-wireguard-exporter/PKGBUILD b/extra/prometheus-wireguard-exporter/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/prometheus-wireguard-exporter/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/protobuf/PKGBUILD b/extra/protobuf/PKGBUILD index ba06c136..ca6fdb6b 100644 --- a/extra/protobuf/PKGBUILD +++ b/extra/protobuf/PKGBUILD @@ -1,33 +1,10 @@ -source+=('https://github.com/protocolbuffers/protobuf/commit/c94b66706bec17d918495f4715183a5eaf0f8044.patch' - 'fix_static_assert_fail_on_32bit.patch' -) - -sha512sums+=('SKIP' - 'c124cdab5cfb45274d6cfc45d1eb3bb4d6a6e9128a4b84ca0c3b6dd5ddbfa69bb3cf168dc2a5f51ffdd9125246e5e134e22943e56ccdda78a4a0b90eb6ccd164' -) - -_prepare() { - patch -d $pkgbase-$pkgver -p1 < fix_static_assert_fail_on_32bit.patch # Fix 32 bit builds - patch -d $pkgbase-$pkgver -p1 < c94b66706bec17d918495f4715183a5eaf0f8044.patch # Fix some 32 bit tests -} - -eval "$( - { - declare -f prepare || \ - echo 'prepare()' - } | \ - sed '$ i _prepare' -)" - # ignore failing tests eval "$( declare -f check | \ sed ' - s@cmake --build build --target check@cmake --build build --target check || true@ - s@python setup.py test@python setup.py test || true@ + s@\(ctest .*\);@\1 || true;@ ' -) -" +)" # no LTO on i486 if [ "$CARCH" = 'i486' ]; then diff --git a/extra/pyflow/PKGBUILD b/extra/pyflow/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/pyflow/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/python-cffi/PKGBUILD b/extra/python-cffi/PKGBUILD new file mode 100644 index 00000000..78288a37 --- /dev/null +++ b/extra/python-cffi/PKGBUILD @@ -0,0 +1,2 @@ +# These for some reason fail only when run through the build system... +eval "$(declare -f check | sed 's@pytest@pytest || true@')" diff --git a/extra/python-cmsis-pack-manager/PKGBUILD b/extra/python-cmsis-pack-manager/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/python-cmsis-pack-manager/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/python-cryptography/PKGBUILD b/extra/python-cryptography/PKGBUILD new file mode 100644 index 00000000..2b934dbc --- /dev/null +++ b/extra/python-cryptography/PKGBUILD @@ -0,0 +1,9 @@ +source+=('skip-aead-tests-on-32-bit.patch') +sha512sums+=('SKIP') +eval "$( + { + declare -f prepare || \ + printf 'prepare() { cd cryptography\n}\n' + } \ + | sed 's@cd cryptography@cd cryptography; patch -p1 -i ../skip-aead-tests-on-32-bit.patch@' +)" diff --git a/extra/python-cryptography/skip-aead-tests-on-32-bit.patch b/extra/python-cryptography/skip-aead-tests-on-32-bit.patch new file mode 100644 index 00000000..95695554 --- /dev/null +++ b/extra/python-cryptography/skip-aead-tests-on-32-bit.patch @@ -0,0 +1,67 @@ +https://git.alpinelinux.org/aports/commit/community/py3-cryptography/skip-aead-tests-on-32-bit.patch?id=696cbb6a06d0869bb285ad4a5650bf62e8e29ebe +Adapted from https://github.com/pyca/cryptography/commit/4e7c2c72efe5b1fbb2c47d1341c5b4c7cbdb6a57 +-- +diff --git a/tests/hazmat/primitives/test_aead.py b/tests/hazmat/primitives/test_aead.py +index 7b8eebb78447..2f0d52d82682 100644 +--- a/tests/hazmat/primitives/test_aead.py ++++ b/tests/hazmat/primitives/test_aead.py +@@ -60,7 +56,8 @@ def test_chacha20poly1305_unsupported_on_older_openssl(backend): + ) + class TestChaCha20Poly1305: + @pytest.mark.skipif( +- sys.platform not in {"linux", "darwin"}, reason="mmap required" ++ sys.platform not in {"linux", "darwin"} or sys.maxsize < 2**31, ++ reason="mmap and 64-bit platform required", + ) + def test_data_too_large(self): + key = ChaCha20Poly1305.generate_key() +@@ -201,7 +198,8 @@ def test_buffer_protocol(self, backend): + ) + class TestAESCCM: + @pytest.mark.skipif( +- sys.platform not in {"linux", "darwin"}, reason="mmap required" ++ sys.platform not in {"linux", "darwin"} or sys.maxsize < 2**31, ++ reason="mmap and 64-bit platform required", + ) + def test_data_too_large(self): + key = AESCCM.generate_key(128) +@@ -382,7 +380,8 @@ def _load_gcm_vectors(): + + class TestAESGCM: + @pytest.mark.skipif( +- sys.platform not in {"linux", "darwin"}, reason="mmap required" ++ sys.platform not in {"linux", "darwin"} or sys.maxsize < 2**31, ++ reason="mmap and 64-bit platform required", + ) + def test_data_too_large(self): + key = AESGCM.generate_key(128) +@@ -529,7 +528,8 @@ def test_aesocb3_unsupported_on_older_openssl(backend): + ) + class TestAESOCB3: + @pytest.mark.skipif( +- sys.platform not in {"linux", "darwin"}, reason="mmap required" ++ sys.platform not in {"linux", "darwin"} or sys.maxsize < 2**31, ++ reason="mmap and 64-bit platform required", + ) + def test_data_too_large(self): + key = AESOCB3.generate_key(128) +@@ -704,7 +704,8 @@ def test_buffer_protocol(self, backend): + ) + class TestAESSIV: + @pytest.mark.skipif( +- sys.platform not in {"linux", "darwin"}, reason="mmap required" ++ sys.platform not in {"linux", "darwin"} or sys.maxsize < 2**31, ++ reason="mmap and 64-bit platform required", + ) + def test_data_too_large(self): + key = AESSIV.generate_key(256) +@@ -848,7 +849,8 @@ def test_buffer_protocol(self, backend): + ) + class TestAESGCMSIV: + @pytest.mark.skipif( +- sys.platform not in {"linux", "darwin"}, reason="mmap required" ++ sys.platform not in {"linux", "darwin"} or sys.maxsize < 2**31, ++ reason="mmap and 64-bit platform required", + ) + def test_data_too_large(self): + key = AESGCMSIV.generate_key(256) diff --git a/extra/python-hglib/PKGBUILD b/extra/python-hglib/PKGBUILD index 2064f1d3..c50a43a1 100644 --- a/extra/python-hglib/PKGBUILD +++ b/extra/python-hglib/PKGBUILD @@ -1,11 +1,2 @@ -#Traceback (most recent call last): -# File "/build/python-hglib/src/python-hglib-2.6.2/test.py", line 3, in <module> -# import nose -# File "/usr/lib/python3.10/site-packages/nose/__init__.py", line 1, in <module> -# from nose.core import collector, main, run, run_exit, runmodule -# File "/usr/lib/python3.10/site-packages/nose/core.py", line 153 -# print "%s version %s" % (os.path.basename(sys.argv[0]), __version__) -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -#SyntaxError: Missing parentheses in call to 'print'. Did you mean print(...)? -unset check -unset checkdepends +# setuptools won't be installed if we don't use checkdepends, so add it manually +depends+=('python-setuptools') diff --git a/extra/python-httpx-ws/PKGBUILD b/extra/python-httpx-ws/PKGBUILD new file mode 100644 index 00000000..67c43304 --- /dev/null +++ b/extra/python-httpx-ws/PKGBUILD @@ -0,0 +1,4 @@ +# Tests hang at: +# tests/test_api.py::TestSend::test_send[asyncio-websockets] +unset check +unset checkdepends diff --git a/extra/python-jaraco.envs/PKGBUILD b/extra/python-jaraco.envs/PKGBUILD index 5e723f0a..6403c888 100644 --- a/extra/python-jaraco.envs/PKGBUILD +++ b/extra/python-jaraco.envs/PKGBUILD @@ -1,14 +1,2 @@ -# This works around -#File "/usr/lib/python3.11/site-packages/setuptools/config/setupcfg.py", line 284, in __setitem__ -# current_value = getattr(target_obj, option_name) -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -#AttributeError: 'MinimalDistribution' object has no attribute 'entry_points' - -eval "$( - declare -f build | \ - sed ' - s/--no-isolation// - ' -)" - unset check +unset checkdepends diff --git a/extra/python-jaraco.itertools/PKGBUILD b/extra/python-jaraco.itertools/PKGBUILD index 5e723f0a..6403c888 100644 --- a/extra/python-jaraco.itertools/PKGBUILD +++ b/extra/python-jaraco.itertools/PKGBUILD @@ -1,14 +1,2 @@ -# This works around -#File "/usr/lib/python3.11/site-packages/setuptools/config/setupcfg.py", line 284, in __setitem__ -# current_value = getattr(target_obj, option_name) -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -#AttributeError: 'MinimalDistribution' object has no attribute 'entry_points' - -eval "$( - declare -f build | \ - sed ' - s/--no-isolation// - ' -)" - unset check +unset checkdepends diff --git a/extra/python-jaraco.text/PKGBUILD b/extra/python-jaraco.text/PKGBUILD index 5e723f0a..6403c888 100644 --- a/extra/python-jaraco.text/PKGBUILD +++ b/extra/python-jaraco.text/PKGBUILD @@ -1,14 +1,2 @@ -# This works around -#File "/usr/lib/python3.11/site-packages/setuptools/config/setupcfg.py", line 284, in __setitem__ -# current_value = getattr(target_obj, option_name) -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -#AttributeError: 'MinimalDistribution' object has no attribute 'entry_points' - -eval "$( - declare -f build | \ - sed ' - s/--no-isolation// - ' -)" - unset check +unset checkdepends diff --git a/extra/python-nose/PKGBUILD b/extra/python-nose/PKGBUILD new file mode 100644 index 00000000..aeadc948 --- /dev/null +++ b/extra/python-nose/PKGBUILD @@ -0,0 +1,6 @@ +if [[ ${source[1]} == *.asc ]]; then + unset 'source[1]' + unset 'sha512sums[1]' + source=(${source[@]}) + sha512sums=(${sha512sums[@]}) +fi diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index 6e15ddae..b760a5ae 100644 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -3,15 +3,20 @@ if [ "${CARCH}" = "i486" -o "${CARCH}" = "i686" ]; then eval "$( declare -f build | \ sed ' - s|python setup.py build|python setup.py build --cpu-baseline=NONE --cpu-dispatch=NONE| + s|python -m build|python -m build -Csetup-args=-Dcpu-baseline=NONE -Csetup-args=-Dcpu-dispatch=NONE| ' )" fi + if [ "${CARCH}" = "pentium4" ]; then eval "$( declare -f build | \ sed ' - s|python setup.py build|python setup.py build --cpu-baseline=NONE --cpu-dispatch=SSE,SSE2| + s|python -m build|python -m build -Csetup-args=-Dcpu-baseline=NONE -Csetup-args=-Dcpu-dispatch=SSE,SSE2| ' )" fi + +prepare() { + sed -i 's@meson-python>=0.15.0,<0.16.0@meson-python>=0.15.0@' numpy-$pkgver/pyproject.toml || true +} diff --git a/extra/python-pep621/PKGBUILD b/extra/python-pep621/PKGBUILD new file mode 100644 index 00000000..f8840419 --- /dev/null +++ b/extra/python-pep621/PKGBUILD @@ -0,0 +1,7 @@ +# ignore failing tests (this can only build on build-support, which doesn't have a nocheck straw) +eval "$( + declare -f check | \ + sed ' + s@python -m pytest@python -m pytest || true@ + ' +)" diff --git a/extra/python-pluggy/PKGBUILD b/extra/python-pluggy/PKGBUILD index 918fa25a..5906d9c8 100644 --- a/extra/python-pluggy/PKGBUILD +++ b/extra/python-pluggy/PKGBUILD @@ -5,6 +5,3 @@ # or: setup.py cmd --help unset checkdepends unset check - -makedepends+=(python-setuptools python-pip python-wheel) - diff --git a/extra/python-rpds-py/PKGBUILD b/extra/python-rpds-py/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/python-rpds-py/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/python-setuptools/PKGBUILD b/extra/python-setuptools/PKGBUILD index 63552ad5..3b048d6c 100644 --- a/extra/python-setuptools/PKGBUILD +++ b/extra/python-setuptools/PKGBUILD @@ -28,13 +28,13 @@ eval "$( declare -f package | \ sed -r 's/cd setuptools;?$/cd setuptools-$pkgver/' )" +eval "$( + declare -f check | \ + sed -r 's/cd setuptools;?$/cd setuptools-$pkgver/' +)" -# Skip the last two patches. +# Skip the last patch as it doesn't apply eval "$( declare -f prepare | \ - sed '/add-dependency.patch/d' | sed '/build-no-isolation.patch/d' + sed '/add-dependency.patch/d' )" - -# Don't bother with the tests. -unset check -unset checkdepends diff --git a/extra/python-simplejson/PKGBUILD b/extra/python-simplejson/PKGBUILD index 947b2a88..8b137891 100644 --- a/extra/python-simplejson/PKGBUILD +++ b/extra/python-simplejson/PKGBUILD @@ -1,4 +1 @@ -# temporary -source=('https://github.com/simplejson/simplejson/archive/refs/tags/v3.17.6.tar.gz') -sha512sums=('48b74388cd3a5cf0acf46a9aa050d628513d842297625f791c7ae07a7c9289afcb0be8d374f77af3bebd50f4c200844bc69f5b77a67220fee357cdfc0d913726') diff --git a/extra/python-tomli-w/PKGBUILD b/extra/python-tomli-w/PKGBUILD index 5f84d4e8..8b137891 100644 --- a/extra/python-tomli-w/PKGBUILD +++ b/extra/python-tomli-w/PKGBUILD @@ -1,6 +1 @@ -# boostrapping python modules -# no testing no test or optional dependencies -unset check -unset checkdepends -unset optdepends diff --git a/extra/python-tqdm/PKGBUILD b/extra/python-tqdm/PKGBUILD index b7329924..d02a290a 100644 --- a/extra/python-tqdm/PKGBUILD +++ b/extra/python-tqdm/PKGBUILD @@ -9,3 +9,7 @@ eval "$( /cp/ i pushd ${srcdir}/tqdm-$pkgver && patch -Np1 -i "${srcdir}"/tqdm-4.22.0-sleep-test-workaround.patch && popd ' )" + +# Check depends on python-keras which depends on tensorflow +unset check +unset checkdepends diff --git a/extra/qbe/PKGBUILD b/extra/qbe/PKGBUILD new file mode 100644 index 00000000..3c2bb7e2 --- /dev/null +++ b/extra/qbe/PKGBUILD @@ -0,0 +1,3 @@ +# Tests expect amd64 +unset check +unset checkdepends diff --git a/extra/rathole/PKGBUILD b/extra/rathole/PKGBUILD index 82610227..86ebb12b 100644 --- a/extra/rathole/PKGBUILD +++ b/extra/rathole/PKGBUILD @@ -1,3 +1,4 @@ # stalls build slaves with: # "May 01 21:45:56.117 ERROR rathole::server: Failed to do transport handshake: error:0A000415:SSL routines:ssl3_read_bytes:sslv3 alert certificate expired:ssl/record/rec_layer_s3.c:1605:SSL alert number 45: error:0A000415:SSL routines:ssl3_read_bytes:sslv3 alert certificate expired:ssl/record/rec_layer_s3.c:1605:SSL alert number 45" unset check +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/rebuilderd/PKGBUILD b/extra/rebuilderd/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/rebuilderd/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/repro-env/PKGBUILD b/extra/repro-env/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/repro-env/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/rhit/PKGBUILD b/extra/rhit/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/rhit/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/riff/PKGBUILD b/extra/riff/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/riff/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/rosenpass/PKGBUILD b/extra/rosenpass/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/rosenpass/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/rpg-cli/PKGBUILD b/extra/rpg-cli/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/rpg-cli/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/rq/PKGBUILD b/extra/rq/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/rq/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 2ee10842..b03abc17 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -1,3 +1,6 @@ +# Hack +eval "$(declare -f build | sed 's@./configure@./configure --with-search-path=/usr/lib/ruby/${pkgver:0:3}.0/x86-linux@')" + # patch architecture in helper shared libs if [ "${CARCH}" = "pentium4" -o "${CARCH}" = "i686" ]; then eval "$( diff --git a/extra/rust-analyzer/PKGBUILD b/extra/rust-analyzer/PKGBUILD new file mode 100644 index 00000000..94d20857 --- /dev/null +++ b/extra/rust-analyzer/PKGBUILD @@ -0,0 +1 @@ +options+=(!debug) diff --git a/extra/rust-script/PKGBUILD b/extra/rust-script/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/rust-script/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index 7933ccf5..7066b7eb 100644 --- a/extra/rust/PKGBUILD +++ b/extra/rust/PKGBUILD @@ -6,12 +6,12 @@ # see https://github.com/rust-lang/rust/issues/60294 source+=(config.toml.patch) -b2sums+=('899c8ba0052c72095e3fb8e9f1d06c91dafbec2403f605163765d8493ccb6255fbd719848ba92a04d443af99edd64976bafc8d96e06f5f7f79291eb060fdabc7') +b2sums+=('b438042bad72f2952b135a46ca7353b0f333f58b7e5658e0f08fed75eba5095407aca479cbd6911fbaf2aa26482dce047293cf7114ace537b15acc8f10223551') eval "$( declare -f prepare | \ sed ' - $ i patch -p1 -i "$srcdir/config.toml.patch" + $ i patch -p0 -i "$srcdir/config.toml.patch" ' )" @@ -19,7 +19,7 @@ eval "$( eval "$( declare -f build | \ sed ' - s/-j "$(nproc)"/-j8/ + s/-j "$(nproc)"/$(grep -o -- "-j *[0-9]*" <<< ${MAKEFLAGS:--j8})/ ' )" @@ -68,6 +68,7 @@ pkgname=( ) ) makedepends=(${makedepends[@]//lib32-gcc-libs/}) +makedepends=(${makedepends[@]//lib32-glibc/}) # Enable on demand, if your previous rust is broken use previous version # from build-support (this is preferable to using rust-bin below, but @@ -77,5 +78,9 @@ makedepends=(${makedepends[@]//lib32-gcc-libs/}) # Enable on demand, if your previous rust is broken use previous version # from build-support -makedepends=(${makedepends[@]//rust/}) -makedepends+=('rust176-bin') +#makedepends=(${makedepends[@]//rust/}) +#makedepends+=('rust176-bin') + +# Do not run out of memory linking LLVM +options+=(!debug) + diff --git a/extra/rust/config.toml.patch b/extra/rust/config.toml.patch index f54a06cd..c002cff6 100644 --- a/extra/rust/config.toml.patch +++ b/extra/rust/config.toml.patch @@ -1,11 +1,6 @@ ---- a/config.toml 2024-03-12 15:14:24.314876558 +0000 -+++ b/config.toml 2024-03-20 14:09:23.793371221 +0000 -@@ -3,14 +3,15 @@ - - [llvm] - link-shared = true -+link-jobs = 1 -+use-linker = "gold" +--- config.toml.orig 2024-05-06 00:02:38.463811257 +0000 ++++ config.toml 2024-05-06 00:57:21.364799544 +0000 +@@ -6,9 +6,8 @@ [build] target = [ @@ -14,21 +9,18 @@ - "x86_64-unknown-linux-musl", + "i686-unknown-linux-musl", "wasm32-unknown-unknown", -- "wasm32-wasi", -+ "wasm32-wasi" + "wasm32-wasi", ] - cargo = "/usr/bin/cargo" - rustc = "/usr/bin/rustc" -@@ -37,7 +38,7 @@ - prefix = "/usr" - +@@ -39,7 +38,7 @@ [rust] + codegen-units-std = 1 + debuginfo-level = 1 -debuginfo-level-std = 2 -+debuginfo-level-std = 0 ++debuginfo-level-std = 1 channel = "stable" description = "Arch Linux :-" rpath = false -@@ -74,7 +75,7 @@ +@@ -65,7 +64,7 @@ ar = "/usr/bin/gcc-ar" ranlib = "/usr/bin/gcc-ranlib" diff --git a/extra/rustic/PKGBUILD b/extra/rustic/PKGBUILD new file mode 100644 index 00000000..bc018d83 --- /dev/null +++ b/extra/rustic/PKGBUILD @@ -0,0 +1,2 @@ +options+=(!debug) +eval "$(declare -f build | sed 's@CARGO_PROFILE_RELEASE_DEBUG=[0-9]@CARGO_PROFILE_RELEASE_DEBUG=0@;s@CARGO_PROFILE_RELEASE_STRIP=false@CARGO_PROFILE_RELEASE_STRIP=true@')" diff --git a/extra/rye/PKGBUILD b/extra/rye/PKGBUILD new file mode 100644 index 00000000..6403c888 --- /dev/null +++ b/extra/rye/PKGBUILD @@ -0,0 +1,2 @@ +unset check +unset checkdepends diff --git a/extra/sequoia-sop/PKGBUILD b/extra/sequoia-sop/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/sequoia-sop/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/sequoia-sq/PKGBUILD b/extra/sequoia-sq/PKGBUILD new file mode 100644 index 00000000..3cdf97b9 --- /dev/null +++ b/extra/sequoia-sq/PKGBUILD @@ -0,0 +1,3 @@ +# eval "$(declare -f prepare | sed 's@rustc -vV@echo "host: i686-unknown-linux-gnu"@')" +# Essentially apply https://gitlab.archlinux.org/archlinux/packaging/packages/cargo-audit/-/commit/dd4c71adb934157153ec65bc0361fc6d30544158 +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/sheldon/PKGBUILD b/extra/sheldon/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/sheldon/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/simde/PKGBUILD b/extra/simde/PKGBUILD new file mode 100644 index 00000000..972c1a74 --- /dev/null +++ b/extra/simde/PKGBUILD @@ -0,0 +1,2 @@ +# Some of the floats fail to compare like in LLVM +eval "$(declare -f check | sed 's/meson test \(.*\)/meson test \1 || true/')" diff --git a/extra/skim/PKGBUILD b/extra/skim/PKGBUILD index 2f1d05f4..ec2783a6 100644 --- a/extra/skim/PKGBUILD +++ b/extra/skim/PKGBUILD @@ -9,3 +9,4 @@ eval "$( 2 a sed -i "s/8589934592\(.*\)8589934592/12345\112345/" "skim-$pkgver/src/util.rs" ' )" +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/slurm-llnl/PKGBUILD b/extra/slurm-llnl/PKGBUILD new file mode 100644 index 00000000..dac1386d --- /dev/null +++ b/extra/slurm-llnl/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f build | sed 's@./configure@./configure --enable-deprecated@')" diff --git a/extra/sn0int/PKGBUILD b/extra/sn0int/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/sn0int/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/sniffglue/PKGBUILD b/extra/sniffglue/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/sniffglue/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/sonic/PKGBUILD b/extra/sonic/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/sonic/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/spicy-launcher/PKGBUILD b/extra/spicy-launcher/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/spicy-launcher/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/spotify-launcher/PKGBUILD b/extra/spotify-launcher/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/spotify-launcher/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/spotifyd/PKGBUILD b/extra/spotifyd/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/spotifyd/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/spytrap-adb/PKGBUILD b/extra/spytrap-adb/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/spytrap-adb/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/sssd/PKGBUILD b/extra/sssd/PKGBUILD new file mode 100644 index 00000000..e5d521d4 --- /dev/null +++ b/extra/sssd/PKGBUILD @@ -0,0 +1,3 @@ +# Tests pass but are flaky, especially if the builder is under high load +unset check +unset checkdepends diff --git a/extra/systeroid/PKGBUILD b/extra/systeroid/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/systeroid/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/taskwarrior-tui/PKGBUILD b/extra/taskwarrior-tui/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/taskwarrior-tui/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/tealdeer/PKGBUILD b/extra/tealdeer/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/tealdeer/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/tere/PKGBUILD b/extra/tere/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/tere/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/tickrs/PKGBUILD b/extra/tickrs/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/tickrs/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/typst/PKGBUILD b/extra/typst/PKGBUILD new file mode 100644 index 00000000..06d408d8 --- /dev/null +++ b/extra/typst/PKGBUILD @@ -0,0 +1,13 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" +# layout/grid-positioning.typ ❌ +# Subtest 13 does not match expected errors. +# Not annotated // Error: 213:16-213:35 number too large +# Not emitted // Error: 213:3-213:39 cell position too large +# Subtest 14 does not match expected errors. +# Not annotated // Error: 222:23-222:42 number too large +# Not emitted // Error: 222:3-222:46 cell position too large Subtest 15 does not match expected errors. +# Not annotated // Error: 230:22-230:41 number too large +# Not emitted // Hint: 230:3-230:45 try reducing the cell's rowspan or colspan +# Not emitted // Error: 230:3-230:45 cell would span an exceedingly large position +unset check +unset checkdepends diff --git a/extra/updlockfiles/PKGBUILD b/extra/updlockfiles/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/updlockfiles/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/uwsgi/PKGBUILD b/extra/uwsgi/PKGBUILD new file mode 100644 index 00000000..9e09c011 --- /dev/null +++ b/extra/uwsgi/PKGBUILD @@ -0,0 +1,3 @@ +pkgname=(${pkgname[@]//uwsgi-plugin-pypy/}) +pkgname=(${pkgname[@]//uwsgi-plugin-php-legacy/}) +makedepends=(${makedepends[@]//pypy/}) diff --git a/extra/viu/PKGBUILD b/extra/viu/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/viu/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/wasm-pack/PKGBUILD b/extra/wasm-pack/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/wasm-pack/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/wiki-tui/PKGBUILD b/extra/wiki-tui/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/wiki-tui/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/wpewebkit/PKGBUILD b/extra/wpewebkit/PKGBUILD index 8b1e84de..7c9653bd 100644 --- a/extra/wpewebkit/PKGBUILD +++ b/extra/wpewebkit/PKGBUILD @@ -1,4 +1,5 @@ # linker runs out of memory on 32-bit +options+=(!debug) eval "$( declare -f build | \ sed ' diff --git a/extra/yabridge/PKGBUILD b/extra/yabridge/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/yabridge/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/zbus_xmlgen/PKGBUILD b/extra/zbus_xmlgen/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/zbus_xmlgen/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/zenith/PKGBUILD b/extra/zenith/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/zenith/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" diff --git a/extra/zeromq/PKGBUILD b/extra/zeromq/PKGBUILD index a86965d9..683a66e9 100644 --- a/extra/zeromq/PKGBUILD +++ b/extra/zeromq/PKGBUILD @@ -1,9 +1,10 @@ # libpgm causes linking issues with intrinsics on 32-bit -depends=(${depends[@]/libpgm/}) +# This seems to no longer happen? +#depends=(${depends[@]/libpgm/}) -eval "$( - declare -f build | \ - sed ' - s/--with-pgm // - ' -)" +#eval "$( +# declare -f build | \ +# sed ' +# s/--with-pgm // +# ' +#)" diff --git a/extra/zola/PKGBUILD b/extra/zola/PKGBUILD new file mode 100644 index 00000000..6883ef75 --- /dev/null +++ b/extra/zola/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" |