Re: suse linux32 packages

[Mihai Chelaru <kefren%netbsd.ro@localhost>]

Joerg Sonnenberger wrote:

> I don't exactly like this. I'd prefer a knob for emulators/suse100_* to
> add _32b to the package name and use the i386 version. That avoids the
> double maintainance.

This is exactly what I have in mind. This is a diff for suse100_linux and
suse100_base. Is this OK ?

Index: suse100_base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_base/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- suse100_base/Makefile       19 Sep 2006 19:58:46 -0000      1.6
+++ suse100_base/Makefile       9 Jan 2007 00:31:43 -0000
@@ -1,6 +1,12 @@
 # $NetBSD: Makefile,v 1.6 2006/09/19 19:58:46 joerg Exp $
 
+.include "../../emulators/suse100_linux/options.mk"
+
+.if empty(PKG_OPTIONS:M32bits)
 DISTNAME=              suse_base-${SUSE_VERSION}
+.else
+DISTNAME=              suse_32b_base-${SUSE_VERSION}
+.endif
 PKGREVISION=           3
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SUSE100}
@@ -8,7 +14,11 @@
 
 MAINTAINER=            tonio%NetBSD.org@localhost
 HOMEPAGE=              http://www.suse.com/
+.if empty(PKG_OPTIONS:M32bits)
 COMMENT=               Linux compatibility package
+.else
+COMMENT=               Linux 32 bits compatibility package
+.endif
 
 CONFLICTS=             linux_SuSE-5.3 linux_lib-2.4 linuxppc_lib-[0-9]*
 
@@ -20,8 +30,8 @@
 PLIST_SRC=             ${WRKDIR}/PLIST_DYNAMIC
 PLIST_SUBST+=          EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q}
 
-.if exists(Makefile.${MACHINE_ARCH})
-.include "Makefile.${MACHINE_ARCH}"
+.if exists(Makefile.${SUSE_ARCH_DIR})
+.include "Makefile.${SUSE_ARCH_DIR}"
 .endif
 
 RPMIGNOREPATH=         ./etc/bash.bashrc ./etc/bash_completion.d \
Index: suse100_linux/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_linux/Makefile.common,v
retrieving revision 1.12
diff -u -r1.12 Makefile.common
--- suse100_linux/Makefile.common       2 Oct 2006 16:00:38 -0000       1.12
+++ suse100_linux/Makefile.common       9 Jan 2007 00:31:43 -0000
@@ -3,10 +3,14 @@
 .include "../../emulators/suse100_linux/vars.mk"
 .include "../../emulators/suse100_linux/arch.mk"
 
+.if empty(PKG_OPTIONS:M32bits)
 ONLY_FOR_PLATFORM+=    NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
                        NetBSD-[2-9]*-powerpc \
                        NetBSD-[4-9]*-x86_64 FreeBSD-*-i386 \
                        DragonFly-*-i386
+.else
+ONLY_FOR_PLATFORM+=    NetBSD-3.99*-x86_64 NetBSD-[4-9]*-x86_64
+.endif
 
 _SUSE_FTP_SUBDIR=
distribution/SL-${SUSE_VERSION}-OSS/inst-source/suse/${SUSE_ARCH}/
 _SUSE_FTP_SUBDIR_UPD=
suse/${SUSE_ARCH_DIR}/update/${SUSE_VERSION}/rpm/${SUSE_ARCH}/
@@ -32,7 +36,11 @@
 # Don't check any script interpreter, as long as nobody complains.
 CHECK_INTERPRETER_SKIP=        *
 
+.if empty(PKG_OPTIONS:M32bits)
 EMULSUBDIR=            emul/linux
+.else
+EMULSUBDIR=            emul/linux32
+.endif
 EMULDIR=               ${PREFIX}/${EMULSUBDIR}
 
 # Set location of OPSYS-specific emulation directory
Index: suse100_linux/arch.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse100_linux/arch.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 arch.mk
--- suse100_linux/arch.mk       9 Mar 2006 20:33:46 -0000       1.1.1.1
+++ suse100_linux/arch.mk       9 Jan 2007 00:31:43 -0000
@@ -5,7 +5,10 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386"
+.if !empty(PKG_OPTIONS:M32bits)
+SUSE_ARCH?=    i586
+SUSE_ARCH_DIR?=        i386
+.elif ${MACHINE_ARCH} == "i386"
 SUSE_ARCH?=    i586
 SUSE_ARCH_DIR?=        ${MACHINE_ARCH}
 .elif ${MACHINE_ARCH} == "powerpc"
Index: suse100_linux/options.mk
===================================================================
--- suse100_linux/options.mk.old      2007-01-09 02:32:28.000000000 +0200
+++ suse100_linux/options.mk  2007-01-09 02:26:50.000000000 +0200
@@ -0,0 +1,7 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.suse
+PKG_SUPPORTED_OPTIONS= 32bits
+
+.include "../../mk/bsd.options.mk"
+



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
pkgsrc-wip-discuss mailing list
pkgsrc-wip-discuss%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-discuss