pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Reverse the tests so that we actually check for the...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bc883d9ee360
branches: trunk
changeset: 484542:bc883d9ee360
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Nov 28 05:44:34 2004 +0000
description:
Reverse the tests so that we actually check for the existence and not
the non-existence of the library -- this more accurately reflects what
we want to say.
diffstat:
devel/dlcompat/builtin.mk | 12 ++++++------
devel/ncurses/builtin.mk | 12 ++++++------
mk/db1.builtin.mk | 12 ++++++------
mk/dlopen.builtin.mk | 12 ++++++------
mk/pthread.builtin.mk | 12 ++++++------
5 files changed, 30 insertions(+), 30 deletions(-)
diffs (120 lines):
diff -r d13dd5684fad -r bc883d9ee360 devel/dlcompat/builtin.mk
--- a/devel/dlcompat/builtin.mk Sun Nov 28 05:37:04 2004 +0000
+++ b/devel/dlcompat/builtin.mk Sun Nov 28 05:44:34 2004 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: builtin.mk,v 1.2 2004/11/26 23:16:35 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/11/28 05:44:34 jlam Exp $
.for _lib_ in dl
. if !defined(_BLNK_LIB_FOUND.${_lib_})
_BLNK_LIB_FOUND.${_lib_}!= \
- if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" = "/usr/lib/lib${_lib_}.*"; then \
+ if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ else \
${ECHO} "no"; \
- elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" = "/lib/lib${_lib_}.*"; then \
- ${ECHO} "no"; \
- else \
- ${ECHO} "yes"; \
fi
BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_}
. endif
diff -r d13dd5684fad -r bc883d9ee360 devel/ncurses/builtin.mk
--- a/devel/ncurses/builtin.mk Sun Nov 28 05:37:04 2004 +0000
+++ b/devel/ncurses/builtin.mk Sun Nov 28 05:44:34 2004 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: builtin.mk,v 1.5 2004/11/26 23:16:35 jlam Exp $
+# $NetBSD: builtin.mk,v 1.6 2004/11/28 05:44:34 jlam Exp $
.for _lib_ in ncurses
. if !defined(_BLNK_LIB_FOUND.${_lib_})
_BLNK_LIB_FOUND.${_lib_}!= \
- if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" = "/usr/lib/lib${_lib_}.*"; then \
+ if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ else \
${ECHO} "no"; \
- elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" = "/lib/lib${_lib_}.*"; then \
- ${ECHO} "no"; \
- else \
- ${ECHO} "yes"; \
fi
BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_}
. endif
diff -r d13dd5684fad -r bc883d9ee360 mk/db1.builtin.mk
--- a/mk/db1.builtin.mk Sun Nov 28 05:37:04 2004 +0000
+++ b/mk/db1.builtin.mk Sun Nov 28 05:44:34 2004 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: db1.builtin.mk,v 1.6 2004/11/26 01:22:31 jlam Exp $
+# $NetBSD: db1.builtin.mk,v 1.7 2004/11/28 05:44:34 jlam Exp $
.for _lib_ in db db1
. if !defined(_BLNK_LIB_FOUND.${_lib_})
_BLNK_LIB_FOUND.${_lib_}!= \
- if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" = "/usr/lib/lib${_lib_}.*"; then \
+ if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ else \
${ECHO} "no"; \
- elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" = "/lib/lib${_lib_}.*"; then \
- ${ECHO} "no"; \
- else \
- ${ECHO} "yes"; \
fi
BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_}
. endif
diff -r d13dd5684fad -r bc883d9ee360 mk/dlopen.builtin.mk
--- a/mk/dlopen.builtin.mk Sun Nov 28 05:37:04 2004 +0000
+++ b/mk/dlopen.builtin.mk Sun Nov 28 05:44:34 2004 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: dlopen.builtin.mk,v 1.5 2004/11/26 21:04:46 jlam Exp $
+# $NetBSD: dlopen.builtin.mk,v 1.6 2004/11/28 05:44:34 jlam Exp $
.for _lib_ in dl
. if !defined(_BLNK_LIB_FOUND.${_lib_})
_BLNK_LIB_FOUND.${_lib_}!= \
- if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" = "/usr/lib/lib${_lib_}.*"; then \
+ if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ else \
${ECHO} "no"; \
- elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" = "/lib/lib${_lib_}.*"; then \
- ${ECHO} "no"; \
- else \
- ${ECHO} "yes"; \
fi
BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_}
. endif
diff -r d13dd5684fad -r bc883d9ee360 mk/pthread.builtin.mk
--- a/mk/pthread.builtin.mk Sun Nov 28 05:37:04 2004 +0000
+++ b/mk/pthread.builtin.mk Sun Nov 28 05:44:34 2004 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: pthread.builtin.mk,v 1.4 2004/11/26 08:18:30 jlam Exp $
+# $NetBSD: pthread.builtin.mk,v 1.5 2004/11/28 05:44:34 jlam Exp $
.for _lib_ in pthread c_r rt
. if !defined(_BLNK_LIB_FOUND.${_lib_})
_BLNK_LIB_FOUND.${_lib_}!= \
- if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" = "/usr/lib/lib${_lib_}.*"; then \
+ if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \
+ ${ECHO} "yes"; \
+ else \
${ECHO} "no"; \
- elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" = "/lib/lib${_lib_}.*"; then \
- ${ECHO} "no"; \
- else \
- ${ECHO} "yes"; \
fi
BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_}
. endif
Home |
Main Index |
Thread Index |
Old Index