[arch-commits] Commit in pacman/trunk (2 files)

[Dan McGee]

    Date: Monday, June 21, 2010 @ 08:52:09
  Author: dan
Revision: 83376

fix optdepends, fix manpages, fix stripping issues

Added:
  pacman/trunk/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch
Modified:
  pacman/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch |   32 ++++++++++
 PKGBUILD                                                        |   17 +++--
 2 files changed, 42 insertions(+), 7 deletions(-)

Added: 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch
===================================================================
--- 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch	                        (rev 0)
+++ 0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch	2010-06-21 12:52:09 UTC (rev 83376)
@@ -0,0 +1,32 @@
+From dc817a2061699cd1f33ca93f0d93a1fbc2f33ea1 Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan at archlinux.org>
+Date: Thu, 17 Jun 2010 14:32:08 +1000
+Subject: [PATCH] makepkg: fallback to sane defaults for library stripping
+
+If the library stripping variables are not defined in makepkg.conf,
+libraries will be fully stripped and become broken.  Fallback to a
+sane default stripping level.
+
+Signed-off-by: Allan McRae <allan at archlinux.org>
+Signed-off-by: Dan McGee <dan at archlinux.org>
+---
+ scripts/makepkg.sh.in |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
+index d986701..e64b564 100644
+--- a/scripts/makepkg.sh.in
++++ b/scripts/makepkg.sh.in
+@@ -864,6 +864,9 @@ tidy_install() {
+ 
+ 	if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then
+ 		msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")"
++		# make sure library stripping variables are defined to prevent excess stripping
++		[[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S"
++		[[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S"
+ 		local binary
+ 		find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do
+ 			case "$(file -bi "$binary")" in
+-- 
+1.7.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-21 12:52:08 UTC (rev 83375)
+++ PKGBUILD	2010-06-21 12:52:09 UTC (rev 83376)
@@ -4,34 +4,37 @@
 
 pkgname=pacman
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base')
 depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist')
-optdepends=('fakeroot: for makepkg usage as normal user'
-            'python: for rankmirrors script usage')
+optdepends=('fakeroot: for makepkg usage as normal user')
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
 options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf
-        makepkg.conf)
+        makepkg.conf
+        0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch)
 md5sums=('50ad71be1faaad84842c576e239d1bb5'
          '80f5bb2a606553512d0db857f78d9ac2'
-         'aef317285c7d16ac495b0e53deeb948d')
+         'aef317285c7d16ac495b0e53deeb948d'
+         'f8c4a3cc7702a7a70d177659441495c5')
 sha256sums=('cd80e206ee653ce337555c73b7064088e672e9341245317fe09dc52d06bff3c3'
             '97fb68536c1179a7de52dfb8a107c6e9bf3a71eaa6a98d6ae74dc224d4ca5838'
-            '3a60e1f895c90c8e74f5ca389fa05fb3328745e9873c5452b8cd1b2e68bee418')
+            '3a60e1f895c90c8e74f5ca389fa05fb3328745e9873c5452b8cd1b2e68bee418'
+            '99f1d108f930b134cfb4c1ca8c86cd282fe9efb69de39cd747218f3d448dda44')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  patch -Np1 < $srcdir/0001-makepkg-fallback-to-sane-defaults-for-library-stripp.patch
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc
   make || return 1
 }