mid-kid
/
bootstrap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Update java

master
mid-kid 1 day ago
parent
1733e3e14b
commit
1df67d9540
5 changed files with 21 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      java/build_icedtea8.sh
  2. 19
      java/build_jdk.sh
  3. 8
      java/download.sh
  4. 10
      java/download.sha256
  5. 15
      java/install_gentoo.txt

3
java/build_icedtea8.sh
View File

@ -11,7 +11,7 @@ makeopts_jobs() {
echo ${jobs:-1} echo ${jobs:-1}
} }
version_icedtea8=3.32.0 version_icedtea8=3.33.0
dir_download="$PWD/download" dir_download="$PWD/download"
mkdir -p build; cd build mkdir -p build; cd build
@ -28,6 +28,7 @@ unset _JAVA_OPTIONS
export PATH="$PWD/../install-icedtea7/bin:$PATH" export PATH="$PWD/../install-icedtea7/bin:$PATH"
# Configure source # Configure source
CFLAGS='-Wno-error=int-conversion -Wno-error=incompatible-pointer-types' \
CONFIG_SHELL=/bin/bash ./configure \ CONFIG_SHELL=/bin/bash ./configure \
--prefix="$dir_install" \ --prefix="$dir_install" \
--with-jdk-home="$PWD/../install-icedtea7" \ --with-jdk-home="$PWD/../install-icedtea7" \

19
java/build_jdk.sh
View File

@ -11,17 +11,17 @@ makeopts_jobs() {
echo ${jobs:-1} echo ${jobs:-1}
} }
version_jdk21=21.0.5+3 version_jdk21=21.0.6+6
version_jdk20=20.0.2+9 version_jdk20=20.0.2+9
version_jdk19=19.0.2+7 version_jdk19=19.0.2+7
version_jdk18=18.0.2.1+1 version_jdk18=18.0.2.1+1
version_jdk17=17.0.13+3 version_jdk17=17.0.14+6
version_jdk16=16.0.2+7 version_jdk16=16.0.2+7
version_jdk15=15.0.10+5 version_jdk15=15.0.10+5
version_jdk14=14.0.2+12 version_jdk14=14.0.2+12
version_jdk13=13.0.14+5 version_jdk13=13.0.14+5
version_jdk12=12.0.2+10 version_jdk12=12.0.2+10
version_jdk11=11.0.25+3 version_jdk11=11.0.26+3
version_jdk10=10.0.2+13 version_jdk10=10.0.2+13
version_jdk9=9+181 version_jdk9=9+181
@ -43,8 +43,8 @@ cd "$srcdir"
chmod +x configure chmod +x configure
# Some jdk versions require fixing up things # Some jdk versions require fixing up things
CFLAGS="" CFLAGS=
CXXFLAGS="" CXXFLAGS=
case "$version_jdk_major" in case "$version_jdk_major" in
jdk9) jdk9)
patch -p1 -i "$dir_files/jdk-9+181-disarm-timebomb.patch" patch -p1 -i "$dir_files/jdk-9+181-disarm-timebomb.patch"
@ -52,8 +52,7 @@ jdk9)
sed -i -e '/^ *COMPILER_VERSION_NUMBER=/{N;s/\[1-9\]/&[0-9]*/}' \ sed -i -e '/^ *COMPILER_VERSION_NUMBER=/{N;s/\[1-9\]/&[0-9]*/}' \
common/autoconf/generated-configure.sh common/autoconf/generated-configure.sh
export MAKE="$PWD/../install-make42/make" export MAKE="$PWD/../install-make42/make"
CFLAGS="$CFLAGS -fcommon" CFLAGS="$CFLAGS -fcommon -Wno-error=int-conversion"
CXXFLAGS="$CFLAGS -fcommon"
;; ;;
jdk10) jdk10)
patch -p1 -i "$dir_files/jdk-10.0.2+13-disarm-timebomb.patch" patch -p1 -i "$dir_files/jdk-10.0.2+13-disarm-timebomb.patch"
@ -62,27 +61,23 @@ jdk10)
make/autoconf/generated-configure.sh make/autoconf/generated-configure.sh
export MAKE="$PWD/../install-make42/make" export MAKE="$PWD/../install-make42/make"
CFLAGS="$CFLAGS -fcommon" CFLAGS="$CFLAGS -fcommon"
CXXFLAGS="$CFLAGS -fcommon"
;; ;;
jdk12) jdk12)
sed -i -e '/^ *COMPILER_VERSION_NUMBER=/{N;s/@<:@1-9@:>@/&@<:@0-9@:>@*/}' \ sed -i -e '/^ *COMPILER_VERSION_NUMBER=/{N;s/@<:@1-9@:>@/&@<:@0-9@:>@*/}' \
make/autoconf/toolchain.m4 make/autoconf/toolchain.m4
export MAKE="$PWD/../install-make42/make" export MAKE="$PWD/../install-make42/make"
CFLAGS="$CFLAGS -fcommon" CFLAGS="$CFLAGS -fcommon"
CXXFLAGS="$CFLAGS -fcommon"
;; ;;
jdk13) jdk13)
sed -i -e '/^ *COMPILER_VERSION_NUMBER=/{N;s/@<:@1-9@:>@/&@<:@0-9@:>@*/}' \ sed -i -e '/^ *COMPILER_VERSION_NUMBER=/{N;s/@<:@1-9@:>@/&@<:@0-9@:>@*/}' \
make/autoconf/toolchain.m4 make/autoconf/toolchain.m4
CFLAGS="$CFLAGS -fcommon" CFLAGS="$CFLAGS -fcommon"
CXXFLAGS="$CFLAGS -fcommon"
;; ;;
jdk14) jdk14)
## Don't detect WSL ## Don't detect WSL
#sed -i -e 's/grep -i microsoft/false/' \ #sed -i -e 's/grep -i microsoft/false/' \
#make/autoconf/build-aux/config.guess #make/autoconf/build-aux/config.guess
CFLAGS="$CFLAGS -fcommon" CFLAGS="$CFLAGS -fcommon"
CXXFLAGS="$CFLAGS -fcommon"
;; ;;
jdk16) jdk16)
sed -i -e 's/\<prefix\>/fixpath_prefix/g' \ sed -i -e 's/\<prefix\>/fixpath_prefix/g' \
@ -99,7 +94,7 @@ CONFIG_SHELL=/bin/bash ./configure \
--with-boot-jdk="$PWD/../install-$version_jdk_bootstrap" \ --with-boot-jdk="$PWD/../install-$version_jdk_bootstrap" \
--with-jobs="$(makeopts_jobs)" \ --with-jobs="$(makeopts_jobs)" \
--with-extra-cflags="$CFLAGS -w" \ --with-extra-cflags="$CFLAGS -w" \
--with-extra-cxxflags="$CXXFLAGS -w" \ --with-extra-cxxflags="$CFLAGS -w" \
--enable-headless-only \ --enable-headless-only \
--disable-full-docs \ --disable-full-docs \
--disable-warnings-as-errors --disable-warnings-as-errors

