From 8fbbc4e76cab161976abf07479ce455cb17ca5ff Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 15 Nov 2021 20:47:56 +0100 Subject: [PATCH] pacman: update --- .../0020-Strip-static-libraries-as-well.patch | 27 +++++++++++++++++++ pacman/PKGBUILD | 11 +++++--- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 pacman/0020-Strip-static-libraries-as-well.patch diff --git a/pacman/0020-Strip-static-libraries-as-well.patch b/pacman/0020-Strip-static-libraries-as-well.patch new file mode 100644 index 00000000..6a9c5a23 --- /dev/null +++ b/pacman/0020-Strip-static-libraries-as-well.patch @@ -0,0 +1,27 @@ +From c24fb101df85a0b8a2bee220602fe88c4051ec87 Mon Sep 17 00:00:00 2001 +From: Mehdi Chinoune +Date: Sat, 13 Nov 2021 08:08:40 +0100 +Subject: [PATCH 20/N] Strip static libraries as well + +Fixes #7 +--- + scripts/libmakepkg/tidy/strip.sh.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in +index c376a39..7324fc3 100644 +--- a/scripts/libmakepkg/tidy/strip.sh.in ++++ b/scripts/libmakepkg/tidy/strip.sh.in +@@ -203,6 +203,9 @@ tidy_strip() { + case "$(@FILECMD@ -bi "$binary")" in + *application/x-dosexec*) # Windows executables and dlls + strip_flags="$STRIP_SHARED";; ++ *application/x-archive*) # Static and Import Libraries (*.a and *.dll.a) ++ strip_flags="$STRIP_STATIC" ++ STRIPLTO=1;; + *application/x-sharedlib*) # Libraries (.so) + strip_flags="$STRIP_SHARED";; + *Type:*'DYN (Position-Independent Executable file)'*) # Relocatable binaries +-- +2.33.0 + diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index 345ded46..bb9e4267 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -4,7 +4,7 @@ pkgname=pacman pkgver=6.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="A library-based package manager with dependency support (MSYS2 port)" arch=('i686' 'x86_64') url="https://www.archlinux.org/pacman/" @@ -60,7 +60,8 @@ source=(pacman-${pkgver}::git+https://gitlab.archlinux.org/pacman/pacman.git#com 0016-Use-msys-tools.patch 0017-Export-CC-and-CXX-variables-explicitly.patch 0018-pacman.c-handle-cr-on-stdin-as-well.patch - 0019-Add-a-CI-job.patch) + 0019-Add-a-CI-job.patch + 0020-Strip-static-libraries-as-well.patch) validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) sha256sums=('SKIP' @@ -86,7 +87,8 @@ sha256sums=('SKIP' '48a0b3b9e5206cc46b7092f2736da2493194a4ce44a154ba8f7740d690ccedb2' '5029415842e9c51dd8aa6e380636316cf3f8f2b3ef0ae3f9430658213cb56a2a' '0ac2184c8419041f2948517a1c8b66ed740cf0bb1ac5856b384008495317e87b' - '17604e359cbc1666b678359a5f46b5f822ca0d3a62c6c672b74d45399d78ab5e') + '17604e359cbc1666b678359a5f46b5f822ca0d3a62c6c672b74d45399d78ab5e' + '7e1b6df6806a62e69ec072188bb5fdc6575d030e7ac140cee191d0fdf78454a5') apply_git_am_with_msg() { for _patch in "$@" @@ -121,7 +123,8 @@ prepare() { 0016-Use-msys-tools.patch \ 0017-Export-CC-and-CXX-variables-explicitly.patch \ 0018-pacman.c-handle-cr-on-stdin-as-well.patch \ - 0019-Add-a-CI-job.patch + 0019-Add-a-CI-job.patch \ + 0020-Strip-static-libraries-as-well.patch } build() {