1
0
Fridrich Strba 2021-11-01 09:54:06 +00:00 committed by Git OBS Bridge
parent f68370b29c
commit a75be3b992
8 changed files with 22 additions and 73 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec63d1e7dc531617630fc56d96fc72cb94cd204c913f12ee073943a5542e0221
size 27316046

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:29052f338fae3639cc0d6c276cd9daad10c9fa36d9f95a7c44d623003173a323
size 10908411

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab4f67bc9bc9657bcbabc69a7557937fa19e7cc1c76d6e154c44d2b7ef9f6203
size 126304966

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8b8a6b7d94ef2b83bfe7a80c6874a90bd94fc8dbeaaab3cf631196490931ad3e
size 10869515

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b17cc71f2910af9ebed5b3dc52dfb59c857c261a7d8a4add8ebcd5a60a21e7b2
size 126262184

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:263b6d7de931adc6e5560dcf1b8391f2562cc27925c70098383daaed9c6237b0
size 27440554

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ff852b82ae7db7a95981271037eb3a3d52c59581e3b27a638a7c6bc8eecb4a3
size 1515308

View File

@ -29,16 +29,15 @@
%global updatever 302 %global updatever 302
%global buildver b08 %global buildver b08
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive
%global root_revision de702c317454d1cf9ad264f15a8fb2d1431d7006 %global root_revision 8860d39588d2d66201a71dd205443b7fd8182acd
%global root_branch v0.27.0-release %global root_branch v0.29.0-release
%global omr_repository https://github.com/eclipse/openj9-omr/archive %global omr_repository https://github.com/eclipse/openj9-omr/archive
%global omr_revision 9db1c870dfbaf4cf677cb7ba086ea303e83d7d81 %global omr_revision 299b6a2d28cf992edf57ca43b67ed6d6917675bf
%global omr_branch v0.27.0-release %global omr_branch v0.29.0-release
%global openj9_repository https://github.com/eclipse/openj9/archive %global openj9_repository https://github.com/eclipse/openj9/archive
%global openj9_revision 1851b0074f87e20c0007c6190c745dab9760eabe %global openj9_revision e1e72c497688c765183573526f7418a6fe891e93
%global openj9_branch v0.27.0-release %global openj9_branch v0.29.0-release
%global openj9_tag openj9-0.27.0 %global openj9_tag openj9-0.29.0
%global icedtea_sound_version 1.0.1
%global freemarker_version 2.3.29 %global freemarker_version 2.3.29
# priority must be 6 digits in total # priority must be 6 digits in total
%global priority 1801 %global priority 1801
@ -60,11 +59,6 @@
# real file made by update-ca-certificates # real file made by update-ca-certificates
%global javacacerts %{_var}/lib/ca-certificates/java-cacerts %global javacacerts %{_var}/lib/ca-certificates/java-cacerts
# turn zero on non jit arches by default # turn zero on non jit arches by default
%if 0%{?suse_version} >= 1140
%global with_pulseaudio 1
%else
%global with_pulseaudio 0
%endif
%ifarch x86_64 %ifarch x86_64
%global archinstall amd64 %global archinstall amd64
%endif %endif
@ -101,8 +95,6 @@ URL: https://www.eclipse.org/openj9/
Source0: %{root_repository}/%{root_revision}.zip Source0: %{root_repository}/%{root_revision}.zip
Source1: %{omr_repository}/%{omr_revision}.zip Source1: %{omr_repository}/%{omr_revision}.zip
Source2: %{openj9_repository}/%{openj9_revision}.zip Source2: %{openj9_repository}/%{openj9_revision}.zip
# Pulseaudio plugin
Source3: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz
# Use the freemarker jar from maven central # Use the freemarker jar from maven central
Source9: https://repo1.maven.org/maven2/org/freemarker/freemarker/%{freemarker_version}/freemarker-%{freemarker_version}.jar Source9: https://repo1.maven.org/maven2/org/freemarker/freemarker/%{freemarker_version}/freemarker-%{freemarker_version}.jar
# Package also the sources # Package also the sources
@ -129,7 +121,6 @@ Patch203: system-lcms.patch
Patch205: link-with-as-needed.patch Patch205: link-with-as-needed.patch
Patch210: openj9-no-werror.patch Patch210: openj9-no-werror.patch
Patch211: omr-no-return-in-nonvoid-function.patch
Patch300: alternative-path-to-tzdb_dat.patch Patch300: alternative-path-to-tzdb_dat.patch
@ -215,11 +206,6 @@ BuildConflicts: java-headless >= 9
%else %else
BuildRequires: %{name}-devel BuildRequires: %{name}-devel
%endif %endif
# pulse audio requirements
%if %{with_pulseaudio}
BuildRequires: libpulse-devel >= 0.9.11
BuildRequires: pulseaudio >= 0.9.11
%endif
%description %description
The OpenJDK 8 with Eclipse OpenJ9 virtual machine. Eclipse OpenJ9 The OpenJDK 8 with Eclipse OpenJ9 virtual machine. Eclipse OpenJ9
@ -342,9 +328,6 @@ this package unless you really need to.
%prep %prep
%setup -q -n openj9-openjdk-jdk8-%{root_revision} -a 1 -a 2 %setup -q -n openj9-openjdk-jdk8-%{root_revision} -a 1 -a 2
%if %{with_pulseaudio}
%setup -q -D -n openj9-openjdk-jdk8-%{root_revision} -T -a 3
%endif
# Set up the build tree using the subrepository tarballs # Set up the build tree using the subrepository tarballs
pwd pwd
@ -353,10 +336,6 @@ mv openj9-%{openj9_revision} openj9
cp openj9/LICENSE LICENSE.openj9 cp openj9/LICENSE LICENSE.openj9
%if %{with_pulseaudio}
mv icedtea-sound-%{icedtea_sound_version} icedtea-sound
%endif
# Remove libraries that are linked # Remove libraries that are linked
rm -rvf jdk/src/share/native/java/util/zip/zlib-* rm -rvf jdk/src/share/native/java/util/zip/zlib-*
find jdk/src/share/native/sun/awt/image/jpeg ! -name imageioJPEG.c ! -name jpegdecoder.c -type f -delete find jdk/src/share/native/sun/awt/image/jpeg ! -name imageioJPEG.c ! -name jpegdecoder.c -type f -delete
@ -371,7 +350,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
%patch205 -p1 %patch205 -p1
%patch210 %patch210
%patch211
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
@ -427,20 +405,14 @@ bash configure \
--with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk \ --with-boot-jdk=%{_sysconfdir}/alternatives/java_sdk \
--with-freemarker-jar=%{SOURCE9} --with-freemarker-jar=%{SOURCE9}
# The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist
# disables FDS for all build configs and reverts to pre-FDS make logic.
# STRIP_POLICY=none says don't do any stripping. DEBUG_BINARIES=true says
# ignore all the other logic about which debug options and just do '-g'.
make \ make \
JAVAC_FLAGS=-g \
LOG=trace \
DEBUG_BINARIES=true \ DEBUG_BINARIES=true \
FULL_DEBUG_SYMBOLS=0 \ STRIP_POLICY=no_strip \
ZIP_DEBUGINFO_FILES=0 \ POST_STRIP_CMD="" \
STRIP_POLICY=none \ WARNINGS_ARE_ERRORS="-Wno-error" \
POST_STRIP_CMD=true \ CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
ALT_OBJCOPY=/does_not_exist \
LOG=debug \
HAS_AUTOCONF=1 \
%{imagestarget} docs %{imagestarget} docs
# remove redundant *diz and *debuginfo files # remove redundant *diz and *debuginfo files
@ -457,25 +429,6 @@ if [ -f %{imagesdir}/j2sdk-image/jre/lib/security/cacerts ]; then
rm %{imagesdir}/j2sdk-image/jre/lib/security/cacerts rm %{imagesdir}/j2sdk-image/jre/lib/security/cacerts
fi fi
%if %{with_pulseaudio}
# Build the pulseaudio plugin
pushd icedtea-sound
%configure \
--with-jdk-home=$JAVA_HOME \
--disable-docs
make %{?_smp_mflags}
cp icedtea-sound.jar $JAVA_HOME/jre/lib/ext/
cp build/native/libicedtea-sound.so $JAVA_HOME/jre/lib/%{archinstall}/
echo "#Config file to enable PulseAudio support" > $JAVA_HOME/jre/lib/pulseaudio.properties
echo "" >> $JAVA_HOME/jre/lib/pulseaudio.properties
echo "javax.sound.sampled.Clip=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider" >> $JAVA_HOME/jre/lib/pulseaudio.properties
echo "javax.sound.sampled.Port=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider" >> $JAVA_HOME/jre/lib/pulseaudio.properties
echo "javax.sound.sampled.SourceDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider" >> $JAVA_HOME/jre/lib/pulseaudio.properties
echo "javax.sound.sampled.TargetDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider" >> $JAVA_HOME/jre/lib/pulseaudio.properties
echo "" >> $JAVA_HOME/jre/lib/pulseaudio.properties
popd
%endif
# Check unlimited policy has been used # Check unlimited policy has been used
$JAVA_HOME/bin/javac -d . %{SOURCE14} $JAVA_HOME/bin/javac -d . %{SOURCE14}
$JAVA_HOME/bin/java TestCryptoLevel $JAVA_HOME/bin/java TestCryptoLevel
@ -613,7 +566,6 @@ find %{buildroot}%{_jvmdir}/%{jredir} -type f -o -type l \
#see https://bugzilla.redhat.com/show_bug.cgi?id=875408 #see https://bugzilla.redhat.com/show_bug.cgi?id=875408
NOT_HEADLESS=\ NOT_HEADLESS=\
"%{_jvmdir}/%{jredir}/lib/%{archinstall}/libjsoundalsa.so "%{_jvmdir}/%{jredir}/lib/%{archinstall}/libjsoundalsa.so
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libicedtea-sound.so
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libsplashscreen.so %{_jvmdir}/%{jredir}/lib/%{archinstall}/libsplashscreen.so
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libawt_xawt.so %{_jvmdir}/%{jredir}/lib/%{archinstall}/libawt_xawt.so
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libjawt.so" %{_jvmdir}/%{jredir}/lib/%{archinstall}/libjawt.so"