8
java/download.sh
View File

@ -1,21 +1,21 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
version_jdk21=21.0.5+3 # https://github.com/openjdk/jdk21u/tags version_jdk21=21.0.6+6 # https://github.com/openjdk/jdk21u/tags
version_jdk20=20.0.2+9 # https://github.com/openjdk/jdk20u/tags version_jdk20=20.0.2+9 # https://github.com/openjdk/jdk20u/tags
version_jdk19=19.0.2+7 # https://github.com/openjdk/jdk19u/tags version_jdk19=19.0.2+7 # https://github.com/openjdk/jdk19u/tags
version_jdk18=18.0.2.1+1 # https://github.com/openjdk/jdk18u/tags version_jdk18=18.0.2.1+1 # https://github.com/openjdk/jdk18u/tags
version_jdk17=17.0.13+3 # https://github.com/openjdk/jdk17u/tags version_jdk17=17.0.14+6 # https://github.com/openjdk/jdk17u/tags
version_jdk16=16.0.2+7 # https://github.com/openjdk/jdk16u/tags version_jdk16=16.0.2+7 # https://github.com/openjdk/jdk16u/tags
version_jdk15=15.0.10+5 # https://github.com/openjdk/jdk15u/tags version_jdk15=15.0.10+5 # https://github.com/openjdk/jdk15u/tags
version_jdk14=14.0.2+12 # https://github.com/openjdk/jdk14u/tags version_jdk14=14.0.2+12 # https://github.com/openjdk/jdk14u/tags
version_jdk13=13.0.14+5 # https://github.com/openjdk/jdk13u/tags version_jdk13=13.0.14+5 # https://github.com/openjdk/jdk13u/tags
version_jdk12=12.0.2+10 # https://github.com/openjdk/jdk12u/tags version_jdk12=12.0.2+10 # https://github.com/openjdk/jdk12u/tags
version_jdk11=11.0.25+3 # https://github.com/openjdk/jdk11u/tags version_jdk11=11.0.26+3 # https://github.com/openjdk/jdk11u/tags
version_jdk10=10.0.2+13 # https://github.com/openjdk/jdk10u/tags version_jdk10=10.0.2+13 # https://github.com/openjdk/jdk10u/tags
version_jdk9=9+181 # https://github.com/openjdk/jdk9u/tags version_jdk9=9+181 # https://github.com/openjdk/jdk9u/tags
version_make42=4.2.1 # https://ftp.gnu.org/gnu/make/ version_make42=4.2.1 # https://ftp.gnu.org/gnu/make/
version_icedtea8=3.32.0 # https://icedtea.classpath.org/download/source/ version_icedtea8=3.33.0 # https://icedtea.classpath.org/download/source/
version_icedtea7=2.6.28 # https://icedtea.classpath.org/download/source/ version_icedtea7=2.6.28 # https://icedtea.classpath.org/download/source/
version_ant=1.9.16 # https://ant.apache.org/manual-1.9.x/index.html version_ant=1.9.16 # https://ant.apache.org/manual-1.9.x/index.html
version_gcc=6.5.0 # Final version version_gcc=6.5.0 # Final version

