Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=a41a653d601bbb29cd93a12bc75d9a3b450ae450
commit a41a653d601bbb29cd93a12bc75d9a3b450ae450 Author: crazy <[email protected]> Date: Fri Jan 26 02:56:30 2018 +0100 pacman-g2-3.9.3-1-x86_64 * Version bump * please note bumping packages in this repo is now a bit tricky see : 9a628a0 and 23da118 * we need makepkg on host and the right makepkg.conf in the chroot once we are done with the tc , this will change a bit however as is right now we build with wrong flags bc we copy $host makepkg.conf all the time over. diff --git a/source/base/pacman-g2/0001-fix-mercurial-cmd.patch b/source/base/pacman-g2/0001-fix-mercurial-cmd.patch deleted file mode 100644 index f808734..0000000 --- a/source/base/pacman-g2/0001-fix-mercurial-cmd.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4980f34c8554594c8935c3a3370797d34f31ea4b Mon Sep 17 00:00:00 2001 -From: crazy <[email protected]> -Date: Wed, 1 Feb 2017 12:52:03 +0100 -Subject: [PATCH] fix mercurial cmd - ---- - scripts/makepkg | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/makepkg b/scripts/makepkg -index e2487658..41468d7e 100755 ---- a/scripts/makepkg -+++ b/scripts/makepkg -@@ -1284,7 +1284,7 @@ if [ "$NOUP2DATE" = "0" ]; then - cvs) cmd="cvs";; - subversion) cmd="subversion";; - git) cmd="git";; -- mercurial) cmd="mercurial";; -+ mercurial) cmd="hg";; - bzr) cmd="bzr";; - esac - else --- -2.11.0 - diff --git a/source/base/pacman-g2/0001-makepkg-workaround-some-grep-issues.patch b/source/base/pacman-g2/0001-makepkg-workaround-some-grep-issues.patch deleted file mode 100644 index 039571e..0000000 --- a/source/base/pacman-g2/0001-makepkg-workaround-some-grep-issues.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8d20cd4461c92855686bc3ca8822e92fdee31d87 Mon Sep 17 00:00:00 2001 -From: crazy <[email protected]> -Date: Mon, 20 Jun 2016 13:35:05 +0200 -Subject: [PATCH] makepkg - workaround some grep issues - ---- - scripts/makepkg | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/makepkg b/scripts/makepkg -index 030e668..f3c1ba3 100755 ---- a/scripts/makepkg -+++ b/scripts/makepkg -@@ -1114,7 +1114,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then - # copy these before any update since without them we can't even reach the servers - cp -pf /etc/{resolv.conf,services} $CHROOTDIR/etc - # run pacman-g2 -Su twice in case pacman-g2 updated -- yes "" | /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Sy pacman-g2 --ask 94 && \ -+ yes "" 2>/dev/null | /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Sy pacman-g2 --ask 94 && \ - /usr/sbin/chroot "$CHROOTDIR" $PACMAN -Su --noconfirm - if [ "$?" != "0" ]; then - error "Failed to update chroot environment." -@@ -1213,7 +1213,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then - chroot_clean - # check optimization and write it to $BUILDSCRIPT - msg "Checking for optimization..." -- if cat "${BUILDLOG}" | grep -v HOST_ | grep -q -- "\($CFLAGS\|$CXXFLAGS\)" ; then -+ if grep -v "HOST_" "${BUILDLOG}" 2>/dev/null | grep -E -q "(${CFLAGS}|${CXXFLAGS})" ; then - if ! grep -q "# optimization" "${BUILDSCRIPT}" ; then - $ECHO -e "\n# optimization OK" >> "${BUILDSCRIPT}" - fi --- -2.9.0 - diff --git a/source/base/pacman-g2/0001-makepkg.conf.patch b/source/base/pacman-g2/0001-makepkg.conf.patch deleted file mode 100644 index 31fe1ae..0000000 --- a/source/base/pacman-g2/0001-makepkg.conf.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bea6d0e4915c091d6ffa00ca4a374c6b279f3acf Mon Sep 17 00:00:00 2001 -From: crazy <[email protected]> -Date: Mon, 5 Sep 2016 19:33:50 +0200 -Subject: [PATCH 1/4] makepkg.conf * kill ARM - ---- - etc/makepkg.conf.in | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in -index cbf4051..226621c 100644 ---- a/etc/makepkg.conf.in -+++ b/etc/makepkg.conf.in -@@ -23,12 +23,6 @@ case $(uname -m) in - CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe" - CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe" - ;; -- arm*) -- CARCH="arm" -- CHOST="arm-frugalware-linux" -- CFLAGS="-march=armv5te -O2 -pipe" -- CXXFLAGS="-march=armv5te -O2 -pipe" -- ;; - esac - export CARCH CHOST CFLAGS CXXFLAGS - --- -2.9.3 - diff --git a/source/base/pacman-g2/0001-workaround-LDFLAGS-mess-here.patch b/source/base/pacman-g2/0001-workaround-LDFLAGS-mess-here.patch deleted file mode 100644 index d5014dc..0000000 --- a/source/base/pacman-g2/0001-workaround-LDFLAGS-mess-here.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fe97b73d1bb8c30d9f5d636c9ac6aa301d2509b0 Mon Sep 17 00:00:00 2001 -From: crazy <[email protected]> -Date: Wed, 14 Sep 2016 16:50:33 +0200 -Subject: [PATCH] workaround LDFLAGS mess here - ---- - scripts/makepkg | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/scripts/makepkg b/scripts/makepkg -index 5bf8aa1..70edbb9 100755 ---- a/scripts/makepkg -+++ b/scripts/makepkg -@@ -1357,6 +1357,25 @@ if grep -i -q "^# Compiling Time: [~0-9\.]\+ SBU$" $BUILDSCRIPT && \ - fi - fi - -+### we use at least -Wl,--hash-style=both and conditional -+## -Wl,--as-needed. Gcc6 WIP will add -Wl,-O1.. HOWEVER some build server(s) -+## seems to use veryyyyyy old makepkg.conf even witout --hash-style=both.. -+## check here and workaround this when needed.. -+ -+if ! $ECHO $LDFLAGS | grep -q "\-Wl,--hash-style=both" ; then -+ warning "Broken LDFLAGS found, -Wl,--hash-style=both is missing from makepkg.conf!!" -+ warning "Enabling workaround, please fix your setup!!" -+ LDFLAGS+=" -Wl,--hash-style=both" -+ export LDFLAGS -+fi -+ -+if ! $ECHO $LDFLAGS | grep -q "\-Wl,-O1" ; then -+ warning "Broken LDFLAGS found, -Wl,-O1 is missing from makepkg.conf!!" -+ warning "Enabling workaround, please fix your setup!!" -+ LDFLAGS+=" -Wl,-O1" -+ export LDFLAGS -+fi -+ - - if [ "`check_option ASNEEDED`" ]; then - error "You are using deprecated option 'asneeded'." --- -2.9.3 - diff --git a/source/base/pacman-g2/0001-workaround-some-issues-with-up2date-checking.patch b/source/base/pacman-g2/0001-workaround-some-issues-with-up2date-checking.patch deleted file mode 100644 index ae4f1d7..0000000 --- a/source/base/pacman-g2/0001-workaround-some-issues-with-up2date-checking.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 663ade8fa9ececde15856c59511f1fa1ec848345 Mon Sep 17 00:00:00 2001 -From: crazy <[email protected]> -Date: Sat, 1 Oct 2016 21:25:48 +0200 -Subject: [PATCH 4/4] workaround some issues with up2date checking - ---- - scripts/makepkg | 41 +++++++++++++++++++++++++++++++++++------ - 1 file changed, 35 insertions(+), 6 deletions(-) - -diff --git a/scripts/makepkg b/scripts/makepkg -index 70edbb9..781094a 100755 ---- a/scripts/makepkg -+++ b/scripts/makepkg -@@ -904,7 +904,6 @@ else - error "Please make sure that you edit /etc/makepkg.conf and set the PACKAGER= variable" - exit 1 - fi -- - if [ ! -f $BUILDSCRIPT ]; then - error "$BUILDSCRIPT does not exist." - exit 1 -@@ -1268,12 +1267,42 @@ if [ "$NOUP2DATE" = "0" ]; then - msg "Checking for newer version..." - if $ECHO "$up2date"|grep -q " "; then - cmd=`$ECHO "$up2date"|sed 's/^\([^ ]*\) .*/\1/'` -- if type -p $cmd &>/dev/null; then -+ -+ if [[ "$cmd" =~ "echo" ]] || [[ "$cmd" =~ "date" ]]; then -+ if [ -n "$_F_scm_type" ]; then -+ msg "SCM in use fixing the up2date programm" -+ cmd="" -+ case "$_F_scm_type" in -+ cvs) cmd="cvs";; -+ subversion) cmd="subversion";; -+ git) cmd="git";; -+ mercurial) cmd="mercurial";; -+ bzr) cmd="bzr";; -+ esac -+ else -+ warning "u2date program is set to something we cannot handle" -+ msg2 " up2date programm = $cmd ?!" -+ ##fail -+ up2date="" -+ fi -+ fi -+ -+ [[ "$cmd" =~ "ncftpls" ]] && cmd="ncftp" -+ -+ if ! type -p $cmd &>/dev/null; then -+ if [ "$INCHROOT" == "1" ]; then -+ warning "up2date program -> $cmd is missing. Installing..." -+ handledeps $cmd -+ sleep 1 -+ up2date=`eval "$up2date"` -+ else -+ warning "The $cmd program is missing. Cannot check for newer version!" -+ msg2 "Use 'pacman-g2 -Sy $cmd' and try again.." -+ up2date="" -+ sleep 1 -+ fi -+ else - up2date=`eval "$up2date"` -- else -- warning "The $cmd program is missing. Cannot check for newer version!" -- up2date="" -- sleep 1 - fi - fi - if [ -z "$up2date" ]; then --- -2.10.0 - diff --git a/source/base/pacman-g2/0002-makepkg.conf-LDFLAGS.patch b/source/base/pacman-g2/0002-makepkg.conf-LDFLAGS.patch deleted file mode 100644 index 4d1655d..0000000 --- a/source/base/pacman-g2/0002-makepkg.conf-LDFLAGS.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 83bdc1464844bdac50b5d02acc822e477eb3ff5a Mon Sep 17 00:00:00 2001 -From: crazy <[email protected]> -Date: Mon, 5 Sep 2016 19:34:50 +0200 -Subject: [PATCH 2/4] makepkg.conf LDFLAGS * added -Wl,-O1 to LDFLAGS - ---- - etc/makepkg.conf.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in -index 226621c..da3c5e9 100644 ---- a/etc/makepkg.conf.in -+++ b/etc/makepkg.conf.in -@@ -26,7 +26,7 @@ case $(uname -m) in - esac - export CARCH CHOST CFLAGS CXXFLAGS - --export LDFLAGS="-Wl,--hash-style=both" -+export LDFLAGS="-Wl,--hash-style=both -Wl,-O1" - - # SMP Systems - #export MAKEFLAGS="-j2" --- -2.9.3 - diff --git a/source/base/pacman-g2/0002-remove-duplicated-check.patch b/source/base/pacman-g2/0002-remove-duplicated-check.patch deleted file mode 100644 index de5f354..0000000 --- a/source/base/pacman-g2/0002-remove-duplicated-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3b0826c7cb39b9fb1ddf665693aa3fdce0574760 Mon Sep 17 00:00:00 2001 -From: crazy <[email protected]> -Date: Fri, 9 Sep 2016 11:14:38 +0200 -Subject: [PATCH 2/4] remove duplicated check - ---- - scripts/makepkg | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/scripts/makepkg b/scripts/makepkg -index 1dd241b..5bf8aa1 100755 ---- a/scripts/makepkg -+++ b/scripts/makepkg -@@ -904,10 +904,7 @@ else - error "Please make sure that you edit /etc/makepkg.conf and set the PACKAGER= variable" - exit 1 - fi --if [ -z "$PKG_EXT" ]; then -- error "Please make sure that you edit /etc/makepkg.conf and set the PKG_EXT= variable" -- exit 1 --fi -+ - if [ ! -f $BUILDSCRIPT ]; then - error "$BUILDSCRIPT does not exist." - exit 1 --- -2.10.0 - diff --git a/source/base/pacman-g2/0003-disable-stable.patch b/source/base/pacman-g2/0003-disable-stable.patch deleted file mode 100644 index 9f27564..0000000 --- a/source/base/pacman-g2/0003-disable-stable.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7e1d17651728ce946eccb7cbb0acf226eaf00cfe Mon Sep 17 00:00:00 2001 -From: crazy <[email protected]> -Date: Mon, 5 Sep 2016 19:45:57 +0200 -Subject: [PATCH 3/4] disable stable - ---- - etc/pacman-g2.conf.in | 3 --- - etc/pacman-g2/repos/Makefile.am | 2 +- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/etc/pacman-g2.conf.in b/etc/pacman-g2.conf.in -index 0d6fd0d..2e9a6b3 100644 ---- a/etc/pacman-g2.conf.in -+++ b/etc/pacman-g2.conf.in -@@ -21,9 +21,6 @@ OldDelay = 3 - # -current - Include = /etc/pacman-g2/repos/frugalware-current - --# -stable --#Include = /etc/pacman-g2/repos/frugalware -- - # An example of a custom package repository. See the pacman-g2 manpage for - # tips on creating your own repositories. - #[custom] -diff --git a/etc/pacman-g2/repos/Makefile.am b/etc/pacman-g2/repos/Makefile.am -index 6400031..db74ed4 100644 ---- a/etc/pacman-g2/repos/Makefile.am -+++ b/etc/pacman-g2/repos/Makefile.am -@@ -1,4 +1,4 @@ --EXTRA_DIST = frugalware frugalware-current -+EXTRA_DIST = frugalware-current - - install-data-hook: - mkdir -p $(DESTDIR)$(sysconfdir)/pacman-g2/repos ; \ --- -2.9.3 - diff --git a/source/base/pacman-g2/0004-makepkg.patch b/source/base/pacman-g2/0004-makepkg.patch deleted file mode 100644 index 07a902e..0000000 --- a/source/base/pacman-g2/0004-makepkg.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 9bf10ee83c11cf6e7a21434e12434e6a35707f8d Mon Sep 17 00:00:00 2001 -From: crazy <[email protected]> -Date: Mon, 5 Sep 2016 19:59:16 +0200 -Subject: [PATCH 4/4] makepkg * move version checking before doing anything - else .. * strange logic to install depends and stuff and * then error out - because up2date does not match !?! :) - ---- - scripts/makepkg | 55 ++++++++++++++++++++++++++++--------------------------- - 1 file changed, 28 insertions(+), 27 deletions(-) - -diff --git a/scripts/makepkg b/scripts/makepkg -index f3c1ba3..1dd241b 100755 ---- a/scripts/makepkg -+++ b/scripts/makepkg -@@ -1266,6 +1266,34 @@ fi - - msg "Making package: $pkgname $pkgver-$pkgrel (`date`)" - -+# version checking -+if [ "$NOUP2DATE" = "0" ]; then -+ msg "Checking for newer version..." -+ if $ECHO "$up2date"|grep -q " "; then -+ cmd=`$ECHO "$up2date"|sed 's/^\([^ ]*\) .*/\1/'` -+ if type -p $cmd &>/dev/null; then -+ up2date=`eval "$up2date"` -+ else -+ warning "The $cmd program is missing. Cannot check for newer version!" -+ up2date="" -+ sleep 1 -+ fi -+ fi -+ if [ -z "$up2date" ]; then -+ $ECHO " FAILED" >&2 -+ error "There was no output!" -+ exit 1 -+ else -+ if [ "$pkgver" != "$up2date" ]; then -+ $ECHO " FAILED" >&2 -+ error "Upstream version differs! ($pkgver != $up2date)" -+ exit 1 -+ else -+ $ECHO " Passed" >&2 -+ fi -+ fi -+fi -+ - unset deplist makedeplist - if [ `type -p $PACMAN` -a "$NODEPS" = "0" ]; then - msg "Checking Buildtime Dependencies..." -@@ -1300,33 +1328,6 @@ fi - - cd $startdir - --# version checking --if [ "$NOUP2DATE" = "0" ]; then -- msg "Checking for newer version..." -- if $ECHO "$up2date"|grep -q " "; then -- cmd=`$ECHO "$up2date"|sed 's/^\([^ ]*\) .*/\1/'` -- if type -p $cmd &>/dev/null; then -- up2date=`eval "$up2date"` -- else -- warning "The $cmd program is missing. Cannot check for newer version!" -- up2date="" -- sleep 1 -- fi -- fi -- if [ -z "$up2date" ]; then -- $ECHO " FAILED" >&2 -- error "There was no output!" -- exit 1 -- else -- if [ "$pkgver" != "$up2date" ]; then -- $ECHO " FAILED" >&2 -- error "Upstream version differs! ($pkgver != $up2date)" -- exit 1 -- else -- $ECHO " Passed" >&2 -- fi -- fi --fi - - # estimate build time - if grep -i -q "^# Compiling Time: [~0-9\.]\+ SBU$" $BUILDSCRIPT && \ --- -2.9.3 - diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index b876ea8..fd3168e 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -7,9 +7,9 @@ USE_DEVEL=${USE_DEVEL:-"n"} USE_MINIMAL=${USE_MINIMAL:-"n"} pkgname=pacman-g2 -pkgver=3.9.2 +pkgver=3.9.3 Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053 -pkgrel=17 +pkgrel=1 pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/"; backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/frugalware-current) @@ -31,18 +31,8 @@ archs=('x86_64') _F_archive_nosort=y up2date="Flasttar $url/releases/" if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz \ - 0001-makepkg-workaround-some-grep-issues.patch \ - makepkg-tell-what-dirs-files-are-broken.patch \ - 0001-makepkg.conf.patch \ - 0002-makepkg.conf-LDFLAGS.patch \ - 0003-disable-stable.patch \ - 0004-makepkg.patch \ - 0001-workaround-LDFLAGS-mess-here.patch \ - 0002-remove-duplicated-check.patch \ - 0001-workaround-some-issues-with-up2date-checking.patch \ - strip-multilib.patch strip-2-multilib.patch 0001-fix-mercurial-cmd.patch) - signatures=("$source.asc" '' '' '' '' '' '' '' '' '' '' '' '') + source=($url/releases/$pkgname-$pkgver.tar.gz) + signatures=("$source.asc") else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2" @@ -70,7 +60,6 @@ build() sh autogen.sh fi - CFLAGS=${CFLAGS/O2/O0} if Fuse $USE_MINIMAL; then Fbuild else diff --git a/source/base/pacman-g2/makepkg-tell-what-dirs-files-are-broken.patch b/source/base/pacman-g2/makepkg-tell-what-dirs-files-are-broken.patch deleted file mode 100644 index c0b276c..0000000 --- a/source/base/pacman-g2/makepkg-tell-what-dirs-files-are-broken.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c7a2f12ec0ee9a7bff07d12c50063c08e0dc7c75 Mon Sep 17 00:00:00 2001 -From: crazy <[email protected]> -Date: Mon, 6 Jun 2016 22:44:41 +0200 -Subject: [PATCH 2/2] makepkg tell what dirs/files are broken * vmiklos told me - to fix it and I fixed it in my local tree but forgot to push :| * now makepkg - will tell what dir is wrong eg: * /usr/man should be /usr/share/man and so - on.. - ---- - scripts/makepkg | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/scripts/makepkg b/scripts/makepkg -index bac0fdc..8ce169a 100755 ---- a/scripts/makepkg -+++ b/scripts/makepkg -@@ -1733,13 +1733,14 @@ do - exit 1 - fi - ## broken /usr/share -- if [ -d ${dir}/usr/man ] || [ -d ${dir}/usr/docs ] || [ -d ${dir}/usr/$pkgname ]; then -- error "Broken package detected files are installed in /usr" -- error "but should be /usr/share" -- error "datadir may be broken!" -- error "Bailing out, please fix your package!" -- exit 1 -- fi -+ for file in man docs $pkgname; do -+ if [ -d ${dir}/usr/$file ]; then -+ error "Broken package detected files are installed" -+ error "in /usr/$file but should be /usr/share/$file" -+ error "Bailing out, please fix your package!" -+ exit 1 -+ fi -+ done - ## wrong unit path for systemd - if [ -d ${dir}/usr/lib/systemd/system ]; then - error "Your package has broken PATH for systemd unit files" --- -2.8.3 - diff --git a/source/base/pacman-g2/pacman-g2.install b/source/base/pacman-g2/pacman-g2.install index af79df4..d7af927 100644 --- a/source/base/pacman-g2/pacman-g2.install +++ b/source/base/pacman-g2/pacman-g2.install @@ -1,10 +1,23 @@ post_upgrade() { + echo "Updating makepkg.conf.." if ! grep -q "\-Wl,-O1" /etc/makepkg.conf ; then - echo "Updating LDFLAGS.." sed -i 's/LDFLAGS="/LDFLAGS="-Wl,-O1 /g' /etc/makepkg.conf fi + if ! grep -q "\-Wl,--sort-common" /etc/makepkg.conf ; then + sed -i 's/LDFLAGS="/LDFLAGS="-Wl,--sort-common /g' /etc/makepkg.conf + fi + + if grep -q "\-Wl,--hash-style=both" /etc/makepkg.conf ; then + sed -i 's/hash-style=both/hash-style=gnu/g' /etc/makepkg.conf + fi + + if ! grep -q "\-fstack-protector-strong" /etc/makepkg.conf ; then + sed -i 's/-pipe/-pipe -fstack-protector-strong/g' /etc/makepkg.conf + fi + + } diff --git a/source/base/pacman-g2/strip-2-multilib.patch b/source/base/pacman-g2/strip-2-multilib.patch deleted file mode 100644 index 43b5454..0000000 --- a/source/base/pacman-g2/strip-2-multilib.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur pacman-g2-3.9.2/scripts/makepkg pacman-g2-3.9.2-strip2/scripts/makepkg ---- pacman-g2-3.9.2/scripts/makepkg 2016-10-22 08:30:15.175212510 +0200 -+++ pacman-g2-3.9.2-strip2/scripts/makepkg 2016-10-22 08:32:33.083214555 +0200 -@@ -587,11 +587,11 @@ - fi - if [ ! "`check_option NOSTRIP`" -a "$NOSTRIP" = "0" ]; then - msg "Stripping symbols from libraries from $subpkg$1..." -- find $dir/{,usr,usr/local,opt/*}/{lib,lib32} -type f -not -name "*.dll" -not -name "*.exe" \ -+ find $dir/{,usr,usr/local,opt/*}/{lib,lib32} -type f -not -name "*.dll" -not -name "*.exe" -not -name "*.a" -not -name "*.o" \ - -exec /usr/bin/strip -s '{}' \; 2>&1 \ - | grep -v "No such file" | grep -v "format not recognized" - msg "Stripping symbols from binaries from $subpkg$p..." -- find $dir/{,usr,usr/local,usr/i686-frugalware-linux,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ -+ find $dir/{,usr,usr/local,usr/i686-frugalware-linux,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" -not -name "*.a" -not -name "*.o" \ - -exec /usr/bin/strip '{}' \; 2>&1 \ - | grep -v "No such file" | grep -v "format not recognized" - fi diff --git a/source/base/pacman-g2/strip-multilib.patch b/source/base/pacman-g2/strip-multilib.patch deleted file mode 100644 index 05740ba..0000000 --- a/source/base/pacman-g2/strip-multilib.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur pacman-g2-3.9.2/scripts/makepkg pacman-g2-3.9.2-strip/scripts/makepkg ---- pacman-g2-3.9.2/scripts/makepkg 2016-10-16 20:07:36.199206578 +0200 -+++ pacman-g2-3.9.2-strip/scripts/makepkg 2016-10-16 20:28:42.268225344 +0200 -@@ -586,12 +586,12 @@ - subpkg="subpackage " - fi - if [ ! "`check_option NOSTRIP`" -a "$NOSTRIP" = "0" ]; then -- msg "Stripping debugging symbols from libraries from $subpkg$1..." -- find $dir/{,usr,usr/local,opt/*}/lib -type f -not -name "*.dll" -not -name "*.exe" \ -- -exec /usr/bin/strip --strip-debug '{}' \; 2>&1 \ -+ msg "Stripping symbols from libraries from $subpkg$1..." -+ find $dir/{,usr,usr/local,opt/*}/{lib,lib32} -type f -not -name "*.dll" -not -name "*.exe" \ -+ -exec /usr/bin/strip -s '{}' \; 2>&1 \ - | grep -v "No such file" | grep -v "format not recognized" - msg "Stripping symbols from binaries from $subpkg$p..." -- find $dir/{,usr,usr/local,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ -+ find $dir/{,usr,usr/local,usr/i686-frugalware-linux,opt/*}/{bin,sbin} -type f -not -name "*.dll" -not -name "*.exe" \ - -exec /usr/bin/strip '{}' \; 2>&1 \ - | grep -v "No such file" | grep -v "format not recognized" - fi _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
