[pkgsrc/trunk]: pkgsrc/emulators Fix -m32 build on amd64. Make sure the appro...

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d3010e426f5
branches:  trunk
changeset: 551476:0d3010e426f5
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Tue Dec 16 13:27:30 2008 +0000

description:
Fix -m32 build on amd64. Make sure the appropriate multilib options are
passed to configure for CC, CXX, AS, and LD as these options are passed
through to winegcc, which the buildlink wrapper doesn't handle. Also pass
LDD to configure so it can be overridden.

diffstat:

 emulators/wine-devel/Makefile |  14 +++++++++++++-
 emulators/wine/Makefile       |  14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r 95b4d6a49c1a -r 0d3010e426f5 emulators/wine-devel/Makefile
--- a/emulators/wine-devel/Makefile     Tue Dec 16 12:37:17 2008 +0000
+++ b/emulators/wine-devel/Makefile     Tue Dec 16 13:27:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/12/07 15:32:06 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2008/12/16 13:28:55 jmcneill Exp $
 
 DISTNAME=      wine-1.1.10
 PKGREVISION=   1
@@ -35,8 +35,20 @@
 #
 CONFIGURE_ENV+=                X_LIBS=${LDFLAGS:M*:Q}
 CONFIGURE_ENV+=                CFLAGS=${CFLAGS:M*:Q}\ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
+CONFIGURE_ENV+=                LDD=${LDD}
 LIBS+=                 ${LDFLAGS}
 
+# If we're doing a 32-bit build, make sure that the appropriate
+# multilib options are passed through as these values are used
+# with winegcc (which wrapper doesn't handle).
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_ARCH:Mi386)
+CONFIGURE_ENV+=                ac_cv_prog_CC=${CC}\ -m32
+CONFIGURE_ENV+=                ac_cv_prog_CXX=${CXX}\ -m32
+CONFIGURE_ENV+=                ac_cv_prog_AS=${AS}\ --32
+CONFIGURE_ENV+=                ac_cv_prog_LD=${LD}\ -m\ elf_i386
+.endif
+
 .include "options.mk"
 
 post-install:
diff -r 95b4d6a49c1a -r 0d3010e426f5 emulators/wine/Makefile
--- a/emulators/wine/Makefile   Tue Dec 16 12:37:17 2008 +0000
+++ b/emulators/wine/Makefile   Tue Dec 16 13:27:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.149 2008/12/07 15:31:57 jmcneill Exp $
+# $NetBSD: Makefile,v 1.150 2008/12/16 13:27:30 jmcneill Exp $
 
 DISTNAME=      wine-1.0.1
 PKGREVISION=   1
@@ -35,8 +35,20 @@
 #
 CONFIGURE_ENV+=                X_LIBS=${LDFLAGS:M*:Q}
 CONFIGURE_ENV+=                CFLAGS=${CFLAGS:M*:Q}\ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
+CONFIGURE_ENV+=                LDD=${LDD}
 LIBS+=                 ${LDFLAGS}
 
+# If we're doing a 32-bit build, make sure that the appropriate
+# multilib options are passed through as these values are used
+# with winegcc (which wrapper doesn't handle).
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_ARCH:Mi386)
+CONFIGURE_ENV+=                ac_cv_prog_CC=${CC}\ -m32
+CONFIGURE_ENV+=                ac_cv_prog_CXX=${CXX}\ -m32
+CONFIGURE_ENV+=                ac_cv_prog_AS=${AS}\ --32
+CONFIGURE_ENV+=                ac_cv_prog_LD=${LD}\ -m\ elf_i386
+.endif
+
 .include "options.mk"
 
 post-install: