Date: Fri, 17 Apr 2015 17:15:59 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384168 - in branches/2015Q2/java: openjdk7 openjdk8 Message-ID: <201504171715.t3HHFxrq079437@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Fri Apr 17 17:15:59 2015 New Revision: 384168 URL: https://svnweb.freebsd.org/changeset/ports/384168 Log: MFH: r384056 Fix build with GCC with recent head kernel by disabling PCH for GCC. The case for this is a recent head kernel building an older branch that uses GCC in a jail. This is discussed at https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html It may be possible to fix GCC to do the right thing with mmap(2) but it would not be simple to make ports use a fixed GCC on older releases and without needlessly building a ports compiler when the system one would otherwise be fine without PCH. With hat: portmgr Modified: branches/2015Q2/java/openjdk7/Makefile branches/2015Q2/java/openjdk8/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/java/openjdk7/Makefile ============================================================================== --- branches/2015Q2/java/openjdk7/Makefile Fri Apr 17 16:38:54 2015 (r384167) +++ branches/2015Q2/java/openjdk7/Makefile Fri Apr 17 17:15:59 2015 (r384168) @@ -26,7 +26,7 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME} -USES= dos2unix iconv gmake zip +USES= compiler dos2unix iconv gmake zip USE_XORG+= x11 xext xi xrender xt xtst MAKE_ARGS= CC=${CC:Q} CXX=${CXX:Q} HOST_CC=${CC:Q} @@ -125,6 +125,11 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/ .include <bsd.port.pre.mk> +# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html +.if ${COMPILER_TYPE} == gcc +MAKE_ENV+= USE_PRECOMPILED_HEADER=0 +.endif + .if empty(ICONV_LIB) MAKE_ENV+= EXTRA_CFLAGS=-DLIBICONV_PLUG .endif Modified: branches/2015Q2/java/openjdk8/Makefile ============================================================================== --- branches/2015Q2/java/openjdk8/Makefile Fri Apr 17 16:38:54 2015 (r384167) +++ branches/2015Q2/java/openjdk8/Makefile Fri Apr 17 17:15:59 2015 (r384168) @@ -192,6 +192,11 @@ CONFIGURE_ENV= LIBCXX="-lc++" .endif .endif +# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html +.if ${COMPILER_TYPE} == gcc +MAKE_ARGS+= USE_PRECOMPILED_HEADER=0 +.endif + .if empty(ICONV_LIB) ICONV_CPPFLAGS= -DLIBICONV_PLUG .else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504171715.t3HHFxrq079437>