Tue Dec 10 08:27:06 2013 UTC ()
Add comments to patch-aa from commit logs.


(obache)
diff -r1.17 -r1.18 pkgsrc/devel/apr-util/distinfo
diff -r1.6 -r1.7 pkgsrc/devel/apr-util/patches/patch-aa
cvs diff -r1.17 -r1.18 pkgsrc/devel/apr-util/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/apr-util/distinfo 2013/12/10 05:47:59 1.17
+++ pkgsrc/devel/apr-util/distinfo 2013/12/10 08:27:06 1.18
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.17 2013/12/10 05:47:59 obache Exp $ 1$NetBSD: distinfo,v 1.18 2013/12/10 08:27:06 obache Exp $
2 2
3SHA1 (apr-util-1.5.3.tar.bz2) = de0184ee03dfdc6dec4d013970d1862251e86925 3SHA1 (apr-util-1.5.3.tar.bz2) = de0184ee03dfdc6dec4d013970d1862251e86925
4RMD160 (apr-util-1.5.3.tar.bz2) = ec75523770f5e951c201d65ba313fa746546cc9a 4RMD160 (apr-util-1.5.3.tar.bz2) = ec75523770f5e951c201d65ba313fa746546cc9a
5Size (apr-util-1.5.3.tar.bz2) = 695303 bytes 5Size (apr-util-1.5.3.tar.bz2) = 695303 bytes
6SHA1 (patch-aa) = a78d9a6a63d5b25133d8436e43f55487bee62c81 6SHA1 (patch-aa) = 350b4e8fb3097d4df597c284321ca5dc25ce015c
cvs diff -r1.6 -r1.7 pkgsrc/devel/apr-util/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/apr-util/patches/patch-aa 2013/12/10 05:47:59 1.6
+++ pkgsrc/devel/apr-util/patches/patch-aa 2013/12/10 08:27:06 1.7
@@ -1,13 +1,20 @@ @@ -1,13 +1,20 @@
1$NetBSD: patch-aa,v 1.6 2013/12/10 05:47:59 obache Exp $ 1$NetBSD: patch-aa,v 1.7 2013/12/10 08:27:06 obache Exp $
 2
 3* Use libtool in the wrapper directory instead of the one installed by
 4 apr. Otherwise, dependency_libs in libaprutil-1.la is set incorrectly.
 5
 6 Don't let the build's LDFLAGS be polluted by what provides apr, because apr
 7 doesn't know about all dependencies of apr-util. Otherwise the final binary
 8 wouldn't have the proper RPATHs.
2 9
3--- configure.orig 2013-11-13 16:41:32.000000000 +0000 10--- configure.orig 2013-11-13 16:41:32.000000000 +0000
4+++ configure 11+++ configure
5@@ -24308,7 +24308,7 @@ case $host in 12@@ -24308,7 +24308,7 @@ case $host in
6 < $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk 13 < $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
7 ;; 14 ;;
8 *) 15 *)
9- cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk 16- cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk
10+ sed -e 's:^LIBTOOL=.*:LIBTOOL=$(WRAPPER_DIR)/bin/libtool:' -e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk 17+ sed -e 's:^LIBTOOL=.*:LIBTOOL=$(WRAPPER_DIR)/bin/libtool:' -e "s:^LDFLAGS=.*:LDFLAGS=${LDFLAGS}:" $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
11 ;; 18 ;;
12 esac 19 esac
13  20