Attachment 203672 Details for Bug 237208 – patch

[patch] patch

java.diff (text/plain), 3.98 KB, created by Mikael Urankar on 2019-04-14 13:28:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2019-04-14 13:28:23 UTC

Size: 3.98 KB

patch

obsolete

>Index: java/bootstrap-openjdk11/Makefile
>===================================================================
>--- java/bootstrap-openjdk11/Makefile	(revision 498704)
>+++ java/bootstrap-openjdk11/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> 
> LICENSE=	GPLv2
> 
>-ONLY_FOR_ARCHS=	amd64 i386
>+ONLY_FOR_ARCHS=	amd64 i386 powerpc64
> 
> USES=		tar:xz
> 
>Index: java/bootstrap-openjdk11/distinfo
>===================================================================
>--- java/bootstrap-openjdk11/distinfo	(revision 498704)
>+++ java/bootstrap-openjdk11/distinfo	(working copy)
>@@ -1,5 +1,7 @@
>-TIMESTAMP = 1553143931
>+TIMESTAMP = 1554745845
> SHA256 (bootstrap-openjdk11-amd64-11.0.2.9.2.tar.xz) = e53f16a33fca82db960b68ea200b6146eaf8b3ec8b09f5fe1c7711d926d94ffa
> SIZE (bootstrap-openjdk11-amd64-11.0.2.9.2.tar.xz) = 102199460
> SHA256 (bootstrap-openjdk11-i386-11.0.2.9.2.tar.xz) = 68b84741d7b8a7241fb30614881f15db3c174d973f999d34e0f53aca6190e00f
> SIZE (bootstrap-openjdk11-i386-11.0.2.9.2.tar.xz) = 96936056
>+SHA256 (bootstrap-openjdk11-powerpc64-11.0.2.9.2.tar.xz) = f4b5c770455aff892f7d3dde06b5544a65a8c1b510478cac1674a89e52c574f0
>+SIZE (bootstrap-openjdk11-powerpc64-11.0.2.9.2.tar.xz) = 102464852
>Index: java/openjdk11/Makefile
>===================================================================
>--- java/openjdk11/Makefile	(revision 498704)
>+++ java/openjdk11/Makefile	(working copy)
>@@ -12,8 +12,12 @@
> 
> LICENSE=	GPLv2
> 
>-ONLY_FOR_ARCHS=	amd64 i386
>+ONLY_FOR_ARCHS=	amd64 i386 powerpc64
> 
>+# https://github.com/battleblow/openjdk-jdk11u/pull/13
>+PATCH_SITES=	http://mikael.urankar.free.fr/FreeBSD/powerpc64/
>+PATCHFILES=	ppc64-mixed.patch:-p1
>+
> BUILD_DEPENDS=	zip:archivers/zip \
> 		autoconf>0:devel/autoconf \
> 		${LOCALBASE}/include/cups/cups.h:print/cups \
>@@ -36,12 +40,12 @@
> 		CLASSPATH="" \
> 		JAVA_HOME="" \
> 		LD_LIBRARY_PATH="" \
>-		CC=/usr/bin/cc \
>-		CXX=/usr/bin/c++ \
>-		MAKEFLAGS="" \
>-		USE_CLANG=true
>+		CC=${CC} \
>+		CXX=${CXX} \
>+		CPP=${CPP} \
>+		MAKEFLAGS=""
> 
>-JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/}
>+JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
> JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
> JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
> INSTALLDIR=	${PREFIX}/${PKGBASE}
>@@ -55,8 +59,9 @@
> BSD_JDK_VERSION=	4
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	CC=/usr/bin/cc \
>-		CXX=/usr/bin/c++
>+CONFIGURE_ENV=	CC=${CC} \
>+		CXX=${CXX} \
>+		CPP=${CPP}
> CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
> 		--disable-ccache \
> 		--disable-javac-server \
>@@ -74,7 +79,6 @@
> 		--with-libpng=system \
> 		--with-zlib=system \
> 		--with-lcms=system \
>-		--with-toolchain-type=clang \
> 		--x-includes=${LOCALBASE}/include \
> 		--x-libraries=${LOCALBASE}/lib \
> 		--with-cacerts-file=${FILESDIR}/cacerts \
>@@ -105,8 +109,25 @@
> BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11
> .endif
> 
>+.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64
> JDK_BUILD_JVM=	server
>+.else
>+JDK_BUILD_JVM=	zero
>+LIB_DEPENDS+=	libffi.so:devel/libffi
>+.endif
> 
>+MAKE_ENV+=	--with-toolchain-type=${COMPILER_TYPE}
>+
>+.if ${ARCH} == powerpc64
>+USE_GCC=	yes
>+CONFIGURE_ARGS+=	--disable-warnings-as-errors \
>+			--disable-dtrace \
>+			--with-log=trace \
>+		--with-extra-ldflags="-Wl,-rpath=/usr/local/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \
>+		--with-extra-cflags="-Wl,-rpath=/usr/local/lib/gcc${GCC_DEFAULT}" \
>+		--with-extra-cxxflags="-Wl,-rpath=/usr/local/lib/gcc${GCC_DEFAULT}"
>+.endif
>+
> .if empty(ICONV_LIB)
> ICONV_CFLAGS=	-DLIBICONV_PLUG
> .else
>Index: java/openjdk11/distinfo
>===================================================================
>--- java/openjdk11/distinfo	(revision 498704)
>+++ java/openjdk11/distinfo	(working copy)
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1553815308
>+TIMESTAMP = 1555246933
> SHA256 (jdk-11.0.2+9-4.tar.gz) = abaa01c2996eb6e8491c37c400e82658d2305fa2590b157d24095099f1542dec
> SIZE (jdk-11.0.2+9-4.tar.gz) = 116770351
>+SHA256 (ppc64-mixed.patch) = b16a088adc48bea58f18d0ad8b351b7ec766e916cb88c5bcecada2bcffc2e469
>+SIZE (ppc64-mixed.patch) = 123774

Actions: View | Diff

Attachments on bug 237208: 203597 | 203672 | 203697 | 203698 | 203699 | 204137 | 204157 | 204189 | 204422 | 204682