From d22b6ef090d62a0d70d9312f6af3267db04f3c0a Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 17 Apr 2019 10:54:17 +0200 Subject: most patches for i686 should/can be applied for pentium4, too --- extra/cantor/PKGBUILD | 4 ++-- extra/cmake/PKGBUILD | 1 + extra/doxygen/PKGBUILD | 2 ++ extra/git/PKGBUILD | 1 + extra/hwloc/PKGBUILD | 1 + extra/java7-openjdk/PKGBUILD | 1 + extra/jsoncpp/PKGBUILD | 1 + extra/libjpeg-turbo/PKGBUILD | 1 + extra/libunwind/PKGBUILD | 1 + extra/libxkbcommon/PKGBUILD | 1 + extra/linux-pae/PKGBUILD | 2 +- extra/nasm/PKGBUILD | 1 + extra/python/PKGBUILD | 1 + extra/python2/PKGBUILD | 1 + extra/qt5-base/PKGBUILD | 1 + extra/rust/PKGBUILD | 13 ++++++++++--- extra/subversion/PKGBUILD | 3 ++- extra/wayland/PKGBUILD | 1 + 18 files changed, 30 insertions(+), 7 deletions(-) (limited to 'extra') diff --git a/extra/cantor/PKGBUILD b/extra/cantor/PKGBUILD index e6d830d0..93f7b27e 100644 --- a/extra/cantor/PKGBUILD +++ b/extra/cantor/PKGBUILD @@ -4,7 +4,7 @@ eval "$( declare -f build | \ sed ' 2 a \ - export CFLAGS+=" -march=pentium4" \ - export CXXFLAGS+=" -march=pentium4" + export CFLAGS+=" -march=${CARCH}" \ + export CXXFLAGS+=" -march=${CARCH}" ' )" diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 2ca8c08f..bb938de5 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,6 +1,7 @@ # no Qt5 GUI on i486 makedepends=(${makedepends[@]//qt5-base/}) makedepends_i686+=(qt5-base) +makedepends_pentium4=("${makedepends_i686[@]}") # 486-specific if [ "${CARCH}" = "i486" ]; then diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 72ebfd3a..a095d463 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -26,6 +26,8 @@ makedepends_i686+=(graphviz) makedepends=(${makedepends[@]//ghostscript/}) makedepends_i686+=(ghostscript) +makedepends_pentium4=("${makedepends_i686[@]}") + if [ "${CARCH}" = "i486" ]; then eval "$( declare -f build | \ diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index b66cc8dc..96b04459 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,6 +1,7 @@ # no Gnome on i486 makedepends=(${makedepends[@]//libgnome-keyring/}) makedepends_i686+=(libgnome-keyring) +makedepends_pentium4=("${makedepends_i686[@]}") # 486-specific if [ "${CARCH}" = "i486" ]; then diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index f2d05b95..26e004d8 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,3 +1,4 @@ # no cairo on i486 makedepends=(${makedepends[@]//cairo/}) makedepends_i686+=(cairo) +makedepends_pentium4=("${makedepends_i686[@]}") diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 2112d4ad..e8f34746 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,6 +1,7 @@ # gtk2 is an optdepend makedepends=(${makedepends[@]//gtk2/}) makedepends_i686+=(gtk2) +makedepends_pentium4=("${makedepends_i686[@]}") # i486-specific if [ "${CARCH}" = "i486" ]; then diff --git a/extra/jsoncpp/PKGBUILD b/extra/jsoncpp/PKGBUILD index 64e3d308..f3f0252d 100644 --- a/extra/jsoncpp/PKGBUILD +++ b/extra/jsoncpp/PKGBUILD @@ -1,6 +1,7 @@ # no graphviz on i486 makedepends=(${makedepends[@]//graphviz/}) makedepends_i686+=(graphviz) +makedepends_pentium4=("${makedepends_i686[@]}") # 486-specific if [ "${CARCH}" = "i486" ]; then diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 15f620d3..2d315874 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,6 +1,7 @@ # no Java on i486 makedepends=(${makedepends[@]//jdk8-openjdk/}) makedepends_i686+=(jdk8-openjdk) +makedepends_pentium4=("${makedepends_i686[@]}") if [ "${CARCH}" = "i486" ]; then # no Java diff --git a/extra/libunwind/PKGBUILD b/extra/libunwind/PKGBUILD index a8d82b23..a2ebca7e 100644 --- a/extra/libunwind/PKGBUILD +++ b/extra/libunwind/PKGBUILD @@ -1,3 +1,4 @@ # no TeX for documentation on i486 makedepends=(${makedepends[@]//texlive-core/}) makedepends_i686+=(texlive-core) +makedepends_pentium4=("${makedepends_i686[@]}") diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD index d5c1d607..a95d49b7 100644 --- a/extra/libxkbcommon/PKGBUILD +++ b/extra/libxkbcommon/PKGBUILD @@ -2,6 +2,7 @@ makedepends=(${makedepends[@]//graphviz/}) makedepends=(${makedepends[@]//doxygen/}) makedepends_i686+=(graphviz doxygen) +makedepends_pentium4=("${makedepends_i686[@]}") # i486-specific if [ "${CARCH}" = "i486" ]; then diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD index 3c33cb91..830392d4 100644 --- a/extra/linux-pae/PKGBUILD +++ b/extra/linux-pae/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=linux-pae # Build stock -ARCH kernel pkgver='5.0.8' _srcname=linux-${pkgver} pkgrel='1' -arch=('i686') +arch=('i686' 'pentium4') url="https://www.kernel.org/" license=('GPL2') makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf') diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index f1a34d1a..98b5d95e 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,6 +1,7 @@ # remove ttf-liberation on i486 (X packages missing for installing the font) makedepends=(${makedepends[@]//ttf-liberation/}) makedepends_i686+=(ttf-liberation) +makedepends_pentium4=("${makedepends_i686[@]}") # i486-specific if [ "${CARCH}" = "i486" ]; then diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 43352eb3..a4a0d2dd 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -17,6 +17,7 @@ eval "$( makedepends=(${makedepends[@]//xorg-server-xvfb/}) makedepends_i686+=(xorg-server-xvfb) +makedepends_pentium4=("${makedepends_i686[@]}") # skip xvfb stuff on i486 if [ "$CARCH" = 'i486' ]; then diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 2da91370..654412c4 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -21,6 +21,7 @@ eval "$( makedepends=(${makedepends[@]//xorg-server-xvfb/}) makedepends_i686+=(xorg-server-xvfb) +makedepends_pentium4=("${makedepends_i686[@]}") # skip xvfb stuff on i486 if [ "$CARCH" = 'i486' ]; then diff --git a/extra/qt5-base/PKGBUILD b/extra/qt5-base/PKGBUILD index 4c9c9195..4507cf9e 100644 --- a/extra/qt5-base/PKGBUILD +++ b/extra/qt5-base/PKGBUILD @@ -7,6 +7,7 @@ eval "$( makedepends=(${makedepends[@]/vulkan-headers/}) makedepends_i686+=(vulkan-headers) +makedepends_pentium4=("${makedepends_i686[@]}") if [ "$CARCH" = 'i486' ]; then eval "$( declare -f build | \ diff --git a/extra/rust/PKGBUILD b/extra/rust/PKGBUILD index bc6f5edc..0ab950b8 100644 --- a/extra/rust/PKGBUILD +++ b/extra/rust/PKGBUILD @@ -7,8 +7,15 @@ eval "$( declare -f prepare | \ sed ' $ i patch -p1 -i "$srcdir/config.toml.patch" - /}/ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/spec/i686_unknown_linux_gnu.rs" - /}/ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/src/librustc_target/spec/i686_unknown_linux_gnu.rs" - /}/ i sed -i "s/254a116e0cfbce81d1d38ddd59e1086228332746ae8916647b990dd8226079d3/30594a90c83b496630d0b8d80ce2f93671ab6afedadcdc79afd832f4dfe499fd/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json" ' )" +if [ "${CARCH}" != 'pentium4' ]; then + eval "$( + declare -f prepare | \ + sed ' + $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/spec/i686_unknown_linux_gnu.rs" + $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/src/librustc_target/spec/i686_unknown_linux_gnu.rs" + $ i sed -i "s/254a116e0cfbce81d1d38ddd59e1086228332746ae8916647b990dd8226079d3/30594a90c83b496630d0b8d80ce2f93671ab6afedadcdc79afd832f4dfe499fd/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json" + ' + )" +fi diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 56a0d262..84b930e2 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -17,6 +17,8 @@ makedepends_i686+=(kdelibs4support kwallet) makedepends=(${makedepends[@]//libgnome-keyring/}) makedepends_i686+=(libgnome-keyring) +makedepends_pentium4=("${makedepends_i686[@]}") + # i486-specific if [ "${CARCH}" = "i486" ]; then # no Java bindings @@ -73,6 +75,5 @@ if [ "${CARCH}" = "i486" ]; then ' )" - fi diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index e2df8a75..bd52d172 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -4,6 +4,7 @@ makedepends=(${makedepends[@]//doxygen/}) makedepends=(${makedepends[@]//xmlto/}) makedepends=(${makedepends[@]//docbook-xsl/}) makedepends_i686+=(graphviz doxygen xmlto docbook-xsl) +makedepends_pentium4=("${makedepends_i686[@]}") # i486-specific if [ "${CARCH}" = "i486" ]; then -- cgit v1.2.3-54-g00ecf