10
java/download.sha256
View File

@ -9,20 +9,20 @@ fd93e65a4692593c2100963be2c75d697a32ba51ee2c02c7e7dccc524dfb1788 icedtea-2.6.28
24799d5ebebfb1e316f9434db1db5a360ac7c86e5783ce58693536f978a0aa47 icedtea-2.6.28-langtools.tar.bz2 24799d5ebebfb1e316f9434db1db5a360ac7c86e5783ce58693536f978a0aa47 icedtea-2.6.28-langtools.tar.bz2
78e5e89fc510280401e227d980abe30d49ea508c3eec537035481fd21a3b2c32 icedtea-2.6.28-openjdk.tar.bz2 78e5e89fc510280401e227d980abe30d49ea508c3eec537035481fd21a3b2c32 icedtea-2.6.28-openjdk.tar.bz2
951188e6c0e3599de22f5cb2d95b5da9bf480763b5c8c600dae9fec88cff1735 icedtea-2.6.28.tar.xz 951188e6c0e3599de22f5cb2d95b5da9bf480763b5c8c600dae9fec88cff1735 icedtea-2.6.28.tar.xz
6e017ff32b12300e25663ef0f83578ac2ec487562acdd79a10128176625357a9 icedtea-3.32.0-openjdk-git.tar.xz bb2cd8a2c5bbe08d232693c77ea6efa5542c7178f05e8f7cd82eec9be2980d5b icedtea-3.33.0-openjdk-git.tar.xz
40aaf6c20cb8067ae6a69ca8a0087793ef56c23ddfd8b5b83fb5080885b96c40 icedtea-3.32.0.tar.xz 44975cd55e90b6ee7ff6b7b4de05b716a95f6a6ec54a57b1a3b88f5a9ab8b45e icedtea-3.33.0.tar.xz
3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 javac.in 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5f3e996db0 javac.in
39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1 jdk10u-jdk-10.0.2+13.tar.gz 39ce1238d5b2066ffe1c1a09d87c170766309fe18290f27a4ab7d15844d34dc1 jdk10u-jdk-10.0.2+13.tar.gz
7566a4f7954b8ca53d188bf25f01cf62e61ce37e4c8f7fa3482cddede9619e51 jdk11u-jdk-11.0.25+3.tar.gz 3d1818a29d9c1125c81b019cb9df9803d696544d5c1b23e6c7b132b2fa90fd5e jdk11u-jdk-11.0.26+3.tar.gz
8494fa3a6ffef590c86b403379422f325101bc86607557cb27c6774d59710b84 jdk12u-jdk-12.0.2+10.tar.gz 8494fa3a6ffef590c86b403379422f325101bc86607557cb27c6774d59710b84 jdk12u-jdk-12.0.2+10.tar.gz
4c8e88490ed30276ea0145d37f33e094fcf436ce528bab29f6a9a3546820faf4 jdk13u-jdk-13.0.14+5.tar.gz 4c8e88490ed30276ea0145d37f33e094fcf436ce528bab29f6a9a3546820faf4 jdk13u-jdk-13.0.14+5.tar.gz
582e3d805ab74582332250f95f9845608c8f3d3273aa92af6f683c45d1a4f8e8 jdk14u-jdk-14.0.2+12.tar.gz 582e3d805ab74582332250f95f9845608c8f3d3273aa92af6f683c45d1a4f8e8 jdk14u-jdk-14.0.2+12.tar.gz
7aaeab4a68471e630d91eaf5540d067c8ffd5f023031be082b889763c1f94f3a jdk15u-jdk-15.0.10+5.tar.gz 7aaeab4a68471e630d91eaf5540d067c8ffd5f023031be082b889763c1f94f3a jdk15u-jdk-15.0.10+5.tar.gz
b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c jdk16u-jdk-16.0.2+7.tar.gz b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c jdk16u-jdk-16.0.2+7.tar.gz
64f5b38339336554d0e9407c5f44eab756b69019a1ea25505fe1860a2ee78fb9 jdk17u-jdk-17.0.13+3.tar.gz cfc8ce80723ebb38b03352276f433809b19e5e1f3c776fda3ea5d7c779dbe1b4 jdk17u-jdk-17.0.14+6.tar.gz
7d026848a48e8777d3242bab2adf30122f0acda88abbd3f92636f8793eaf3455 jdk18u-jdk-18.0.2.1+1.tar.gz 7d026848a48e8777d3242bab2adf30122f0acda88abbd3f92636f8793eaf3455 jdk18u-jdk-18.0.2.1+1.tar.gz
5903efd527dd08e9c235c8822e3d5699c3d18a8618c3e533307e8d6491ffbbf0 jdk19u-jdk-19.0.2+7.tar.gz 5903efd527dd08e9c235c8822e3d5699c3d18a8618c3e533307e8d6491ffbbf0 jdk19u-jdk-19.0.2+7.tar.gz
4d6f176075d5f2ce62fd16ebd5cc4c27a3e551ce4d3d3bc0e9946454e52fc88d jdk20u-jdk-20.0.2+9.tar.gz 4d6f176075d5f2ce62fd16ebd5cc4c27a3e551ce4d3d3bc0e9946454e52fc88d jdk20u-jdk-20.0.2+9.tar.gz
7d739929e6b4520badf2310a7b598504462213127861afed2e65add886f0bc58 jdk21u-jdk-21.0.5+3.tar.gz 7b4142594fbb9b3ce92b9134d0d4a6b86fe74ae4998dbfcbc822207459751d03 jdk21u-jdk-21.0.6+6.tar.gz
a80c59433d394b241ebcd36968ec6ff017fab3fdf3700a459a5b59e978dab396 jdk9u-jdk-9+181.tar.gz a80c59433d394b241ebcd36968ec6ff017fab3fdf3700a459a5b59e978dab396 jdk9u-jdk-9+181.tar.gz
d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 make-4.2.1.tar.bz2 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 make-4.2.1.tar.bz2

