Attachment 186549 Details for Bug 222460 – patch

[patch] patch

java_bootstrap-openjdk.patch (text/plain), 4.78 KB, created by Mikael Urankar on 2017-09-19 17:48:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2017-09-19 17:48:24 UTC

Size: 4.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 449607)
>+++ Makefile	(working copy)
>@@ -17,50 +17,36 @@
> 
> BUNDLE_LIBS=	yes
> 
>-ONLY_FOR_ARCHS=		amd64 armv6 i386 powerpc64
>+ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc64
> BROKEN_powerpc64=	fails to build: pkg-static: Unable to access file jre/lib/powerpc64/jvm.cfg
> 
> DISTINFO_FILE=	${.CURDIR}/distinfo.${JDK_ARCH}
> DISTVERSION_amd64=	r351880
>-DISTVERSION_arm=	r378760
>+DISTVERSION_arm=	r444448
> DISTVERSION_i386=	r351880
> DISTVERSION_powerpc64=	r407937
> 
>-JDK_ARCH=	${ARCH:C/armv6.*/arm/}
>+JDK_ARCH=	${ARCH:C/armv.*/arm/}
> JDK_NAME=	openjdk
> JDK_ROOT=	bootstrap-${JDK_NAME}
> 
> NO_BUILD=	yes
>-PLIST_SUB=	JDK_ARCH=${JDK_ARCH} JDK_NAME=${JDK_NAME} JDK_ROOT=${JDK_ROOT}
> USES=		tar:xz
> WRKSRC=		${WRKDIR}/${JDK_ROOT}
> 
> INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
> 
>-.if !exists(/usr/lib/libstdc++.so.6)
>-PLIST_SUB+=	LIBSTDCXX=""
>-.else
>-EXCLUDE_EXP=	-not -name libstdc++.so.6
>-PLIST_SUB+=	LIBSTDCXX="@comment "
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
> JDK_MASTER_SITES=	LOCAL/jkim
> 
>-.if ${ARCH:Marmv6*}
>-JDK_PORT=	openjdk7
>+.if ${ARCH:Marmv*}
>+JDK_PORT=	openjdk8
> .else
> JDK_PORT=	openjdk6
> .endif
> 
>-.if ${ARCH} == "i386"
>-PLIST_SUB+=	CLIENTVM=""
>-.else
>-PLIST_SUB+=	CLIENTVM="@comment "
>-.endif
>-
>-.if ${ARCH} == "powerpc64"
>+.if ${ARCH} == powerpc64
> JDK_PORT=	openjdk7
> JDK_NAME=	openjdk
> JDK_MASTER_SITES=	LOCAL/glewis/bootstrap-openjdk
>@@ -70,6 +56,10 @@
> 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} "${EXCLUDE_EXP}"
> 	@cd ${WRKSRC} && ${COPYTREE_BIN} "bin jre/bin" ${INSTALLDIR}
> 
>+post-install:
>+	@${FIND} ${INSTALLDIR} -not -type d | ${SORT} | \
>+		${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST}
>+
> update:
> 	@${MAKE} -f ${.CURDIR}/Makefile.update \
> 	    JDK_NAME=${JDK_NAME} JDK_PORT=${JDK_PORT} JDK_ROOT=${JDK_ROOT}
>Index: distinfo.arm
>===================================================================
>--- distinfo.arm	(revision 449607)
>+++ distinfo.arm	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (openjdk7-arm-r378760.tar.xz) = 4b4ca5f1ae2d4bd32a969fef4163f165538309672ede83e33116fccfea181c8e
>-SIZE (openjdk7-arm-r378760.tar.xz) = 25109864
>+TIMESTAMP = 1505133900
>+SHA256 (openjdk8-arm-r444448.tar.xz) = 010735f20f55ae3c74bca09dadb5275633b453203615acc09d5e3477d6cfddce
>+SIZE (openjdk8-arm-r444448.tar.xz) = 24578644
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 449607)
>+++ pkg-plist	(nonexistent)
>@@ -1,55 +0,0 @@
>-%%JDK_ROOT%%/ASSEMBLY_EXCEPTION
>-%%JDK_ROOT%%/LICENSE
>-%%JDK_ROOT%%/THIRD_PARTY_README
>-%%JDK_ROOT%%/bin/idlj
>-%%JDK_ROOT%%/bin/jar
>-%%JDK_ROOT%%/bin/java
>-%%JDK_ROOT%%/bin/javac
>-%%JDK_ROOT%%/bin/javah
>-%%JDK_ROOT%%/bin/javap
>-%%JDK_ROOT%%/bin/native2ascii
>-%%JDK_ROOT%%/bin/rmic
>-%%JDK_ROOT%%/include/jni.h
>-%%JDK_ROOT%%/include/freebsd/jni_md.h
>-%%JDK_ROOT%%/jre/ASSEMBLY_EXCEPTION
>-%%JDK_ROOT%%/jre/LICENSE
>-%%JDK_ROOT%%/jre/THIRD_PARTY_README
>-%%JDK_ROOT%%/jre/bin/java
>-%%JDK_ROOT%%/jre/lib/charsets.jar
>-%%JDK_ROOT%%/jre/lib/currency.data
>-%%JDK_ROOT%%/jre/lib/fontconfig.bfc
>-%%JDK_ROOT%%/jre/lib/jce.jar
>-%%JDK_ROOT%%/jre/lib/jsse.jar
>-%%JDK_ROOT%%/jre/lib/logging.properties
>-%%JDK_ROOT%%/jre/lib/meta-index
>-%%JDK_ROOT%%/jre/lib/net.properties
>-%%JDK_ROOT%%/jre/lib/resources.jar
>-%%JDK_ROOT%%/jre/lib/rt.jar
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/jvm.cfg
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libawt.so
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libfontmanager.so
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libfreetype.so.6
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libjava.so
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libjpeg.so
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/liblcms.so
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libnet.so
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libnio.so
>-%%LIBSTDCXX%%%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libstdc++.so.6
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libverify.so
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libzip.so
>-%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/client/libjvm.so
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/headless/libmawt.so
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/server/libjvm.so
>-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/xawt/libmawt.so
>-%%JDK_ROOT%%/jre/lib/cmm/GRAY.pf
>-%%JDK_ROOT%%/jre/lib/cmm/PYCC.pf
>-%%JDK_ROOT%%/jre/lib/cmm/sRGB.pf
>-%%JDK_ROOT%%/jre/lib/ext/dnsns.jar
>-%%JDK_ROOT%%/jre/lib/ext/localedata.jar
>-%%JDK_ROOT%%/jre/lib/ext/meta-index
>-%%JDK_ROOT%%/jre/lib/ext/sunjce_provider.jar
>-%%JDK_ROOT%%/jre/lib/ext/sunpkcs11.jar
>-%%JDK_ROOT%%/jre/lib/security/java.security
>-%%JDK_ROOT%%/jre/lib/zi
>-%%JDK_ROOT%%/lib/ct.sym
>-%%JDK_ROOT%%/lib/tools.jar
>
>Property changes on: pkg-plist
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 222460: 186549