diff options
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine-devel/Makefile | 14 | ||||
| -rw-r--r-- | emulators/wine/Makefile | 14 |
2 files changed, 26 insertions, 2 deletions
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: |