pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Allow an empty USE_LANGUAGES setting to not break i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c384ac6a17c
branches:  trunk
changeset: 467748:1c384ac6a17c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Feb 06 03:10:29 2004 +0000

description:
Allow an empty USE_LANGUAGES setting to not break in show-shlib-type.
If we're not compiling anything, we're likely not installing any shared
libraries.

diffstat:

 mk/bsd.pkg.mk |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (36 lines):

diff -r 765c0ff8757c -r 1c384ac6a17c mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Feb 06 03:04:50 2004 +0000
+++ b/mk/bsd.pkg.mk     Fri Feb 06 03:10:29 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1374 2004/02/06 03:04:50 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1375 2004/02/06 03:10:29 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -3000,12 +3000,12 @@
 # Show the shared lib type being built: one of ELF, a.out, dylib, or none
 .PHONY: show-shlib-type
 show-shlib-type:
-.  if exists(/usr/lib/libc.dylib)
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${ECHO} "dylib"
+.  if empty(USE_LANGUAGES)
+       ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "none"
+.  elif exists(/usr/lib/libc.dylib)
+       ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "dylib"
 .  elif ${OPSYS} == "AIX"
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${ECHO} "aixlib"
+       ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "aixlib"
 .  else
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        cd ${WRKDIR} &&                                                 \
@@ -3025,7 +3025,7 @@
        fi;                                                             \
        ${ECHO} "$$sotype";                                             \
        ${RM} -f a.$$$$.c a.$$$$.out
-.  endif # libc.dylib
+.  endif   # USE_LANGUAGES
 .endif
 
 .PHONY: acquire-extract-lock acquire-patch-lock acquire-tools-lock



Home | Main Index | Thread Index | Old Index