pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Don't remove library options from the command line ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ed792b72e27
branches:  trunk
changeset: 486121:6ed792b72e27
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Dec 23 14:27:04 2004 +0000

description:
Don't remove library options from the command line quite so aggressively.
Allow the configure process a chance to detect on its own whether the
named library exists or not by allowing those library options to pass
through to the compiler on a test compile.  A package that *needs*
those library options to be removed can add the appropriate rm:
BUILDLINK_TRANSFORM command to its package Makefile.

diffstat:

 mk/db1.builtin.mk    |  3 +--
 mk/dlopen.builtin.mk |  4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 2b9dcfee9fd5 -r 6ed792b72e27 mk/db1.builtin.mk
--- a/mk/db1.builtin.mk Thu Dec 23 13:51:27 2004 +0000
+++ b/mk/db1.builtin.mk Thu Dec 23 14:27:04 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: db1.builtin.mk,v 1.9 2004/12/11 00:32:16 jlam Exp $
+# $NetBSD: db1.builtin.mk,v 1.10 2004/12/23 14:27:04 jlam Exp $
 
 .for _lib_ in db db1
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -70,7 +70,6 @@
 BUILDLINK_TRANSFORM+=  l:db:db1
 .    else
 BUILDLINK_LDADD.db1=   # empty
-BUILDLINK_TRANSFORM+=  rm:-ldb
 .    endif
 BUILDLINK_LIBS.db1=    ${BUILDLINK_LDADD.db1}
 
diff -r 2b9dcfee9fd5 -r 6ed792b72e27 mk/dlopen.builtin.mk
--- a/mk/dlopen.builtin.mk      Thu Dec 23 13:51:27 2004 +0000
+++ b/mk/dlopen.builtin.mk      Thu Dec 23 14:27:04 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.builtin.mk,v 1.7 2004/12/02 15:04:16 jlam Exp $
+# $NetBSD: dlopen.builtin.mk,v 1.8 2004/12/23 14:27:04 jlam Exp $
 
 .for _lib_ in dl
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -71,8 +71,6 @@
 # scripts already check for -ldl themselves.
 #
 BUILDLINK_LDADD.dl=    -ldl
-.    else
-BUILDLINK_TRANSFORM+=  rm:-ldl
 .    endif
 .    if !empty(_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS])
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+



Home | Main Index | Thread Index | Old Index