Skip to content

Commit 511baf2

Browse files
committed
openjdk8-notea: bump to 8u232-b09
1 parent 4a37605 commit 511baf2

18 files changed

+75
-886
lines changed

openjdk8-notea/build

+19-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@
44
export CC=gcc
55
export CXX=g++
66

7-
mkdir -p patches
7+
# Disable ccache
8+
export CCACHE_DISABLE=1
9+
10+
# Patch needs to be GNU patch.
11+
mkdir -p path
12+
ln -s "$(command -v gpatch)" "$PWD/path/patch"
13+
14+
export PATH="$PWD/path:$PATH"
15+
816
for p in *.patch; do
917
echo "[INFO] Applying $p"
1018
patch -p1 < "$p"
@@ -29,24 +37,25 @@ export PATH="$JAVA_HOME/bin:/usr/share/apache-ant/bin:$PATH"
2937
export EXTRA_CPP_FLAGS="-std=gnu++98 -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
3038
export EXTRA_CFLAGS="-std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
3139

32-
export CFLAGS="-O3 -fcommon -fno-exceptions"
33-
export CXXFLAGS="-O3 -fcommon -fno-exceptions"
40+
export CFLAGS="-O0 -fcommon -fno-exceptions -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
41+
export CXXFLAGS="-O0 -fcommon -fno-exceptions -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
3442

3543
bash ./configure \
3644
--disable-ccache \
45+
--disable-option-checking \
3746
--disable-freetype-bundling \
38-
--disable-precompiled-headers \
39-
--disable-headful \
4047
--enable-unlimited-crypto \
4148
--with-boot-jdk="$JDK_HOME" \
42-
--with-extra-cflags="$EXTRA_CFLAGS" \
43-
--with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
49+
--with-extra-cflags="$CFLAGS $EXTRA_CFLAGS" \
50+
--with-extra-cxxflags="$CXXFLAGS $EXTRA_CPP_FLAGS" \
4451
--with-extra-ldflags="$LDFLAGS" \
4552
--with-jtreg=no \
46-
--with-jobs=1 \
47-
--with-num-cores=1 \
53+
--with-jobs=$(nproc) \
54+
--with-num-cores=$(nproc) \
4855
--with-vendor-name="KISS" \
4956
--with-milestone="fcs" \
57+
--with-freetype-lib=/usr/lib \
58+
--with-freetype-include=/usr/include/freetype2 \
5059
--with-giflib=system \
5160
--with-zlib=system \
5261
--disable-jfr
@@ -65,6 +74,7 @@ make -j1 \
6574
LOG=debug \
6675
CFLAGS_WARNINGS_ARE_ERRORS= \
6776
COMPILER_WARNINGS_FATAL=false \
77+
GIT=true \
6878
images
6979

7080
mkdir -p "$1/$jdk_prefix"

openjdk8-notea/checksums

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
5f08ae02464c456a47c36701e2a2a4f9d60444dd557499430cd1c619b9cda161bd
1+
e1cc1be38413edf58deee41a5cc112d398cdd5b30c013cf1b1cd3b6ff69024ae07
22
7e6943e66a22a9da3b236d0a345d37aa3a4573c752160060b5c2017a4544a803b9
33
2cf53a5e327f75ffebd1b4563d1db523d377050295a3ae3e1e41cbd76d08600170
44
a2c37dd91116cb3cd36ed4d3016f8865dacdec14da27c1f0f9729871b75a53ffc8
@@ -14,11 +14,8 @@ bba640fbc2d0a548d1f73434fcca39d97b8182ede1f35355185fbba7f6fad89534
1414
f4ea663e62448421c42f4032cb1d9eef807a67ebb266bf45e96c28af889155f1a8
1515
9574fdae4dd81b1108b6dcc2b535f25dcfc02faef52be526202b029a31d4442b87
1616
9c68f1dcc150817212cfeab6861805788b71131991f9ec2d8ec198c68f57f60074
17-
12e509a30076de47f15438fefa36e5d42e4bf2edc996a63f2273e8df6726ca7837
18-
cebbb9ca58226a4db2920ee9025696c6bda3d80b9eae0fa19d787b04e5c82e92db
17+
586da32d485ff8ef41455ab784eaeb7fb8854af3981f689f62c4c19049f48914a0
1918
1b1e80921e5a7686b9b3f41226e242c0769f3133078681a8e9cda78523f30d3c4d
2019
63339e838cc19e2ac42ad7e74d6a09761480ee7270698a19982f7d1bc31a8d8cf0
2120
dc0a05ef88503b0a8cad2bec107af37fdeddbe5c08c88ec2b535077c96e0ddfbc9
2221
10c9e91c6c94622deded4eb93e2fd2f115a2ee91659af98f1405835d787840bda5
23-
d0219dae3797aaf553085cc8e17e712d513a18cc2a865799f8db237baa202bc3c6
24-
0a6c8f7ea4d7dc547aaa61e90014aac319837b859b642f8bb3e480d72b573c5387

openjdk8-notea/depends

+1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ libjpeg-turbo
88
libpng
99
libxslt
1010
nss
11+
patch make
1112
wget

openjdk8-notea/esources

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ patches/100_jdk-execinfo.patch
1414
patches/101_jdk-fix-ipv6-init.patch
1515
patches/103_hotspot-mask-shift.patch
1616
patches/104_mips-support.patch
17-
patches/999-native-no-sysroot.patch
17+
#patches/999-native-no-sysroot.patch
1818
patches/musl_001_hotspot.patch
1919
patches/musl_003_hotspot-noagent.patch
2020
patches/musl_004_fix_libjvm_load.patch
2121
patches/musl_005_jdk.patch
2222
patches/musl_006_jdk_includes.patch
23-
24-
patches/fix-GenerateSources-gmk.patch
25-
patches/fix-Tools-gmk.patch

openjdk8-notea/patches/a openjdk8-notea/fetch-void-patches

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
links="
2+
regular_patches="
33
001_8041658.patch
44
002_8043780-pr3368.patch
55
003_8078504-pr3094.patch
@@ -18,7 +18,20 @@ links="
1818
999-native-no-sysroot.patch
1919
"
2020

21-
for l in $links; do
22-
curl -LO https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/openjdk8/patches/$l
21+
musl_patches="
22+
musl_001_hotspot.patch
23+
musl_002_hotspot_ppc.patch
24+
musl_003_hotspot-noagent.patch
25+
musl_004_fix_libjvm_load.patch
26+
musl_005_jdk.patch
27+
musl_006_jdk_includes.patch
28+
"
29+
cd patches/
30+
31+
for p in $regular_patches; do
32+
curl -LO https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/openjdk8/patches/$p
2333
done
2434

35+
for p in $musl_patches; do
36+
curl -LO https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/openjdk8/files/$p
37+
done

openjdk8-notea/patches-new/0001_musl_hotspot.patch

-135
This file was deleted.

0 commit comments

Comments
 (0)