[pkgsrc/trunk]: pkgsrc/mk/buildlink2 Pass LDFLAGS (minus any libraries) to th...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ffdc6a10710d
branches:  trunk
changeset: 469270:ffdc6a10710d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Feb 21 10:35:57 2004 +0000

description:
Pass LDFLAGS (minus any libraries) to the compiler when creating the
trivial libtool archive.

diffstat:

 mk/buildlink2/bsd.buildlink2.mk |  5 +++--
 mk/buildlink2/fake-la           |  4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r f7a3cc4d192c -r ffdc6a10710d mk/buildlink2/bsd.buildlink2.mk
--- a/mk/buildlink2/bsd.buildlink2.mk   Sat Feb 21 08:38:45 2004 +0000
+++ b/mk/buildlink2/bsd.buildlink2.mk   Sat Feb 21 10:35:57 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.119 2004/02/18 14:23:43 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.120 2004/02/21 10:35:57 jlam Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -195,7 +195,7 @@
 # buildlink target.  This ensures that the symlinks are created
 # before any configure scripts or build commands are called.
 #
-.for _target_ in ${BUILDLINK_TARGETS}
+.for _target_ in ${BUILDLINK_PRE_TARGETS} ${BUILDLINK_TARGETS}
 do-buildlink: ${_target_}
 .endfor
 
@@ -859,6 +859,7 @@
                -e "s|@AWK@|${AWK:Q}|g"                                 \
                -e "s|@BASENAME@|${BASENAME:Q}|g"                       \
                -e "s|@CC@|${BUILDLINK_CC:Q}|g"                         \
+               -e "s|@LDFLAGS@|${LDFLAGS:N-l*:Q}|g"                    \
                -e "s|@CP@|${CP:Q}|g"                                   \
                -e "s|@DIRNAME@|${DIRNAME:Q}|g"                         \
                -e "s|@ECHO@|${ECHO:Q}|g"                               \
diff -r f7a3cc4d192c -r ffdc6a10710d mk/buildlink2/fake-la
--- a/mk/buildlink2/fake-la     Sat Feb 21 08:38:45 2004 +0000
+++ b/mk/buildlink2/fake-la     Sat Feb 21 10:35:57 2004 +0000
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: fake-la,v 1.10 2004/02/05 09:57:53 jlam Exp $
+# $NetBSD: fake-la,v 1.11 2004/02/21 10:35:57 jlam Exp $
 
 AR="@AR@"
 AWK="@AWK@"
@@ -84,7 +84,7 @@
        cd $tmpdir
        ${ECHO} "static int i;" > nonempty.c    # create a nonempty input file
        ${LIBTOOL} --mode=compile ${CC} -c nonempty.c
-       ${LIBTOOL} --mode=link ${CC} -o $libbase.la nonempty.lo -rpath $tmpdir/inst -version-info $version
+       ${LIBTOOL} --mode=link ${CC} @LDFLAGS@ -o $libbase.la nonempty.lo -rpath $tmpdir/inst -version-info $version
        ${LIBTOOL} --mode=install ${CP} $libbase.la $tmpdir/inst >/dev/null
 
        # Reset the ld.so cache as "libtool --mode=install" may have executed