Date: Tue, 2 Jul 2019 09:24:50 +0200 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Greg Lewis <glewis@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r505640 - head/java/openjdk11 Message-ID: <20190702072450.GA17073@KGPE-D16> In-Reply-To: <201907012118.x61LIIQr011692@repo.freebsd.org> References: <201907012118.x61LIIQr011692@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Why not use USES=3Dcompiler:c11 instead of setting manually USE_GCC=3Dyes? On 19-07-01 21:18:18, Greg Lewis wrote: >Author: glewis >Date: Mon Jul 1 21:18:18 2019 >New Revision: 505640 >URL: https://svnweb.freebsd.org/changeset/ports/505640 > >Log: > Allow the JDK to be compiled with gcc. > > This is required for powerpc64 support. > >Modified: > head/java/openjdk11/Makefile > >Modified: head/java/openjdk11/Makefile >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >--- head/java/openjdk11/Makefile Mon Jul 1 21:09:07 2019 (r505639) >+++ head/java/openjdk11/Makefile Mon Jul 1 21:18:18 2019 (r505640) >@@ -37,12 +37,12 @@ MAKE_ENV=3D LANG=3D"C" \ > CLASSPATH=3D"" \ > JAVA_HOME=3D"" \ > LD_LIBRARY_PATH=3D"" \ >- CC=3D/usr/bin/cc \ >- CXX=3D/usr/bin/c++ \ >- MAKEFLAGS=3D"" \ >- USE_CLANG=3Dtrue >+ CC=3D${CC} \ >+ CXX=3D${CXX} \ >+ CPP=3D${CPP} \ >+ MAKEFLAGS=3D"" > >-JDK_OSARCH=3D bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/} >+JDK_OSARCH=3D bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} > JDK_BUILDDIR=3D ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${J= DK_BUILD_TYPE} > JDK_IMAGEDIR=3D ${JDK_BUILDDIR}/images/jdk > INSTALLDIR=3D ${PREFIX}/${PKGBASE} >@@ -56,8 +56,9 @@ JDK_BUILD_NUMBER=3D 7 > BSD_JDK_VERSION=3D 2 > > GNU_CONFIGURE=3D yes >-CONFIGURE_ENV=3D CC=3D/usr/bin/cc \ >- CXX=3D/usr/bin/c++ >+CONFIGURE_ENV=3D CC=3D${CC} \ >+ CXX=3D${CXX} \ >+ CPP=3D${CPP} > CONFIGURE_ARGS=3D --with-boot-jdk=3D${BOOTSTRAPJDKDIR} \ > --disable-ccache \ > --disable-javac-server \ >@@ -75,7 +76,6 @@ CONFIGURE_ARGS=3D --with-boot-jdk=3D${BOOTSTRAPJDKDIR} \ > --with-libpng=3Dsystem \ > --with-zlib=3Dsystem \ > --with-lcms=3Dsystem \ >- --with-toolchain-type=3Dclang \ > --x-includes=3D${LOCALBASE}/include \ > --x-libraries=3D${LOCALBASE}/lib \ > --with-cacerts-file=3D${FILESDIR}/cacerts \ >@@ -107,6 +107,20 @@ BUILD_DEPENDS+=3D ${BOOTSTRAPJDKDIR}/bin/javac:java/= boo > .endif > > JDK_BUILD_JVM=3D server >+ >+MAKE_ENV+=3D --with-toolchain-type=3D${COMPILER_TYPE} >+CONFIGURE_ARGS+=3D --with-toolchain-type=3D${COMPILER_TYPE} >+ >+.if ${COMPILER_TYPE} =3D=3D gcc >+USE_GCC=3D yes >+CONFIGURE_ARGS+=3D --disable-warnings-as-errors \ >+ --disable-dtrace \ >+ --with-extra-ldflags=3D"-Wl,-rpath=3D${LOCALBASE}/lib/gcc${GCC_DEFAULT= } -L/usr/local/lib/gcc${GCC_DEFAULT}" \ >+ --with-extra-cflags=3D"-Wl,-rpath=3D${LOCALBASE}/lib/gcc${GCC_DEFAULT}= " \ >+ --with-extra-cxxflags=3D"-Wl,-rpath=3D${LOCALBASE}/lib/gcc${GCC_DEFAUL= T}" >+.else >+MAKE_ENV+=3D USE_CLANG=3Dtrue >+.endif > > .if empty(ICONV_LIB) > ICONV_CFLAGS=3D -DLIBICONV_PLUG > > >--=20 >This message has been scanned for viruses and >dangerous content by MailScanner, and is >believed to be clean. > --9jxsPFA5p3P2qPhR Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAl0bBsIACgkQelmbhSCD nJ0t6Q/9F7BZDwFVIGhwrH1QrJHcg9atmEXAZCRKS46AbbtO3s8qd0Dn/LVy2Xuk 7XHMN+NGefIZ0F+h5JplQ+zHbMKWRjmH2jgwhhQacb+crefngzLUiW9w9pV8XCBy Mcr2ZPfexwPniRPDq7wTUmfjN4HsQ5egG59f2ugvmhXvUci53pUEK+UZjG+iO5YN ok7lnqVR9ea69FSTBuWYZTemLLTdx817XTd0i4p2naMV74gsz5iPy71NO79lgoqV APwTxbKKDPrevvYQFv3+0uVVvysDft6fkGGDpGx3ybmG44HWGCzZb+mXBoyj2fYN I7I/eHC0MZsjZpV9wXmozA5BtvSfv/eR49M6/H9oDjgxuYizytYn7QAn17S4UDJD k++4P1vK32sdu0ToVLH7/Rtzk65Rwhghy9P+cXTr0wafsro0U59l+zaEfJDbjn2y M9km0M/HCGXwmZHdd6X5xDpLE2aW5wYsO9sh5CUVMLSdE6mhSk+JJqhiUA8743Pe FyQQEzMErZDyFJSas9qJzRcZJn7aPZCpZQ7VUo5qJMbX1OT6f8xm11hMUsBv15fA GEuNf8SuGBa8TIBhI/9W09hqnroGIXuanIJ1tA9AiutAOGayLCK51j1ax1YDOJF2 uoMMaPj/1cYUtp+jykhhUzepbsmQHUlIOxRD4w3y2OYX7+IOAak= =MEyT -----END PGP SIGNATURE----- --9jxsPFA5p3P2qPhR--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190702072450.GA17073>