diff options
author | jlam <jlam> | 2007-07-29 08:55:22 +0000 |
---|---|---|
committer | jlam <jlam> | 2007-07-29 08:55:22 +0000 |
commit | 9936df3e060f1a6334cdb383c846ed33235f5068 (patch) | |
tree | c6af9d97d674d6a3ce0941cef384762c8e86171d /emulators/suse91_linux | |
parent | 1638fea3a2215ef004947265136473c35e6db23c (diff) | |
download | pkgsrc-9936df3e060f1a6334cdb383c846ed33235f5068.tar.gz |
Add 32-bit versions of SuSE Linux 9.1 and 10.0 for use by NetBSD/x86_64
with COMPAT_LINUX32.
Diffstat (limited to 'emulators/suse91_linux')
-rw-r--r-- | emulators/suse91_linux/Makefile.common | 22 | ||||
-rw-r--r-- | emulators/suse91_linux/emulator.mk | 4 |
2 files changed, 18 insertions, 8 deletions
diff --git a/emulators/suse91_linux/Makefile.common b/emulators/suse91_linux/Makefile.common index f672d42f045..81a51e3091a 100644 --- a/emulators/suse91_linux/Makefile.common +++ b/emulators/suse91_linux/Makefile.common @@ -1,19 +1,24 @@ -# $NetBSD: Makefile.common,v 1.17 2007/07/29 05:19:17 jlam Exp $ +# $NetBSD: Makefile.common,v 1.18 2007/07/29 08:55:39 jlam Exp $ SUSE_PKG= yes SUSE_VERSION= 9.1 SUSE_VERSION_REQD= ${SUSE_VERSION} -EMUL_PLATFORMS?= linux-i386 linux-x86_64 - -.include "../../mk/bsd.prefs.mk" - # The SuSE 10.x Linux packages are only usable on the following platforms. +.if defined(SUSE_COMPAT32) +EMUL_PLATFORMS?= linux-i386 +ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 +ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64 +.else +EMUL_PLATFORMS?= linux-i386 linux-x86_64 ONLY_FOR_PLATFORM+= DragonFly-*-i386 ONLY_FOR_PLATFORM+= FreeBSD-*-i386 ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-i386 ONLY_FOR_PLATFORM+= NetBSD-3.99*-x86_64 ONLY_FOR_PLATFORM+= NetBSD-[4-9]*-x86_64 +.endif + +.include "../../mk/bsd.prefs.mk" # _SUSE_ARCH.* is a table of ${EMUL_ARCH} to SuSE architectures. _SUSE_ARCH.${EMUL_ARCH}= ${EMUL_ARCH} @@ -50,6 +55,11 @@ RPM2PKG_PREFIX?= ${PREFIX} RPM2PKG_SUBPREFIX?= ${EMULSUBDIR} RPM2PKG_STAGE?= do-install +SUSE_PKGSRCDIR= ${.CURDIR}/../${.CURDIR:T:S/_32_/_/} +FILESDIR= ${SUSE_PKGSRCDIR}/files +PATCHDIR= ${SUSE_PKGSRCDIR}/patches +PKGDIR= ${SUSE_PKGSRCDIR} + .if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") PKGNAME:= ${DISTNAME:S/^suse_/suse32_/} COMMENT:= ${COMMENT:S/Linux/Linux 32-bit/} @@ -67,4 +77,4 @@ FILES_SUBST+= LINUX_LIBSUBDIR=${LINUX_LIBSUBDIR:Q} # Include an "override" SuSE-specific and architecture-specific # Makefile fragment if it exists. # -.sinclude "suse.${EMUL_ARCH}.mk" +.sinclude "${SUSE_PKGSRCDIR}/suse.${EMUL_ARCH}.mk" diff --git a/emulators/suse91_linux/emulator.mk b/emulators/suse91_linux/emulator.mk index 1ec73cab815..687cedd3b6b 100644 --- a/emulators/suse91_linux/emulator.mk +++ b/emulators/suse91_linux/emulator.mk @@ -1,4 +1,4 @@ -# $NetBSD: emulator.mk,v 1.1 2007/07/29 05:19:17 jlam Exp $ +# $NetBSD: emulator.mk,v 1.2 2007/07/29 08:55:39 jlam Exp $ # # This file is included by linux-suse.mk in the emulator framework. # @@ -42,6 +42,6 @@ DEPENDS_suse-9.1.x11?= suse_x11${_SUSE_VERSION_REQD}:../../emulators/suse91_x11 .if (${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64") . for _mod_ in ${_LINUX_MODULES} DEPENDS_suse-9.1.${_mod_}:= \ - ${DEPENDS_suse-9.1.${_mod_}:S/^suse_/suse32_/} + ${DEPENDS_suse-9.1.${_mod_}:S/^suse_/suse32_/:S/suse91_/&32_/} . endfor .endif |