summaryrefslogtreecommitdiff
path: root/emulators/wine
diff options
context:
space:
mode:
authorjmcneill <jmcneill@pkgsrc.org>2008-12-16 13:27:30 +0000
committerjmcneill <jmcneill@pkgsrc.org>2008-12-16 13:27:30 +0000
commit82747abf41bc988db936996b65fc7239b93a639b (patch)
tree7788c65906cb11ba5238737c1ce2a31130743004 /emulators/wine
parent2d1aa30a67b8cff20348d43719ba8b9dedb00df1 (diff)
downloadpkgsrc-82747abf41bc988db936996b65fc7239b93a639b.tar.gz
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 (limited to 'emulators/wine')
-rw-r--r--emulators/wine/Makefile14
1 files changed, 13 insertions, 1 deletions
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: