Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java8 ver. bump

Browse Source
This commit is contained in:
Rmys
2026-02-03 17:25:35 +03:00
parent dc07293b42
commit 90dd0bb834
6 changed files with 199 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/language/java/java8-openjdk/actions.py
+18 -6
View File
@@ -22,17 +22,28 @@ shelltools.export("HOTSPOT_BUILD_JOBS", jobs)
shelltools.export("LC_ALL", "C")
def setup():
shelltools.export("CFLAGS", "%s -fPIC -O3" % get.CFLAGS())
shelltools.export("CXXFLAGS", "%s -fPIC -O3" % get.CXXFLAGS())
# 3.8.0 yama vurmak için openjdk yerine openjdk- dosyasına alındı geçici
shelltools.system("sed -i 's|OPENJDK_CHANGESET) openjdk|OPENJDK_CHANGESET) openjdk-|g' Makefile.in")
shelltools.export("CFLAGS", "%s -std=gnu17 -fPIC -O3" % get.CFLAGS())
shelltools.export("CXXFLAGS", "%s -std=gnu++14 -fPIC -O3" % get.CXXFLAGS())
shelltools.export("CC", "gcc")
shelltools.export("CXX", "g++")
#shelltools.system('export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
#patches/openjdk7_nonreparenting-wm.diff"')
#patches/giflib_5.1.diff
shelltools.move("icedtea8-4f0a262e7d6", "openjdk")
shelltools.system("patch -p0 < openjdk-8-insantiate-arrayallocator.patch")
shelltools.system("patch -p1 < openjdk-8.402_p06-0001-Fix-Wint-conversion.patch")
shelltools.system("patch -p1 < openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch")
# shelltools.system("patch -p1 < openjdk-8.402_p06-0004-Fix-misc.-warnings.patch")
autotools.rawConfigure("\
--disable-tests \
----disable-tests \
--disable-Werror \
--with-parallel-jobs=%s \
--with-parallel-jobs='%s' \
--enable-nss \
--disable-system-kerberos \
--disable-system-pcsc \
@@ -41,7 +52,7 @@ def setup():
--with-jdk-home=/usr/lib/jvm/java-8-openjdk \
--with-ecj-jar=/usr/share/java/ecj.jar \
--with-vendor-name='PisiLinux' \
--with-pkgversion='PisiLinux build 8u.452_3.35.0' \
--with-pkgversion='PisiLinux build 8u.482_3.38.0' \
" % jobs.replace("-j", ""))
def build():
@@ -89,7 +100,8 @@ def install():
pisitools.insinto("%s/jre/bin" % jvmdir , "images/j2sdk-image/jre/bin/*")
#pisitools.insinto("%s/jre/lib/amd64" % jvmdir , "j2sdk-image/jre/lib/amd64/xawt")
for binfile in shelltools.ls("images/j2sdk-image/jre/bin"):
# for binfile in shelltools.ls("images/j2sdk-image/jre/bin"):
for binfile in shelltools.ls("%s/usr/lib/jvm/java-8-openjdk/jre/bin" % get.installDIR()):
pisitools.dosym("%s/jre/bin/%s" % (jvmdir, binfile), "/usr/bin/%s" % binfile)
pisitools.insinto("/usr/share/applications", "../policytool.desktop", "policytool-jdk8.desktop")
programming/language/java/java8-openjdk/files/gentoo/openjdk-8-insantiate-arrayallocator.patch
+16
View File
@@ -0,0 +1,16 @@
Workarounds build error:
Error: dl failure on line 895
Error relocating .../libjvm.so: _ZN14ArrayAllocatorImL10MemoryType7EE4freeEv: symbol not found
Possibly due to g++ 10.x error on not properly instantiating the template.
--- openjdk/hotspot/src/share/vm/utilities/bitMap.cpp.orig 2020-11-10 14:07:08.372045326 +0200
+++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp 2020-11-10 14:08:07.911412813 +0200
@@ -42,6 +42,7 @@
# include "os_bsd.inline.hpp"
#endif
+template class ArrayAllocator<BitMap::bm_word_t, mtInternal>;
BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) :
_map(map), _size(size_in_bits), _map_allocator(false)
programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch
+41
View File
@@ -0,0 +1,41 @@
From cc568d4d246ffc9bf08a96db0889d3b89c852718 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 6 Mar 2024 11:22:11 +0000
Subject: [PATCH 1/4] Fix -Wint-conversion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Backport of upstream commit https://github.com/openjdk/jdk21u-dev/commit/7b1455163ed893639059b3d62b71b2ff347c2e3f.
Fixes the following warning/error:
```
jdk8u-jdk8u402-ga/openjdk/jdk/src/share/bin/splashscreen_stubs.c:64:5: error: returning ‘void *’ from a function with return type ‘int’ makes integer from pointer without a cast [-Wint-conversion]
```
Signed-off-by: Sam James <sam@gentoo.org>
---
jdk/src/share/bin/splashscreen_stubs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openjdk/jdk/src/share/bin/splashscreen_stubs.c b/openjdk/jdk/src/share/bin/splashscreen_stubs.c
index 9c1f514..666634f 100644
--- a/openjdk/jdk/src/share/bin/splashscreen_stubs.c
+++ b/openjdk/jdk/src/share/bin/splashscreen_stubs.c
@@ -61,11 +61,11 @@ typedef char* (*SplashGetScaledImageName_t)(const char* fileName,
#define INVOKEV(name) _INVOKE(name, ,;)
int DoSplashLoadMemory(void* pdata, int size) {
- INVOKE(SplashLoadMemory, NULL)(pdata, size);
+ INVOKE(SplashLoadMemory, 0)(pdata, size);
}
int DoSplashLoadFile(const char* filename) {
- INVOKE(SplashLoadFile, NULL)(filename);
+ INVOKE(SplashLoadFile, 0)(filename);
}
void DoSplashInit(void) {
--
2.44.0
programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch
+48
View File
@@ -0,0 +1,48 @@
From 57b8fef20b090ffdf99bcf2c3f5fc8d0d4472788 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 6 Mar 2024 11:54:24 +0000
Subject: [PATCH 2/4] Fix -Wincompatible-pointer-types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Backport https://github.com/openjdk/jdk17u/commit/6632e6c6ca74101b45b052fb7962376fbe97605e.
```
jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c: In function ‘Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage’:
jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c:2853:19: error: passing argument 1 of ‘freeArray’ from incompatible pointer type [-Wincompatible-pointer-types]
2853 | freeArray(scale, numBands);
| ^~~~~
| |
| UINT8 ** {aka unsigned char **}
jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c:2689:30: note: expected ‘void **’ but argument is of type ‘UINT8 **’ {aka ‘unsigned char **’}
2689 | static void freeArray(void** arr, jint size) {
| ~~~~~~~^~~
jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c:2860:19: error: passing argument 1 of ‘freeArray’ from incompatible pointer type [-Wincompatible-pointer-types]
2860 | freeArray(scale, numBands);
| ^~~~~
| |
| UINT8 ** {aka unsigned char **}
```
Signed-off-by: Sam James <sam@gentoo.org>
---
jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
index 7e1d8c9..163003c 100644
--- a/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
+++ b/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
@@ -2686,7 +2686,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeTables
RELEASE_ARRAYS(env, data, NULL);
}
-static void freeArray(void** arr, jint size) {
+static void freeArray(UINT8** arr, jint size) {
int i;
if (arr != NULL) {
for (i = 0; i < size; i++) {
--
2.44.0
programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch
+61
View File
@@ -0,0 +1,61 @@
From 24f51a75b79aec29bd1631d320e051a646b9fae4 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 6 Mar 2024 12:23:41 +0000
Subject: [PATCH 4/4] Fix misc. warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Backport of https://github.com/openjdk/jdk11u/commit/49dec121161c162f4aa94caf8c09413253d89377.
```
jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp: In function ‘_jobject* Java_com_sun_java_util_jar_Unpack_getUnusedInput(JNIEnv*, jobject)’:
jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp:295:12: error: cannot convert ‘bool’ to ‘jobject’ {aka ‘_jobject*’} in return
295 | return false;
| ^~~~~
jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp: In function ‘jlong Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv*, jobject)’:
jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp:315:3: warning: converting to non-pointer type ‘long int’ from NULL [-Wconversion-null]
315 | CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp:315:3: warning: converting to non-pointer type ‘long int’ from NULL [-Wconversion-null]
[...]
```
Signed-off-by: Sam James <sam@gentoo.org>
---
jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp b/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp
index 5fbc726..4c002e7 100644
--- a/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp
+++ b/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp
@@ -292,7 +292,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject
if (uPtr->aborting()) {
THROW_IOE(uPtr->get_abort_message());
- return false;
+ return null;
}
// We have fetched all the files.
@@ -312,7 +312,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
// There's no need to create a new unpacker here if we don't already have one
// just to immediatly free it afterwards.
unpacker* uPtr = get_unpacker(env, pObj, /* noCreate= */ true);
- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
size_t consumed = uPtr->input_consumed();
// free_unpacker() will set the unpacker field on 'pObj' to null
free_unpacker(env, pObj, uPtr);
@@ -323,6 +323,7 @@ JNIEXPORT jboolean JNICALL
Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
jstring pProp, jstring pValue) {
unpacker* uPtr = get_unpacker(env, pObj);
+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
CHECK_EXCEPTION_RETURN_VALUE(prop, false);
const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
--
2.44.0
programming/language/java/java8-openjdk/pspec.xml
+15 -12
View File
@@ -13,15 +13,10 @@
<Icon>java8</Icon>
<Summary>Open Java Development Kit</Summary>
<Description>OpenJDK (Open Java Development Kit) is a free and open source implementation of the Java Platform, Standard Edition (Java SE).</Description>
<Archive type="tarxz" sha1sum="61ea683d1baffaaf4e6941b620b98f97260b28d7">https://icedtea.classpath.org/download/source/icedtea-3.35.0.tar.xz</Archive>
<!--Archive type="tarxz" sha1sum="70298576084208409dad6189d9ef5d0c2c7e8e09">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/corba.tar.xz</Archive>
<Archive type="tarxz" sha1sum="a4c8ae2a0d30b4349918b2525c7c74fdaee5c3ac">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/hotspot.tar.xz</Archive>
<Archive type="tarxz" sha1sum="6fb46ee58d5d121fdbb7eccc68988255f37926ae">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/jaxp.tar.xz</Archive>
<Archive type="tarxz" sha1sum="812b90a5ae321bb72ee306aae73f1239f357e7a1">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/jaxws.tar.xz</Archive>
<Archive type="tarxz" sha1sum="a8f2f6d341ef151eedb2d1dbfb9c78e658958510">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/jdk.tar.xz</Archive>
<Archive type="tarxz" sha1sum="438be528ca79f44395ae46f2091983b1659044b7">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/langtools.tar.xz</Archive>
<Archive type="tarxz" sha1sum="bc73de0a9e9afc86115bc65bc182bbd5828c1668">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/nashorn.tar.xz</Archive>
<Archive type="tarxz" sha1sum="a7fff57cfd2bc2e8a9a10b96d452f9cd6d6e2a2d">http://icedtea.wildebeest.org/download/drops/icedtea8/3.19.0/openjdk.tar.xz</Archive-->
<Archive type="tarxz" sha1sum="bfebe5816f1bf803a6d3834800b96996bc443955">https://icedtea.classpath.org/download/source/icedtea-3.38.0.tar.xz</Archive>
<Archive type="binary" sha1sum="d934e1713eb466ec39f9bc3c5e0bf864ffde4bdd" target="icedtea-3.38.0">https://icedtea.classpath.org/download/drops/icedtea8/3.38.0/openjdk-git.tar.xz</Archive> -->
<Archive type="tarxz" sha1sum="d934e1713eb466ec39f9bc3c5e0bf864ffde4bdd" target="icedtea-3.38.0">https://icedtea.classpath.org/download/drops/icedtea8/3.38.0/openjdk-git.tar.xz</Archive>
<BuildDependencies>
<!-- <Dependency>ant</Dependency> -->
<Dependency>wget</Dependency>
@@ -58,9 +53,10 @@
<Dependency>libXp-devel</Dependency>
</BuildDependencies>
<AdditionalFiles>
<!-- <AdditionalFile target="patches/gcc10.diff">gcc10.diff</AdditionalFile> -->
<!-- <AdditionalFile target="patches/fontconfig-paths.diff">fontconfig-paths.diff</AdditionalFile> -->
<!-- <AdditionalFile target="patches/openjdk7_nonreparenting-wm.diff">openjdk7_nonreparenting-wm.diff</AdditionalFile> -->
<AdditionalFile target="openjdk-8-insantiate-arrayallocator.patch">gentoo/openjdk-8-insantiate-arrayallocator.patch</AdditionalFile>
<AdditionalFile target="openjdk-8.402_p06-0001-Fix-Wint-conversion.patch">gentoo/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch</AdditionalFile>
<AdditionalFile target="openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch">gentoo/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch</AdditionalFile>
<AdditionalFile target="openjdk-8.402_p06-0004-Fix-misc.-warnings.patch">gentoo/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch</AdditionalFile>
</AdditionalFiles>
</Source>
@@ -328,6 +324,13 @@
</Package>
<History>
<Update release="12">
<Date>2026-02-03</Date>
<Version>8u_482.3.38.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="11">
<Date>2025-05-06</Date>
<Version>8u_452.3.35.0</Version>