diff options
Diffstat (limited to 'development/openjdk7/openjdk7.SlackBuild')
| -rw-r--r-- | development/openjdk7/openjdk7.SlackBuild | 67 |
1 files changed, 37 insertions, 30 deletions
diff --git a/development/openjdk7/openjdk7.SlackBuild b/development/openjdk7/openjdk7.SlackBuild index b0f74e19aa..b10729d6a7 100644 --- a/development/openjdk7/openjdk7.SlackBuild +++ b/development/openjdk7/openjdk7.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for OpenJDK -# Copyright 2019 Strahil Yordanov, Sofia, Bulgaria +# Copyright 2020 Strahil Yordanov, Sofia, Bulgaria # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,40 +22,43 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -function applySBoPatch() { - cat << EOF | patch -d ../icedtea-2.6.18/patches/boot pr64174.patch ---- pr64174.patch.orig 2019-05-26 07:15:48.030960856 +0300 -+++ pr64174.patch.new 2019-05-26 07:17:00.921955937 +0300 -@@ -1,8 +1,8 @@ - diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties - --- openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties 2014-12-04 15:09:06.030312835 +0000 - +++ openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties 2014-12-04 15:10:07.527160626 +0000 --@@ -320,7 +320,7 @@ -- # LAO PEOPLE'S DEMOCRATIC REPUBLIC -+@@ -323,7 +323,7 @@ -+ # LAO PEOPLE'S DEMOCRATIC REPUBLIC (THE) - LA=LAK - # LATVIA - -LV=LVL;2013-12-31-22-00-00;EUR -@@ -10,7 +10,7 @@ - # LEBANON - LB=LBP - # LESOTHO --@@ -332,7 +332,7 @@ -+@@ -335,7 +335,7 @@ - # LIECHTENSTEIN - LI=CHF - # LITHUANIA +function createPatchedJdkArchive() { + + mkdir -p ${SBO_PATCH_DIR} && cd ${SBO_PATCH_DIR} + tar xvf "${CWD}/jdk.tar.bz2" + cd jdk-* + + cat << EOF | patch -d ./src/share/classes/sun/security/util Optional.java +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java 2019-10-20 11:57:14.258731932 +0300 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java 2019-10-20 11:59:48.600721516 +0300 +@@ -193,7 +193,7 @@ + if (!isPresent()) + return empty(); + else { +- return Optional.ofNullable(mapper.apply(value)); ++ return (Optional<U>) Optional.ofNullable(mapper.apply(value)); + } + } + EOF + + cd .. + tar -cvjSf jdk.tar.bz2 jdk-* +} + +function fixJdkArchiveChecksum() { + local newChecksum=$(sha256sum "${SBO_PATCH_DIR}/jdk.tar.bz2" | awk '{print $1}') + + sed -r -i "s/^(\s*JDK_SHA256SUM\s*=\s*).*$/\1${newChecksum}/" Makefile } PRGNAM=openjdk7 -VERSION=${VERSION:-7u221} +VERSION=${VERSION:-7u271} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} - DVER=1.7.0_$(printf $VERSION | cut -du -f2) -ICEDTEA=icedtea-2.6.18 +ICEDTEA=icedtea-2.6.23 if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -68,6 +71,7 @@ fi CWD="$(pwd)" TMP=${TMP:-/tmp/SBo} BUILD_DIR=$TMP/$PRGNAM +SBO_PATCH_DIR="${BUILD_DIR}/jdk-archive-patch" PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -85,6 +89,9 @@ set -e rm -rf $BUILD_DIR $PKG mkdir -p $TMP $BUILD_DIR $PKG $OUTPUT + +(createPatchedJdkArchive) + cd $BUILD_DIR tar -xvf $CWD/${ICEDTEA}.tar.xz @@ -114,11 +121,11 @@ $( --with-corba-src-zip="$CWD/corba.tar.bz2" \ --with-jaxp-src-zip="$CWD/jaxp.tar.bz2" \ --with-jaxws-src-zip="$CWD/jaxws.tar.bz2" \ - --with-jdk-src-zip="$CWD/jdk.tar.bz2" \ + --with-jdk-src-zip="${SBO_PATCH_DIR}/jdk.tar.bz2" \ --with-langtools-src-zip="$CWD/langtools.tar.bz2" \ --with-hotspot-src-zip="$CWD/hotspot.tar.bz2" -applySBoPatch +fixJdkArchiveChecksum JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH LOG=trace make |