diff options
| author | salo <salo@pkgsrc.org> | 2006-06-26 17:53:04 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2006-06-26 17:53:04 +0000 |
| commit | b2120d8a4b049666354770359d23cfe70b76d26b (patch) | |
| tree | d34967e35883c5ae89ffc4a489478d6c79c772a7 | |
| parent | 00d63daf935cd1f4ab5c24f2c8d4a39fb05054de (diff) | |
| download | pkgsrc-b2120d8a4b049666354770359d23cfe70b76d26b.tar.gz | |
Allow amd64 packages to be built with suse100_linux.
Remove SuSE 7.3 from the list of available sources.
| -rw-r--r-- | emulators/suse_linux/Makefile.application | 28 | ||||
| -rw-r--r-- | emulators/suse_linux/unavailable.mk | 20 |
2 files changed, 30 insertions, 18 deletions
diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application index b6d9dd4735c..3874c6db920 100644 --- a/emulators/suse_linux/Makefile.application +++ b/emulators/suse_linux/Makefile.application @@ -1,16 +1,20 @@ -# $NetBSD: Makefile.application,v 1.21 2006/06/07 14:00:44 tron Exp $ +# $NetBSD: Makefile.application,v 1.22 2006/06/26 17:53:04 salo Exp $ .include "../../mk/bsd.prefs.mk" -.if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly") && \ - (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc") +.if (${OPSYS} == "NetBSD" || \ + ${OPSYS} == "FreeBSD" || \ + ${OPSYS} == "DragonFly") \ + && (${MACHINE_ARCH} == "i386" || \ + ${MACHINE_ARCH} == "powerpc" || \ + ${MACHINE_ARCH} == "x86_64") . if !empty(SUSE_PREFER:M10.0) . include "../../emulators/suse100_linux/vars.mk" -. elif !empty(SUSE_PREFER:M9.1) +. elif !empty(SUSE_PREFER:M9.1) && (${MACHINE_ARCH} != "x86_64") . include "../../emulators/suse91_linux/vars.mk" . else -. include "../../emulators/suse_linux/vars.mk" +. include "../../emulators/suse_linux/unavailable.mk" . endif . if defined(RPMFILES) @@ -24,17 +28,5 @@ LDD= ${EMULDIR}/usr/bin/ldd # No Linux emulation is needed USE_NATIVE_LINUX= # empty .else -# we put a value here so that the creation of the bulk -# build cache files works correctly on non-i386 machines. -# This speeds up the marking of all compat_linux packages -# as not available. -SUSE_DIR_PREFIX= suse -SUSE_VERSION= 0 -PKG_SKIP_REASON+= "${PKGNAME} requires compat_linux, which is not available for ${MACHINE_PLATFORM}" -# -# By default, we can't check for missing shared libraries nor note which -# shared libraries are provided and/or required by the package since the -# library support is via syscall emulation. -# -CHECK_SHLIBS_SUPPORTED?= no +. include "../../emulators/suse_linux/unavailable.mk" .endif diff --git a/emulators/suse_linux/unavailable.mk b/emulators/suse_linux/unavailable.mk new file mode 100644 index 00000000000..7958851832d --- /dev/null +++ b/emulators/suse_linux/unavailable.mk @@ -0,0 +1,20 @@ +# $NetBSD: unavailable.mk,v 1.1 2006/06/26 17:53:04 salo Exp $ + +.ifndef SUSE_UNAVAILABLE_MK +SUSE_UNAVAILABLE_MK=1 + +# We put a value here so that the creation of the bulk build cache files +# works correctly on all machines. This speeds up the marking of all +# COMPAT_LINUX packages as not available. +# +SUSE_DIR_PREFIX= suse +SUSE_VERSION= 0 +PKG_SKIP_REASON+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}" + +# By default, we can't check for missing shared libraries nor note which +# shared libraries are provided and/or required by the package since the +# library support is via syscall emulation. +# +CHECK_SHLIBS_SUPPORTED?= no + +.endif # SUSE_UNAVAILABLE_MK |