From ae1780d9136d30b46f8aa077e3234b0829fd99ae Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 16 Nov 2019 20:37:33 +0100
Subject: build-support: renamed extra->disabled, added python-pip-bootstrap

---
 build-support/disabled/ffmpeg/PKGBUILD             |  13 ++
 .../disabled/python-pip-bootstrap/.SRCINFO         |  21 +++
 .../disabled/python-pip-bootstrap/PKGBUILD         |  26 +++
 .../disabled/python-pip-bootstrap/install.sh       |   4 +
 .../disabled/python-pip-bootstrap/install2.sh      |   4 +
 build-support/disabled/rust-bin/PKGBUILD           |  38 +++++
 build-support/disabled/rust/PKGBUILD               | 190 +++++++++++++++++++++
 build-support/disabled/rust/config.toml.patch      |  26 +++
 build-support/disabled/rust/watcher.sh             |  25 +++
 9 files changed, 347 insertions(+)
 create mode 100644 build-support/disabled/ffmpeg/PKGBUILD
 create mode 100644 build-support/disabled/python-pip-bootstrap/.SRCINFO
 create mode 100644 build-support/disabled/python-pip-bootstrap/PKGBUILD
 create mode 100644 build-support/disabled/python-pip-bootstrap/install.sh
 create mode 100644 build-support/disabled/python-pip-bootstrap/install2.sh
 create mode 100644 build-support/disabled/rust-bin/PKGBUILD
 create mode 100644 build-support/disabled/rust/PKGBUILD
 create mode 100644 build-support/disabled/rust/config.toml.patch
 create mode 100755 build-support/disabled/rust/watcher.sh

(limited to 'build-support/disabled')

