[packages/openjdk8] up to 1.8.0.332

[atler]

commit 3d9d9ac23e1590cf0c9d302776b27e2d80b7af3a
Author: Jan Palus <jpalus at fastmail.com>
Date:   Sun Apr 24 19:43:45 2022 +0200

    up to 1.8.0.332
    
    patch to fix error if sources are neither under git control nor under
    hg:
    
    + /usr/bin/make -j16 -j1 images 'SCTP_WERROR=' 'LOG=debug'
    /bin/bash: line 1: [: too many arguments

 no-vcs.patch  | 16 ++++++++++++++++
 openjdk8.spec | 10 ++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/openjdk8.spec b/openjdk8.spec
index 3d2ee58..74e0c0c 100644
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -14,7 +14,7 @@
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 52.0
 
-%define	ver_u	322
+%define	ver_u	332
 
 Summary:	Open-source implementation of the Java Platform, Standard Edition
 Summary(pl.UTF-8):	Wolnoźródłowa implementacja Java 8 SE
@@ -25,9 +25,9 @@ Epoch:		1
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	https://hg.openjdk.java.net/jdk8u/monojdk8u/archive/jdk8u%{ver_u}-ga.tar.bz2?/%{name}-%{version}.tar.bz2
-# Source0-md5:	921ec6b97002cd68016641d372645b8d
-Source1:	https://hg.openjdk.java.net/aarch32-port/monojdk8u/archive/jdk8u%{ver_u}-ga-aarch32-20220131.tar.bz2?/%{name}-aarch32-%{version}.tar.bz2
-# Source1-md5:	4e7ef5cf5492cc8c591e548904490d40
+# Source0-md5:	d8990567bfb9cc4c58d3ee77aef19ae6
+Source1:	https://hg.openjdk.java.net/aarch32-port/monojdk8u/archive/jdk8u%{ver_u}-ga-aarch32-20220422.tar.bz2?/%{name}-aarch32-%{version}.tar.bz2
+# Source1-md5:	0c7f361b704aba22b98465e2aa5ea176
 Source2:	make-cacerts.sh
 Patch0:		adjust-mflags.patch
 Patch1:		format_strings.patch
@@ -44,6 +44,7 @@ Patch12:	atomic.patch
 Patch13:	hotspot-disable-werror.patch
 Patch14:	ignore-java-options.patch
 Patch15:	default-assumemp.patch
+Patch16:	no-vcs.patch
 URL:		http://openjdk.java.net/
 BuildRequires:	/usr/bin/jar
 BuildRequires:	alsa-lib-devel
@@ -438,6 +439,7 @@ tar xf %{SOURCE0} --strip-components=1
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
diff --git a/no-vcs.patch b/no-vcs.patch
new file mode 100644
index 0000000..46f98f3
--- /dev/null
+++ b/no-vcs.patch
@@ -0,0 +1,16 @@
+--- openjdk8-1.8.0.332.orig/make/common/MakeBase.gmk	2022-04-18 02:32:28.000000000 +0200
++++ openjdk8-1.8.0.332/make/common/MakeBase.gmk	2022-04-24 19:10:33.038994029 +0200
+@@ -317,10 +317,10 @@
+ 
+ # Emit the scm:id pair to $@
+ define GetSourceTips
+-	$(CD) $(SRC_ROOT) ; \
+-	if [ -d $(SCM_DIR) -a "$(SCM_VERSION)" != "" ] ; then \
++	$(CD) "$(SRC_ROOT)" ; \
++	if [ -d "$(SCM_DIR)" -a "$(SCM_VERSION)" != "" ] ; then \
+ 	  $(ID_COMMAND) >> $@ ; \
+-	elif [ -f $(SCM_TIP_FILENAME) ] ; then \
++	elif [ -f "$(SCM_TIP_FILENAME)" ] ; then \
+           $(SCM_TIP_FILECMD) >> $@ ; \
+ 	fi;
+ 	$(PRINTF) "\n" >> $@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openjdk8.git/commitdiff/3d9d9ac23e1590cf0c9d302776b27e2d80b7af3a