pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Link using the "-search_paths_fir...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9e3574f75ac2
branches:  trunk
changeset: 574390:9e3574f75ac2
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Apr 15 22:25:11 2010 +0000

description:
Link using the "-search_paths_first" option under Mac OS X to make
sure that the linker uses our static "libarchive.a" instead of
the outdated dynamic library "/usr/lib/libarchive.dylib".

diffstat:

 pkgtools/pkg_install/Makefile |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 20358598a91a -r 9e3574f75ac2 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Thu Apr 15 20:55:19 2010 +0000
+++ b/pkgtools/pkg_install/Makefile     Thu Apr 15 22:25:11 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.177 2010/04/14 18:24:58 joerg Exp $
+# $NetBSD: Makefile,v 1.178 2010/04/15 22:25:11 tron Exp $
 
 # Notes to package maintainers:
 #
@@ -124,6 +124,12 @@
 CONFIG_GUESS_OVERRIDE+=        ${WRKDIR}/libarchive/build/autoconf/config.guess
 CONFIG_SUB_OVERRIDE+=  ${WRKDIR}/libarchive/build/autoconf/config.sub
 
+.  if ${OPSYS} == "Darwin"
+# Make sure that the linker used our static library instead of the
+# (outdated) dynamic library "/usr/lib/libarchive.dylib".
+LDFLAGS+=      -Wl,-search_paths_first
+.  endif
+
 # Hack to make sure that the libarchive version is replaced
 pre-configure: config-guess-override config-sub-override
 .endif



Home | Main Index | Thread Index | Old Index