pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wine64: Fix ABI and CFLAGS for wine32 build
Module Name: pkgsrc-wip
Committed By: Naveen Narayanan <zerous@nocebo.space>
Pushed By: zerous
Date: Wed Jul 10 17:18:33 2019 +0200
Changeset: 223ca73ba4d79cc239a7c48e06573d24a8692fd0
Modified Files:
wine64/Makefile
Log Message:
wine64: Fix ABI and CFLAGS for wine32 build
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=223ca73ba4d79cc239a7c48e06573d24a8692fd0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
wine64/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diffs:
diff --git a/wine64/Makefile b/wine64/Makefile
index 86a326d283..9451c38887 100644
--- a/wine64/Makefile
+++ b/wine64/Makefile
@@ -4,7 +4,6 @@ DISTNAME= wine-4.4
CATEGORIES= emulators
MASTER_SITES= https://dl.winehq.org/wine/source/4.x/
EXTRACT_SUFX= .tar.xz
-ABI= 32
MAINTAINER= zerous@nocebo.space
HOMEPAGE= http://www.winehq.org/
@@ -13,7 +12,6 @@ LICENSE= gnu-lgpl-v2.1
ONLY_FOR_PLATFORM+= *-*-x86_64
GNU_CONFIGURE= yes
-CFLAGS+= -m32
CONFIGURE_ARGS+= --disable-tests
USE_LANGUAGES= c c++
@@ -29,6 +27,8 @@ build-wine64:
cd ${BUILD64} && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS}
build-wine32:
+ ABI=32
+ ${SETENV} CFLAGS+=-m32
${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
Home |
Main Index |
Thread Index |
Old Index