diff options
author | Simon Frankenberger <simon@fraho.eu> | 2020-03-25 08:05:14 +0100 |
---|---|---|
committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-25 12:41:14 +0000 |
commit | 1dac0e83f4cc792086d453befd08cca47888a07d (patch) | |
tree | 4023b1103001f0e0d72060d07ec727eef1fc1dda /community/openjdk10/APKBUILD | |
parent | d15675a7a0fc230ab4d248c581a64156b82ee123 (diff) | |
download | aports-1dac0e83f4cc792086d453befd08cca47888a07d.tar.bz2 aports-1dac0e83f4cc792086d453befd08cca47888a07d.tar.xz |
community/openjdk10: Cleanup and unify with other openjdk aports
Diffstat (limited to 'community/openjdk10/APKBUILD')
-rw-r--r-- | community/openjdk10/APKBUILD | 146 |
1 files changed, 59 insertions, 87 deletions
diff --git a/community/openjdk10/APKBUILD b/community/openjdk10/APKBUILD index d750b7a9fc..4fb220d07d 100644 --- a/community/openjdk10/APKBUILD +++ b/community/openjdk10/APKBUILD @@ -3,57 +3,55 @@ pkgname=openjdk10 pkgver=10.0.2_p13 _pkgver=${pkgver/_p/+} -pkgrel=0 +pkgrel=1 pkgdesc="Oracle OpenJDK 10" url="https://hg.openjdk.java.net/jdk-updates/jdk10u" -arch="all !x86 !armhf !armv7" # openjdk9 is not yet available on 32 bit arches -license="GPL-2.0 with Classpath" +arch="all !x86 !armhf !armv7" # oracle dropped support for 32 bit +license="GPL-2.0-with-classpath-exception" makedepends="autoconf -bash -gawk -grep -make -openjdk9-jdk -zip -alsa-lib-dev -cups-dev -elfutils-dev -fontconfig-dev -freetype-dev -giflib-dev -lcms2-dev -libexecinfo-dev -libffi-dev -libjpeg-turbo-dev -libx11-dev -libxext-dev -libxrender-dev -libxt-dev -libxtst-dev -linux-headers -zlib-dev" + bash + gawk + grep + make + openjdk9-jdk + zip + alsa-lib-dev + cups-dev + elfutils-dev + fontconfig-dev + freetype-dev + giflib-dev + lcms2-dev + libexecinfo-dev + libffi-dev + libjpeg-turbo-dev + libx11-dev + libxext-dev + libxrender-dev + libxt-dev + libxtst-dev + linux-headers + zlib-dev" depends="$pkgname-jmods $pkgname-demos $pkgname-doc $pkgname-jdk" # for the virtual openjdk10 package subpackages="$pkgname-jmods:_jmods:noarch -$pkgname-demos:_demos:noarch -$pkgname-doc:_doc:noarch -$pkgname-dbg:_dbg -$pkgname-jre:_jre -$pkgname-src:_src:noarch -$pkgname-jre-headless:_jre_headless -$pkgname-jdk:_jdk" + $pkgname-demos:_demos:noarch + $pkgname-doc:_doc:noarch + $pkgname-jre:_jre + $pkgname-src:_src:noarch + $pkgname-jre-headless:_jre_headless + $pkgname-jdk:_jdk" source="jdk-$_pkgver.tar.bz2::https://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-$_pkgver.tar.bz2 -2019-01-05_config.sub::https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;h=3b4c7624b68d2d7f84618e1b5fa2badd43a48325;hb=286a38db91ea2dce1749ab7d1d9ea5ae344a16c1 -build.patch -aarch64.patch -arm.patch -ppc64le.patch -x86.patch - -HelloWorld.java -TestECDSA.java -TestCryptoLevel.java -Alpine_Bug_10126.java + build.patch + aarch64.patch + ppc64le.patch + make-4.3.patch + fix-bootjdk-check.patch + + HelloWorld.java + TestECDSA.java + TestCryptoLevel.java + Alpine_Bug_10126.java " builddir="$srcdir/jdk10u-jdk-$_pkgver" @@ -64,18 +62,18 @@ sonameprefix="$pkgname:" # enable running the JTReg tests in check? # see comment in that function for explanation -_run_jtreg=0 +_run_jtreg=${_run_jtreg:-0} if [ $_run_jtreg -ne 0 ]; then makedepends="$makedepends java-jtreg" - checkdepends="$checkdepends ttf-freefont xvfb" + checkdepends="$checkdepends ttf-freefont xvfb-run" fi - prepare() { default_prepare - # update the config.sub file to detect alpine - cp $srcdir/2019-01-05_config.sub make/autoconf/build-aux/autoconf-config.sub + # update autoconf files to detect alpine + update_config_sub + update_config_guess # remove not compilable module (hotspot jdk.hotspot.agent) # this needs libthread_db which is only provided by glibc @@ -93,9 +91,9 @@ build() { # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning # in the output of ./configure unless used like such: - # --with-extra-cflags="${CFLAGS}" - # --with-extra-cxxflags="${CXXFLAGS}" - # --with-extra-ldflags="${LDFLAGS}" + # --with-extra-cflags="$CFLAGS" + # --with-extra-cxxflags="$CXXFLAGS" + # --with-extra-ldflags="$LDFLAGS" # See also paragraph "Configure Control Variables" from "common/doc/building.md" # shellcheck disable=2097 disable=2098 CFLAGS='' CXXFLAGS='' LDFLAGS='' \ @@ -116,7 +114,7 @@ build() { --with-lcms=system \ --with-jobs=${JOBS:-4} \ --with-test-jobs=${JOBS:-4} \ - --with-native-debug-symbols=external \ + --with-native-debug-symbols=none \ $_with_jtreg \ --disable-warnings-as-errors \ --disable-precompiled-headers \ @@ -124,18 +122,16 @@ build() { --with-jvm-variants=server \ --with-debug-level=release \ --with-version-pre= \ - --with-version-opt=alpine-r${pkgrel} \ + --with-version-opt="alpine-r$pkgrel" \ --with-version-build=${_pkgver#*+} \ --with-vendor-name="Alpine" \ --with-vendor-url="https://alpinelinux.org/" \ - --with-vendor-bug-url="https://bugs.alpinelinux.org/projects/alpine/issues" \ - --with-vendor-vm-bug-url="https://bugs.alpinelinux.org/projects/alpine/issues" + --with-vendor-bug-url="https://gitlab.alpinelinux.org/alpine/aports/issues" \ + --with-vendor-vm-bug-url="https://gitlab.alpinelinux.org/alpine/aports/issues" MAKEFLAGS='' make jdk-image } check() { - cd "$builddir" - local _java_bin="./build/*-normal-server-release/images/jdk/bin" # 1) compile and run a simple hello world @@ -163,29 +159,20 @@ check() { # When updating this aport please let them run at least once on your machine to see if the failure count changes. if [ $_run_jtreg -ne 0 ]; then _logfile=$( mktemp -p "$builddir" ) - if [ -z "$DISPLAY" ]; then - Xvfb :99 & - _xvfb_pid=$! - DISPLAY=:99 - fi - MAKEFLAGS='' DISPLAY=$DISPLAY make \ + MAKEFLAGS='' xvfb-run make \ run-test-tier1 \ run-test-tier2 \ run-test-tier3 \ | tee "$_logfile" msg "---------------------------------------" msg "The build log can be found at $_logfile" - if [ -n "$_xvfb_pid" ]; then - kill $_xvfb_pid - fi # abort the build so you may take a look at the logfile false + return 1 fi } package() { - cd "$builddir" - mkdir -p "$pkgdir/$_java_home" cp -r build/*-normal-server-release/images/jdk/* "$pkgdir/$_java_home" } @@ -222,20 +209,6 @@ _doc() { mv "$_fromroot/man" "$_toroot" } -_dbg() { - pkgdesc="Oracle OpenJDK 10 (debug)" - depends="$pkgname-jdk" - _fromroot="$pkgdir/$_java_home" - _toroot="$subpkgdir/$_java_home" - - mkdir -p "$_toroot/lib/server" - mkdir -p "$_toroot/lib/jli" - - mv "$_fromroot"/lib/server/*.debuginfo "$_toroot"/lib/server - mv "$_fromroot"/lib/jli/*.debuginfo "$_toroot"/lib/jli - mv "$_fromroot"/lib/*.debuginfo "$_toroot"/lib -} - _jre() { pkgdesc="Oracle OpenJDK 10 (JRE)" depends="$pkgname-jre-headless" @@ -315,13 +288,12 @@ _jdk() { } sha512sums="7491da11d5e0013db75d33e09be7a91ac0dbcde6282541a39fe471fd5368d49b15403bc7508b330ca60210b3ca02730743ba280657283a231853f6882a3ca74d jdk-10.0.2+13.tar.bz2 -74e3d868d766e605921542969dd2f646a8adec1b82181aaeb02b623a524cb9011e44c261d4e13ab24268c79c6bc1d260e62d41a928b1b402b186dc5676272e36 2019-01-05_config.sub e0e7957ca035346071e04aa1b09226189c69878461c0c94c8057983f9ceab493bd192799ac33be0155831a75fac8a61f40aafea1ad4bacfdb50dfe310406c777 build.patch 479d0183aece1ca3f41d4eb9e9bf69d3d0fc2668e32d8b826ae3bd117da5d83241868e8b0cab6773cb87bd7403f17d519cc190c530a783b51f28a6aee0272bea aarch64.patch -776edc09c2860820e7f8500153b9b64e03e93df8c060cb02546da72102f8574d31b1c8354d02b2714b3aa480d4ec6f487942dd09bec2a921d4e18a39539a4d95 arm.patch 06f134112d8f6c3909f332713e8fef755e65815697f08ef8ea35f89ad658c76d9063d39754eec50de93ef709a4d37dcb0815d7a74663d8668af0e23793972395 ppc64le.patch -d882d3be6d19a23b495f0f4211b7d01bcf900afadcd1c783b0943db32c41935f336615ea4c68fe7c597ec19b793c05c9674f630c0c9580e9241d11f4a86d3781 x86.patch +3029a390e36edf040349c0c9af7d90578c8d9261edc88c838f4864616b2f3b5540cf40ce60e4bf165ca87b95b84eebf3fc5c4f4105892771cedc97d8d342ecb7 make-4.3.patch +2fcca84fd6d50dc443a0a9a3b6a68d28aca8e221f4fde18ad58305fe52a25903444c397b529ed354a73722f2479c02952b6169a03bc51b6b5c683a6458d944ce fix-bootjdk-check.patch d1767dddd8e0956e25c0f77ed45c6fc86a1191bae1704a6dc33be490fd20eaa50461fe5c2a3349512059d555651e2eb41437dd3c1096c351e8ee68b4534a2579 HelloWorld.java 27e91edef89d26c0c5b9a813e2045f8d2b348745a506ae37b34b660fa7093da9a4e0e676ea41dc4a5c901bce02e5304d95e90f68d6c99cbf461b2da40a7a9853 TestECDSA.java b02dff8d549f88317bb4c741a9e269e8d59eef990197d085388fc49c7423a4eb9367dbe1e02bffb10e7862f5980301eb58d4494e177d0e8f60af6b05c7fbbe60 TestCryptoLevel.java -18f72fcc3b09e772da10d6875a7081fe21d3b387e1d4d9a45bb9cc3e306393960b19c27dac61d33a20d7484c22109c2d091c062523d5575b8d30b20949b74f70 Alpine_Bug_10126.java" +cc466f64fcc8762cf6e3c1f5739be6425209b27aa58acff4e7eb126003d61fa18266f0e79e57e9d84224654010185ab45dc0a8043543dea227258458a00a1eb1 Alpine_Bug_10126.java" |