From 7dbe9eb0936cd70d09ae0f35c54a8efbf380e8bc Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill>
Date: Tue, 16 Dec 2008 13:27:30 +0000
Subject: 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.

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

(limited to 'emulators')

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index b2ccb5d66e7..4cf228f7558 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -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 @@ REPLACE_PERL+=		tools/winemaker tools/winedump/function_grep.pl
 #
 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 --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 6ed9aeb4a70..6d19a88eaaf 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -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 @@ REPLACE_PERL+=		tools/winemaker tools/winedump/function_grep.pl
 #
 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:
-- 
cgit v1.2.3