[arch-commits] Commit in rust/repos/extra-x86_64 (PKGBUILD PKGBUILD libexec.diff)

Jan Steffens heftig at archlinux.org
Thu Feb 11 22:21:15 UTC 2021


    Date: Thursday, February 11, 2021 @ 22:21:15
  Author: heftig
Revision: 407851

archrelease: copy trunk to extra-x86_64

Added:
  rust/repos/extra-x86_64/PKGBUILD
    (from rev 407850, rust/trunk/PKGBUILD)
  rust/repos/extra-x86_64/libexec.diff
    (from rev 407850, rust/trunk/libexec.diff)
Deleted:
  rust/repos/extra-x86_64/PKGBUILD

--------------+
 PKGBUILD     |  336 +++++++++++++++++++++++++++++----------------------------
 libexec.diff |   24 ++++
 2 files changed, 195 insertions(+), 165 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-11 22:20:23 UTC (rev 407850)
+++ PKGBUILD	2021-02-11 22:21:15 UTC (rev 407851)
@@ -1,165 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Daniel Micay <danielmicay at gmail.com>
-# Contributor: userwithuid <userwithuid at gmail.com>
-
-pkgname=('rust' 'lib32-rust-libs' 'rust-musl' 'rust-docs')
-epoch=1
-pkgver=1.49.0
-pkgrel=1
-
-_llvm_ver=11.0.0
-
-pkgdesc='Systems programming language focused on safety, speed and concurrency'
-url='https://www.rust-lang.org/'
-arch=('x86_64')
-license=('MIT' 'Apache')
-
-makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'lib32-gcc-libs' 'perl' 'python'
-             'curl' 'cmake' 'musl')
-checkdepends=('procps-ng' 'gdb')
-
-options=('!emptydirs' '!strip')
-
-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})
-
-sha256sums=('b50aefa8df1fdfc9bccafdbf37aee611c8dfe81bf5648d5f43699c50289dc779'
-            'SKIP'
-            '374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234'
-            'SKIP')
-validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
-              '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar at redhat.com>
-              'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
-
-prepare() {
-  cd "rustc-$pkgver-src"
-
-  cat >config.toml <<END
-[llvm]
-link-shared = true
-
-[build]
-target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "x86_64-unknown-linux-musl"]
-tools = ["cargo", "rls", "clippy", "miri", "rustfmt", "analysis", "src"]
-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-std = 2
-
-channel = "stable"
-
-rpath = false
-
-[target.x86_64-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config"
-
-[target.x86_64-unknown-linux-musl]
-musl-root = "/usr/lib/musl"
-END
-}
-
-build() {
-  cd "rustc-$pkgver-src"
-
-  export RUST_BACKTRACE=1
-  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
-
-  python ./x.py dist -j "$(nproc)"
-  DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)"
-
-  # Remove analysis data for libs that weren't installed
-  # TODO: Find out where these come from
-  local file lib
-  while read -rd '' file; do
-    lib="${file%.json}.rlib"
-    lib="${lib/\/analysis\///lib/}"
-    if [[ ! -e $lib ]]; then
-      echo "missing '$lib'"
-      rm -v "$file"
-    fi
-  done < <(find "dest-rust/usr/lib/rustlib"  -path '*/analysis/*.json' -print0)
-
-  # move docs and cross targets out of the way for splitting
-  mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686
-  mv dest-rust/usr/lib/rustlib/x86_64-unknown-linux-musl dest-musl
-  mv dest-rust/usr/share/doc dest-doc
-}
-
-package_rust() {
-  depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
-  optdepends=('lldb: rust-lldb script'
-              'gdb: rust-gdb script')
-  provides=('cargo' 'rustfmt')
-  conflicts=('cargo' 'rustfmt')
-  replaces=('cargo' 'rustfmt' 'cargo-tree')
-
-  cd "rustc-$pkgver-src"
-
-  cp -a dest-rust/* "$pkgdir"
-  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
-
-  install -d "$pkgdir"/usr/share/bash-completion/
-  mv "$pkgdir"/etc/bash_completion.d "$pkgdir"/usr/share/bash-completion/completions
-}
-
-package_lib32-rust-libs() {
-  pkgdesc='32-bit target and 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/
-  cp -a dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu
-  ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so
-}
-
-package_rust-musl() {
-  pkgdesc='Musl target for Rust'
-
-  cd "rustc-$pkgver-src"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  install -d "$pkgdir"/usr/lib/rustlib/
-  cp -a dest-musl "$pkgdir"/usr/lib/rustlib/x86_64-unknown-linux-musl
-}
-
-package_rust-docs() {
-  pkgdesc='Documentation for the Rust programming language'
-
-  cd "rustc-$pkgver-src"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
-
-  install -d "$pkgdir"/usr/share/
-  cp -a dest-doc "$pkgdir"/usr/share/doc
-}
-
-# vim:set ts=2 sw=2 et:

Copied: rust/repos/extra-x86_64/PKGBUILD (from rev 407850, rust/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-02-11 22:21:15 UTC (rev 407851)
@@ -0,0 +1,171 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Alexander F Rødseth <xyproto at archlinux.org>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: userwithuid <userwithuid at gmail.com>
+
+pkgname=('rust' 'lib32-rust-libs' 'rust-musl' 'rust-docs')
+epoch=1
+pkgver=1.50.0
+pkgrel=1
+
+_llvm_ver=11.0.1
+
+pkgdesc='Systems programming language focused on safety, speed and concurrency'
+url='https://www.rust-lang.org/'
+arch=('x86_64')
+license=('MIT' 'Apache')
+
+makedepends=('rust' "llvm=$_llvm_ver" 'libffi' 'lib32-gcc-libs' 'perl' 'python'
+             'curl' 'cmake' 'musl')
+checkdepends=('procps-ng' 'gdb')
+
+options=('!emptydirs' '!strip')
+
+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}
+  libexec.diff
+)
+sha256sums=('95978f8d02bb6175ae3238930baf03563c240aedf9a70bebdc3eaa2a8c3c5a5e'
+            'SKIP'
+            '087be3f1116e861cd969c9b0b0903c27028b52eaf45157276f50a9c2500687fc'
+            'SKIP'
+            '9ba3070dbc877ab5e045b6a20be9134f80d8aece42766b4cfbad2a4a60c27514')
+validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
+              '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar at redhat.com>
+              'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
+
+prepare() {
+  cd "rustc-$pkgver-src"
+
+  # Patch cargo so credential helpers are in /usr/lib instead of /usr/libexec
+  patch -Np1 -i ../libexec.diff
+
+  cat >config.toml <<END
+[llvm]
+link-shared = true
+
+[build]
+target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "x86_64-unknown-linux-musl"]
+tools = ["cargo", "rls", "clippy", "miri", "rustfmt", "analysis", "src"]
+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-std = 2
+
+channel = "stable"
+
+rpath = false
+
+[target.x86_64-unknown-linux-gnu]
+llvm-config = "/usr/bin/llvm-config"
+
+[target.x86_64-unknown-linux-musl]
+musl-root = "/usr/lib/musl"
+END
+}
+
+build() {
+  cd "rustc-$pkgver-src"
+
+  export RUST_BACKTRACE=1
+  export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src"
+
+  python ./x.py dist -j "$(nproc)"
+  DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)"
+
+  # Remove analysis data for libs that weren't installed
+  # TODO: Find out where these come from
+  local file lib
+  while read -rd '' file; do
+    lib="${file%.json}.rlib"
+    lib="${lib/\/analysis\///lib/}"
+    if [[ ! -e $lib ]]; then
+      echo "missing '$lib'"
+      rm -v "$file"
+    fi
+  done < <(find "dest-rust/usr/lib/rustlib"  -path '*/analysis/*.json' -print0)
+
+  # move docs and cross targets out of the way for splitting
+  mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686
+  mv dest-rust/usr/lib/rustlib/x86_64-unknown-linux-musl dest-musl
+  mv dest-rust/usr/share/doc dest-doc
+}
+
+package_rust() {
+  depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2')
+  optdepends=('lldb: rust-lldb script'
+              'gdb: rust-gdb script')
+  provides=('cargo' 'rustfmt')
+  conflicts=('cargo' 'rustfmt')
+  replaces=('cargo' 'rustfmt' 'cargo-tree')
+
+  cd "rustc-$pkgver-src"
+
+  cp -a dest-rust/* "$pkgdir"
+  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
+
+  install -d "$pkgdir"/usr/share/bash-completion/
+  mv "$pkgdir"/etc/bash_completion.d "$pkgdir"/usr/share/bash-completion/completions
+}
+
+package_lib32-rust-libs() {
+  pkgdesc='32-bit target and 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/
+  cp -a dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu
+  ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so
+}
+
+package_rust-musl() {
+  pkgdesc='Musl target for Rust'
+
+  cd "rustc-$pkgver-src"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  install -d "$pkgdir"/usr/lib/rustlib/
+  cp -a dest-musl "$pkgdir"/usr/lib/rustlib/x86_64-unknown-linux-musl
+}
+
+package_rust-docs() {
+  pkgdesc='Documentation for the Rust programming language'
+
+  cd "rustc-$pkgver-src"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+
+  install -d "$pkgdir"/usr/share/
+  cp -a dest-doc "$pkgdir"/usr/share/doc
+}
+
+# vim:set ts=2 sw=2 et:

Copied: rust/repos/extra-x86_64/libexec.diff (from rev 407850, rust/trunk/libexec.diff)
===================================================================
--- libexec.diff	                        (rev 0)
+++ libexec.diff	2021-02-11 22:21:15 UTC (rev 407851)
@@ -0,0 +1,24 @@
+diff -u -r rustc-1.50.0-src/src/bootstrap/dist.rs rustc-1.50.0-src-nolibexec/src/bootstrap/dist.rs
+--- rustc-1.50.0-src/src/bootstrap/dist.rs	2021-02-10 17:36:44.000000000 +0000
++++ rustc-1.50.0-src-nolibexec/src/bootstrap/dist.rs	2021-02-11 18:23:36.312495419 +0000
+@@ -980,7 +980,7 @@
+         for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
+             let dirent = dirent.expect("read dir entry");
+             if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
+-                tarball.add_file(&dirent.path(), "libexec", 0o755);
++                tarball.add_file(&dirent.path(), "lib", 0o755);
+             }
+         }
+ 
+diff -u -r rustc-1.50.0-src/src/tools/cargo/src/cargo/ops/registry/auth.rs rustc-1.50.0-src-nolibexec/src/tools/cargo/src/cargo/ops/registry/auth.rs
+--- rustc-1.50.0-src/src/tools/cargo/src/cargo/ops/registry/auth.rs	2021-02-10 17:37:00.000000000 +0000
++++ rustc-1.50.0-src-nolibexec/src/tools/cargo/src/cargo/ops/registry/auth.rs	2021-02-11 18:24:14.944321464 +0000
+@@ -223,7 +223,7 @@
+         .parent()
+         .and_then(|p| p.parent())
+         .ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?;
+-    let exe = root.join("libexec").join(format!(
++    let exe = root.join("lib").join(format!(
+         "cargo-credential-{}{}",
+         cred_name,
+         std::env::consts::EXE_SUFFIX


More information about the arch-commits mailing list