diff options
| author | tnn <tnn> | 2008-02-21 04:23:58 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2008-02-21 04:23:58 +0000 |
| commit | 0e0a9ea8d174d35890ec8cdcf9dc6b9ed0114ec9 (patch) | |
| tree | 642854600e4ccdbb433c33613ca804d91f9934cb /mk | |
| parent | 352bc3307f65e03981d1592a6e06e79f92cf888b (diff) | |
| download | pkgsrc-0e0a9ea8d174d35890ec8cdcf9dc6b9ed0114ec9.tar.gz | |
Kill _OPSYS_NEEDS_XPKGWEDGE. It was only used by two platforms and they
will default to USE_XPKGWEDGE anyway.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 5 | ||||
| -rw-r--r-- | mk/platform/IRIX.mk | 3 | ||||
| -rw-r--r-- | mk/platform/Interix.mk | 7 |
3 files changed, 3 insertions, 12 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index d38227c769c..e652d409555 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.279 2008/02/07 16:43:18 tnn Exp $ +# $NetBSD: bsd.prefs.mk,v 1.280 2008/02/21 04:23:58 tnn Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -485,9 +485,6 @@ CROSSBASE?= ${LOCALBASE}/cross .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ exists(${X11BASE}/lib/X11/config/xpkgwedge.def) USE_XPKGWEDGE= yes -.elif defined(_OPSYS_NEEDS_XPKGWEDGE) && \ - !empty(_OPSYS_NEEDS_XPKGWEDGE:M[yY][eE][sS]) -USE_XPKGWEDGE= yes .elif ${PKG_INSTALLATION_TYPE} == "pkgviews" USE_XPKGWEDGE= yes .elif ${X11_TYPE} == "modular" diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk index bd6b690f1a4..51d9b63eb47 100644 --- a/mk/platform/IRIX.mk +++ b/mk/platform/IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: IRIX.mk,v 1.32 2007/10/19 13:41:35 rillig Exp $ +# $NetBSD: IRIX.mk,v 1.33 2008/02/21 04:23:58 tnn Exp $ # # Variable definitions for the IRIX operating system. @@ -72,7 +72,6 @@ _OPSYS_HAS_INET6= no # IPv6 is not standard _OPSYS_HAS_JAVA= no # Java is not standard _OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages _OPSYS_HAS_OSSAUDIO= no # libossaudio is available -_OPSYS_NEEDS_XPKGWEDGE= yes # xpkgwedge is required for X11 _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads _OPSYS_SHLIB_TYPE= ELF # shared lib type diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk index 05e134fcb3e..546525c8c5b 100644 --- a/mk/platform/Interix.mk +++ b/mk/platform/Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: Interix.mk,v 1.54 2007/10/19 13:41:35 rillig Exp $ +# $NetBSD: Interix.mk,v 1.55 2008/02/21 04:23:58 tnn Exp $ # # Variable definitions for the Interix operating system. @@ -142,11 +142,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups _PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix _USE_RPATH= yes # add rpath to LDFLAGS -# Ensure that USE_X11BASE programs get an xpkgwedge new enough to work. -_OPSYS_NEEDS_XPKGWEDGE= yes # xpkgwedge is required for X11 -_XPKGWEDGE_DEPENDS= xpkgwedge>=1.10:../../pkgtools/xpkgwedge -BUILD_DEPENDS+= ${USE_X11BASE:D${_XPKGWEDGE_DEPENDS}} - # flags passed to the linker to extract all symbols from static archives. # this is GNU ld. _OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive |