[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / devel / apr-util / patches

File: [cvs.NetBSD.org] / pkgsrc / devel / apr-util / patches / patch-aa (download)

Revision 1.7, Tue Dec 10 08:27:06 2013 UTC (6 years, 9 months ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, HEAD
Changes since 1.6: +8 -1 lines

Add comments to patch-aa from commit logs.

$NetBSD: patch-aa,v 1.7 2013/12/10 08:27:06 obache Exp $

* Use libtool in the wrapper directory instead of the one installed by
  apr.  Otherwise, dependency_libs in libaprutil-1.la is set incorrectly.

  Don't let the build's LDFLAGS be polluted by what provides apr, because apr
  doesn't know about all dependencies of apr-util.  Otherwise the final binary
  wouldn't have the proper RPATHs.

--- configure.orig	2013-11-13 16:41:32.000000000 +0000
+++ configure
@@ -24308,7 +24308,7 @@ case $host in
             < $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
-        cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk
+        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