pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wine64: Add a stage to build 32 bit Wine



Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Wed Jul 10 16:48:05 2019 +0200
Changeset:	c1fcc76f2a279a1989c56e9850190021ae171fc3

Modified Files:
	wine64/Makefile

Log Message:
wine64: Add a stage to build 32 bit Wine

This build references 64-bit rebuild so that it can inject whatever
libs the 64-bit version needs to run 32-bit programs.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c1fcc76f2a279a1989c56e9850190021ae171fc3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wine64/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diffs:
diff --git a/wine64/Makefile b/wine64/Makefile
index 9bc7450d4e..c1381ebe8b 100644
--- a/wine64/Makefile
+++ b/wine64/Makefile
@@ -15,9 +15,7 @@ ONLY_FOR_PLATFORM+=	*-*-x86_64
 GNU_CONFIGURE=		yes
 CFLAGS+=		-m32
 CONFIGURE_ARGS+=	--disable-tests
-CONFIGURE_ARGS+=	--x-libraries=/usr/pkg/emul/netbsd32/lib
-X11_LDFLAGS+=		-Wl,-rpath,/usr/pkg/emul/netbsd32/lib
-X11_LDFLAGS+=		-L/usr/pkg/emul/netbsd32/lib -lX11
+
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		bison flex gmake mktemp msgfmt autoconf perl
 REPLACE_PERL+=		tools/winemaker/winemaker tools/winedump/function_grep.pl
@@ -29,6 +27,12 @@ BUILD64=		${WRKSRC}/wine64
 build-wine64:
 	cd ${BUILD64} && ${SETENV} ${MAKE_ENV} ${WKRSRC}/configure ${CONFIGURE_ARGS} --enable-wine64
 
+build-wine32:
+	${SETENV} CONFIGURE_ARGS+=--x-libraries=/usr/pkg/emul/netbsd32/lib
+	${SETENV} X11_LDFLAGS+=-Wl,-rpath,/usr/pkg/emul/netbsd32/lib
+	${SETENV} X11_LDFLAGS+=-L/usr/pkg/emul/netbsd32/lib -lX11
+	cd ${BUILD32} && ${SETENV} ${MAKE_ENV} ${WRKSRC}/configure ${CONFIGURE_ARGS} --with-wine64=${BUILD64}
+
 post-extract:
 	${MKDIR} ${BUILD32}
 	${MKDIR} ${BUILD32}


Home | Main Index | Thread Index | Old Index