diff options
| author | jlam <jlam> | 2007-08-23 13:43:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2007-08-23 13:43:57 +0000 |
| commit | 8ad25efe1ed06b85e304bd9b21e83a6b791b6212 (patch) | |
| tree | 73887b63d44b67ec3b64e2474d54cf1eba24f692 | |
| parent | eee67483560cc3e6443fe96b36f1b3a5074bc247 (diff) | |
| download | pkgsrc-8ad25efe1ed06b85e304bd9b21e83a6b791b6212.tar.gz | |
Define a variable EMUL_IS_NATIVE if the emulated operating system
matches the native operating system. Use it in place of checking
whether EMUL_DISTRO matches "native-*" as EMUL_DISTRO is no longer
defined after bsd.prefs.mk is included.
This should fix PR pkg/36823 by Robert Elz.
| -rw-r--r-- | mk/emulator/emulator-vars.mk | 10 | ||||
| -rw-r--r-- | www/seamonkey-bin/Makefile.common | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/mk/emulator/emulator-vars.mk b/mk/emulator/emulator-vars.mk index f799cfc3091..c59190f2193 100644 --- a/mk/emulator/emulator-vars.mk +++ b/mk/emulator/emulator-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator-vars.mk,v 1.6 2007/08/22 14:47:10 jlam Exp $ +# $NetBSD: emulator-vars.mk,v 1.7 2007/08/23 13:43:57 jlam Exp $ # # This file is included by bsd.prefs.mk only if EMUL_PLATFORMS is defined # and non-empty. @@ -42,6 +42,10 @@ # package isn't supported on this machine, then its value is # "none". # +# EMUL_IS_NATIVE +# Whether or not the operating system being emulated matches the +# native operating system. It is either defined or undefined. +# # _EMUL_OPSYS # A table that maps ${OPSYS} to the operating system names @@ -112,3 +116,7 @@ EMUL_OPSYS?= none EMUL_ARCH?= ${EMUL_PLATFORM:C/.*-//} EMUL_OPSYS?= ${EMUL_PLATFORM:C/-.*//} .endif + +.if ${_EMUL_OPSYS} == ${EMUL_OPSYS} +EMUL_IS_NATIVE= defined +.endif diff --git a/www/seamonkey-bin/Makefile.common b/www/seamonkey-bin/Makefile.common index d20d437c9cd..aa11dd6fc6c 100644 --- a/www/seamonkey-bin/Makefile.common +++ b/www/seamonkey-bin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2007/08/06 08:51:40 tron Exp $ +# $NetBSD: Makefile.common,v 1.6 2007/08/23 13:43:57 jlam Exp $ DISTNAME= ${MOZILLA}${MOX_EXTRA}-bin # overridden below PKGNAME= ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER} @@ -29,7 +29,7 @@ EMUL_MODULES.linux= compat gtk SUSE_VERSION_REQD= 7.3 .endif -.if !empty(EMUL_DISTRO:Mnative-*) +.if defined(EMUL_IS_NATIVE) . if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss]) DEPENDS+= gtk2+>=2.2:../../x11/gtk2 . else @@ -98,7 +98,7 @@ do-install: # builds typically want exactly 'libgtk-1.2.so.0', etc. symlink them # into the mozilla directory. post-install: -.if !empty(EMUL_DISTRO:Mnative-*) +.if defined(EMUL_IS_NATIVE) . if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss]) @cd ${MOZILLA_LIB} && \ ${LN} -s ${PREFIX}/lib/libatk-1.0.*so* .; \ |