diff --git a/build-support/disabled/ffmpeg/PKGBUILD b/build-support/disabled/ffmpeg/PKGBUILD
new file mode 100644
index 00000000..9dbe9953
--- /dev/null
+++ b/build-support/disabled/ffmpeg/PKGBUILD
@@ -0,0 +1,13 @@
+# disable x264/xs265/dav1d to break cycles
+depends=(${depends[@]//libx264.so/})
+depends=(${depends[@]//libx265.so/})
+depends=(${depends[@]//libdav1d.so/})
+
+eval "$(
+  declare -f build | \
+    sed '
+      s/--enable-libx264/--disable-libx264/
+      s/--enable-libx265/--disable-libx265/
+      s/--enable-libdav1d/--disable-libdav1d/
+    '
+)"
diff --git a/build-support/disabled/python-pip-bootstrap/.SRCINFO b/build-support/disabled/python-pip-bootstrap/.SRCINFO
new file mode 100644
index 00000000..d88edfcc
--- /dev/null
+++ b/build-support/disabled/python-pip-bootstrap/.SRCINFO
@@ -0,0 +1,21 @@
+pkgbase = python-pip-bootstrap
+	pkgdesc = bootstap pip and setuptools for bootstrapping python
+	pkgver = 0.0.1
+	pkgrel = 1
+	url = https://bootstrap.pypa.io/
+	arch = i486
+	arch = i686
+	arch = x86_64
+	arch = armv6h
+	arch = armv7h
+	source = https://bootstrap.pypa.io/get-pip.py
+	sha512sums = 29971130c5d1d1baf2b51ef689b40c91fcd0d1e62de6f99d6abef6879684a59843be539cd112dfddc3637cc3d1a91c79f775d80f6aa2fe920252710d48d2934d
+
+pkgname = python-pip-bootstrap
+	install = install.sh
+	depends = python
+
+pkgname = python2-pip-bootstrap
+	install = install2.sh
+	depends = python2
+
diff --git a/build-support/disabled/python-pip-bootstrap/PKGBUILD b/build-support/disabled/python-pip-bootstrap/PKGBUILD
new file mode 100644
index 00000000..93c5d86e
--- /dev/null
+++ b/build-support/disabled/python-pip-bootstrap/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Andreas Baumann <mail@andreasbaumann.cc>
+
+pkgname=('python-pip-bootstrap' 'python2-pip-bootstrap')
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="bootstap pip and setuptools for bootstrapping python"
+arch=(i486 'i686' 'x86_64' 'armv6h' 'armv7h')
+url="https://bootstrap.pypa.io/"
+source=("https://bootstrap.pypa.io/get-pip.py")
+sha512sums=('29971130c5d1d1baf2b51ef689b40c91fcd0d1e62de6f99d6abef6879684a59843be539cd112dfddc3637cc3d1a91c79f775d80f6aa2fe920252710d48d2934d')
+
+package_python-pip-bootstrap() {
+	depends=('python')
+	install=install.sh
+
+	mkdir -p "${pkgdir}/usr/bin"
+	cp "${srcdir}/get-pip.py" "${pkgdir}/usr/bin/."
+}
+
+package_python2-pip-bootstrap() {
+	depends=('python2')
+	install=install2.sh
+
+	mkdir -p "${pkgdir}/usr/bin"
+	cp "${srcdir}/get-pip.py" "${pkgdir}/usr/bin/get-pip2.py"
+}
diff --git a/build-support/disabled/python-pip-bootstrap/install.sh b/build-support/disabled/python-pip-bootstrap/install.sh
new file mode 100644
index 00000000..e81432e6
--- /dev/null
+++ b/build-support/disabled/python-pip-bootstrap/install.sh
@@ -0,0 +1,4 @@
+post_install() {
+	echo "Bootstrapping python pip, setuptools and wheel.."
+	python /usr/bin/get-pip.py
+}
diff --git a/build-support/disabled/python-pip-bootstrap/install2.sh b/build-support/disabled/python-pip-bootstrap/install2.sh
new file mode 100644
index 00000000..b6aa16fa
--- /dev/null
+++ b/build-support/disabled/python-pip-bootstrap/install2.sh
@@ -0,0 +1,4 @@
+post_install() {
+	echo "Bootstrapping python2 pip, setuptools and wheel.."
+	python2 /usr/bin/get-pip2.py
+}
diff --git a/build-support/disabled/rust-bin/PKGBUILD b/build-support/disabled/rust-bin/PKGBUILD
new file mode 100644
index 00000000..125dac5f
--- /dev/null
+++ b/build-support/disabled/rust-bin/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Andreas Baumann <mail@andreasbaumann.cc>
+
+pkgname=rust-bin
+pkgver=1.38.0
+pkgrel=1
+pkgdesc='Binary precompiled packages for Rust'
+url='https://www.rust-lang.org/'
+arch=(x86_64 pentium4 i686)
+license=('MIT' 'Apache')
+provides=('rust' 'cargo')
+conflicts=('rust' 'cargo')
+options=('!emptydirs')
+
+source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-linux-gnu.tar.gz"{,.asc})
+source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc})
+source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc})
+
+sha256sums_x86_64=('cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb'
+                   'SKIP')
+sha256sums_pentium4=('41aed8a350e24a0cac1444ed99b3dd24a90bc581dd88cb420c6e547d6b5f57af'
+                     'SKIP')
+sha256sums_i686=('41aed8a350e24a0cac1444ed99b3dd24a90bc581dd88cb420c6e547d6b5f57af'
+                 'SKIP')
+
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
+              '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
+
+case "${CARCH}" in
+  x86_64)               _ARCH='x86_64-unknown-linux-gnu';;
+  pentium4)   _ARCH='i686-unknown-linux-gnu';;
+  i686)            _ARCH='i686-unknown-linux-gnu';;
+esac
+
+package() {
+  cd "rust-$pkgver-$_ARCH"
+
+  ./install.sh --prefix=/usr --destdir="$pkgdir"
+}
diff --git a/build-support/disabled/rust/PKGBUILD b/build-support/disabled/rust/PKGBUILD
new file mode 100644
index 00000000..b94c4e14
--- /dev/null
+++ b/build-support/disabled/rust/PKGBUILD
@@ -0,0 +1,190 @@
+# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
+# Contributor: Alexander F Rødseth <xyproto@archlinux.org>
+# Contributor: Daniel Micay <danielmicay@gmail.com>
+# Contributor: userwithuid <userwithuid@gmail.com>
+
+pkgname=('rust' 'rust-docs')
+epoch=1
+pkgver=1.38.0
+pkgrel=2
+
+_llvm_ver=9.0.0
+
+pkgdesc='Systems programming language focused on safety, speed and concurrency'
+url='https://www.rust-lang.org/'
+arch=(i486 i686 pentium4 'x86_64')
+license=('MIT' 'Apache')
+
+#makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake' 'inotify-tools' 'procps-ng')
+makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake')
+checkdepends=('procps-ng' 'gdb')
+
+options=('!emptydirs')
+
+source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
+        "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}
+        bootstrap-1.38.patch
+        0001-WIP-minimize-the-rust-std-component.patch)
+
+sha256sums=('644263ca7c7106f8ee8fcde6bb16910d246b30668a74be20b8c7e0e9f4a52d80'
+            'SKIP'
+            '56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e'
+            'SKIP'
+            '71935e8994d1045680cde22f72a12c4959e1877e5a42fc21fd034d677100dab3'
+            '1d6b69444ef6ff033fe1612e56ecdaad5c52aa44395e704f78b1a047c65b9321')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
+              '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>
+              'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
+
+prepare() {
+  cd "rustc-$pkgver-src"
+
+  # Fix bootstrap to compile with 1.38
+  patch -Np1 -i ../bootstrap-1.38.patch
+
+  # For https://bugzilla.redhat.com/show_bug.cgi?id=1756487
+  # From https://src.fedoraproject.org/rpms/rust/tree/master
+  patch -Np1 -i ../0001-WIP-minimize-the-rust-std-component.patch
+
+  cat >config.toml <<END
+[llvm]
+link-shared = true
+
+[build]
+target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
+cargo = "/usr/bin/cargo"
+rustc = "/usr/bin/rustc"
+python = "/usr/bin/python"
+extended = true
+sanitizers = false
+profiler = true
+vendor = true
+
+[install]
+prefix = "/usr"
+
+[rust]
+# LLVM crashes when passing an object through ThinLTO twice.  This is triggered when using rust
+# code in cross-language LTO if libstd was built using ThinLTO.
+# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html
+# https://github.com/rust-lang/rust/issues/54872
+codegen-units-std = 1
+
+debuginfo-level = 2
+
+channel = "stable"
+
+rpath = false
+
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"
+END
+}
+
+# Don't call build ? install will duplicate a lot of work and --keep-stage is not enough
+
+package_rust() {
+  depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
+  provides=('cargo' 'rustfmt')
+  conflicts=('cargo' 'rustfmt')
+  replaces=('cargo' 'rustfmt')
+
+  cd "rustc-$pkgver-src"
+
+  export RUST_BACKTRACE=1
+  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
+
+  "$srcdir/watcher.sh" "$srcdir" &
+  _kill_pid=$!
+  sleep 10
+
+  DESTDIR="$pkgdir" python ./x.py install -j"$(nproc)"
+
+  kill $_kill_pid
+
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  # delete unnecesary files, e.g. components and manifest files only used for the uninstall script
+  cd "$pkgdir"/usr/lib/rustlib
+  rm components install.log manifest-* rust-installer-version uninstall.sh
+
+  # rustbuild always installs copies of the shared libraries to /usr/lib,
+  # overwrite them with symlinks to the per-architecture versions
+  ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so
+
+  # move docs and lib32 libs out of the way for splitting
+  mv "$pkgdir"/usr/share/doc "$srcdir"
+  #mv "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu "$srcdir"
+
+  install -d "$pkgdir"/usr/share/bash-completion
+  mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/
+}
+
+package_lib32-rust-libs() {
+  descriptino=('32-bit libraries for Rust')
+  depends=('lib32-gcc-libs')
+  provides=('lib32-rust')
+  conflicts=('lib32-rust')
+  replaces=('lib32-rust')
+
+  cd "rustc-$pkgver-src"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/
+  mv "$srcdir"/i686-unknown-linux-gnu "$pkgdir"/usr/lib/rustlib
+  ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so
+}
+
+package_rust-docs() {
+  description=('Documentation for the Rust programming language')
+
+  cd "rustc-$pkgver-src"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  mv "$srcdir"/doc "$pkgdir"/usr/share/doc
+}
+
+# vim:set ts=2 sw=2 et:
+# enable i686-unknown-linux-gnu target
+# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file
+#
+# Also trying to reduce memory usage by building with
+# -debuginfo-level-std=1
+# see https://github.com/rust-lang/rust/issues/60294
+
+source+=(config.toml.patch)
+sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660')
+
+eval "$(
+  declare -f prepare | \
+    sed '
+      $ i patch -p1 -i "$srcdir/config.toml.patch"
+    '
+)"
+
+# stop insanity of nproc (see FS#62952)
+eval "$(
+  declare -f build | \
+    sed '
+      s/-j"$(nproc)"/-j16/
+    '
+)"
+
+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/a75a6025d7e3424edf9baf3039056c0f8eea157631a175d00ac5a218aa54b510/484bf8be15015b330fa9a97b6dabb8c7627e59d5cddb2dd0e83478749f8aabad/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json"
+      '
+  )"
+fi
+
+# use binary rust-bin instead of rust (till we can bootstrap rust on IA-32)
+# rust is ok on pentium4 but broken on i686 in bootstrap!
+#makedepends=(${makedepends[@]//rust/})
+#makedepends+=('rust-bin')
+
+source+=('watcher.sh')
+sha256sums+=('SKIP')
diff --git a/build-support/disabled/rust/config.toml.patch b/build-support/disabled/rust/config.toml.patch
new file mode 100644
index 00000000..8d0762cd
--- /dev/null
+++ b/build-support/disabled/rust/config.toml.patch
@@ -0,0 +1,26 @@
+diff -rauN a/config.toml b/config.toml
+--- a/config.toml	2019-10-20 16:44:31.647900892 +0200
++++ b/config.toml	2019-10-20 16:44:39.637875348 +0200
+@@ -2,7 +2,7 @@
+ link-shared = true
+ 
+ [build]
+-target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"]
++target = ["i686-unknown-linux-gnu"]
+ cargo = "/usr/bin/cargo"
+ rustc = "/usr/bin/rustc"
+ python = "/usr/bin/python"
+@@ -21,11 +21,11 @@
+ # https://github.com/rust-lang/rust/issues/54872
+ codegen-units-std = 1
+ 
+-debuginfo-level = 2
++debuginfo-level = 0
+ 
+ channel = "stable"
+ 
+ rpath = false
+ 
+-[target.x86_64-unknown-linux-gnu]
++[target.i686-unknown-linux-gnu]
+ llvm-config = "/usr/bin/llvm-config"
diff --git a/build-support/disabled/rust/watcher.sh b/build-support/disabled/rust/watcher.sh
new file mode 100755
index 00000000..544c3712
--- /dev/null
+++ b/build-support/disabled/rust/watcher.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+term() {
+  echo "--> Got SIGTERM"
+  echo "--> killing inotifywait with PID $inotifywait"
+  kill -TERM "$inotifywait"
+}
+
+srcdir="$1"
+
+trap term SIGTERM
+
+inotifywait -mr -e close_write --format %w%f $srcdir | while read -r FILE; do
+  case "$FILE" in
+    *consts.rs)
+      echo "--> patching $FILE"
+      sed -i '/pub type U1024/d;/pub type P1024/d' $FILE
+      echo "--> finished patching $FILE"
+      ;;
+  esac
+done &
+inotifywait=$(ps -ef | grep inotifywait | grep -v grep | tr -s ' ' | cut -d ' ' -f2)
+echo "--> waiting for inotifywait $inotifywait"
+wait "$inotifywait"
+echo "--> watcher terminated"
-- 
cgit v1.2.3