15
java/install_gentoo.txt
View File

@ -1,24 +1,15 @@
# NOTE: All of these commands rely on a same-version sdk not previously being installed # NOTE: All of these commands rely on a same-version sdk not previously being installed
sudo rsync -rvP build/install-icedtea8/ /opt/icedtea8 sudo rsync -rvP build/install-icedtea8/ /opt/icedtea8
sudo mkdir -p /usr/share/java-config-2/vm
cat << 'EOF' | sudo tee /usr/share/java-config-2/vm/openjdk-bin-8 > /dev/null
JAVA_HOME=/opt/icedtea8
PATH="${JAVA_HOME}/bin"
LDPATH=''
PROVIDES_TYPE='JDK JRE'
PROVIDES_VERSION=1.8
GENERATION=2
EOF
sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-8 sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-8
echo 8 | sudo tee /var/db/pkg/dev-java/openjdk-bin-8/SLOT > /dev/null echo 8 | sudo tee /var/db/pkg/dev-java/openjdk-bin-8/SLOT > /dev/null
sudo emerge dev-java/openjdk:8 sudo JDK_HOME=/opt/icedtea8 emerge dev-java/openjdk:8
sudo rm -rf /opt/icedtea8 /usr/share/java-config-2/vm/openjdk-bin-8 /var/db/pkg/dev-java/openjdk-bin-8 sudo rm -rf /opt/icedtea8 /var/db/pkg/dev-java/openjdk-bin-8
sudo rsync -rvP build/install-jdk11/ /opt/jdk11 sudo rsync -rvP build/install-jdk11/ /opt/jdk11
sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-11 sudo mkdir -p /var/db/pkg/dev-java/openjdk-bin-11
echo 11 | sudo tee /var/db/pkg/dev-java/openjdk-bin-11/SLOT > /dev/null echo 11 | sudo tee /var/db/pkg/dev-java/openjdk-bin-11/SLOT > /dev/null
sudo JAVA_HOME="$(echo /opt/jdk11/jvm/*/)" emerge dev-java/openjdk:11 sudo JDK_HOME="$(echo /opt/jdk11/jvm/*/)" emerge dev-java/openjdk:11
sudo rm -rf /opt/jdk11 /var/db/pkg/dev-java/openjdk-bin-11 sudo rm -rf /opt/jdk11 /var/db/pkg/dev-java/openjdk-bin-11
sudo rsync -rvP build/install-jdk17/ /opt/jdk17 sudo rsync -rvP build/install-jdk17/ /opt/jdk17

Write Preview
Loading…
Cancel
Save