cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert wxneeded hack; USE_WXNEEDED does the right thing with clang now.

Browse Source
This commit is contained in:
ajacoutot 2017-06-05 10:17:41 +00:00
parent 3a7a6e9fb7
commit d50fc347d1
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/libv8/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.12 2017/05/29 14:21:10 espie Exp $ # $OpenBSD: Makefile,v 1.13 2017/06/05 10:17:41 ajacoutot Exp $
ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS= amd64 i386
COMMENT= V8 JavaScript for clients and servers COMMENT= V8 JavaScript for clients and servers
V8_VERSION= 3.12.19 V8_VERSION= 3.12.19
REVISION= 4 REVISION= 5
EPOCH= 0 EPOCH= 0
V8_ARCH= ${MACHINE_ARCH:S/amd64/x64/:S/i386/ia32/} V8_ARCH= ${MACHINE_ARCH:S/amd64/x64/:S/i386/ia32/}
V8_RELEASE= release V8_RELEASE= release
@ -45,11 +45,9 @@ SUBST_VARS+= V8_ARCH
MAKE_FLAGS+= library=shared ARCHES=${V8_ARCH} MODES=${V8_RELEASE} \ MAKE_FLAGS+= library=shared ARCHES=${V8_ARCH} MODES=${V8_RELEASE} \
DEFAULT_ARCHES=${V8_ARCH} DEFAULT_ARCHES=${V8_ARCH}
# XXX explicitly pass -Wl,-z,wxneeded because USE_WXNEEDED is a nop with clang
# as clang explicitly calls the linker with a full path by default
MAKE_ENV+= V=1 CXX="${CXX}" LINK="${CXX} ${LDFLAGS}" CCFLAGS+="${CFLAGS}" \ MAKE_ENV+= V=1 CXX="${CXX}" LINK="${CXX} ${LDFLAGS}" CCFLAGS+="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS} -I${WRKSRC}/src -I${LOCALBASE}/include" \ CXXFLAGS="${CXXFLAGS} -I${WRKSRC}/src -I${LOCALBASE}/include" \
LDFLAGS="-Wl,-z,wxneeded -L${LOCALBASE}/lib -L${X11BASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
PATH=${WRKSRC}/bin:${PATH} PATH=${WRKSRC}/bin:${PATH}
NO_CCACHE= Yes NO_CCACHE= Yes

7
lang/mono/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.109 2017/06/02 23:25:03 schwarze Exp $ # $OpenBSD: Makefile,v 1.110 2017/06/05 10:17:41 ajacoutot Exp $
# XXX also see -Wl,-z,wxneeded below; clang bypasses the wrapper
USE_WXNEEDED= Yes USE_WXNEEDED= Yes
COMMENT= cross platform, open source .NET developement framework COMMENT= cross platform, open source .NET developement framework
V= 4.6.2 V= 4.6.2
DISTNAME= mono-${V}.6 DISTNAME= mono-${V}.6
REVISION= 1 REVISION= 2
CATEGORIES= lang devel CATEGORIES= lang devel
@ -50,7 +49,7 @@ LIB_DEPENDS= converters/libiconv
TEST_DEPENDS= lang/python/${MODPY_VERSION} TEST_DEPENDS= lang/python/${MODPY_VERSION}
CONFIGURE_STYLE=gnu CONFIGURE_STYLE=gnu
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -Wl,-z,wxneeded" \ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include" \ CPPFLAGS="-I${LOCALBASE}/include" \
ac_cv_header_execinfo_h=no \ ac_cv_header_execinfo_h=no \
ac_cv_header_pthread_np_h=yes ac_cv_header_pthread_np_h=yes