summaryrefslogtreecommitdiff
path: root/mk/bsd.pkg.mk
diff options
context:
space:
mode:
authoragc <agc>1999-01-26 22:03:18 +0000
committeragc <agc>1999-01-26 22:03:18 +0000
commit14319ab253181c844fbd47096aea5b5c0c929ac0 (patch)
treeb7456591245cea8cd00b7864906f23deafc0adc6 /mk/bsd.pkg.mk
parent1cd7543e8afcd017fee9ab1ca7ad78d448b91170 (diff)
downloadpkgsrc-14319ab253181c844fbd47096aea5b5c0c929ac0.tar.gz
Introduce a BUILD_USES_X11 definition, defined in package Makefiles,
and used to denote that a package uses X11 headers and libraries to build, but does not install itself into X11BASE (xpkgwedge notwithstanding). This is used to ignore packages which would otherwise cause build problems on machines with no X11 installation.
Diffstat (limited to 'mk/bsd.pkg.mk')
-rw-r--r--mk/bsd.pkg.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 6f89b8fb32c..3327aa2bcf2 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.204 1999/01/19 23:40:09 hubertf Exp $
+# $NetBSD: bsd.pkg.mk,v 1.205 1999/01/26 22:03:18 agc Exp $
#
# This file is in the public domain.
#
@@ -192,7 +192,7 @@ MD5?= md5
.endif
MD5_FILE?= ${FILESDIR}/md5
-.if defined(USE_MOTIF) || defined(USE_X11)
+.if defined(USE_MOTIF) || defined(USE_X11) || defined(BUILD_USES_X11)
LDFLAGS+= -Wl,-R${X11BASE}/lib
.endif
LDFLAGS+= -Wl,-R${LOCALBASE}/lib
@@ -673,7 +673,8 @@ IGNORE= "is not an interactive port"
IGNORE= "may not be placed on a CDROM: ${NO_CDROM}"
.elif (defined(RESTRICTED) && defined(NO_RESTRICTED))
IGNORE= "is restricted: ${RESTRICTED}"
-.elif ((defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11)) && \
+.elif ((defined(USE_IMAKE) || defined(USE_MOTIF) || \
+ defined(USE_X11) || defined(BUILD_USES_X11)) && \
!exists(${X11BASE}))
IGNORE= "uses X11, but ${X11BASE} not found"
.elif defined(BROKEN)