Minor cosmetic improvements to make spec more comparable between variants
This commit is contained in:
Andrew John Hughes
parent
e70d9ec500
commit
18b2f76565
@ -12,10 +12,7 @@
|
||||
#
|
||||
# Only produce a release build on x86_64:
|
||||
# $ fedpkg mockbuild --without slowdebug --without fastdebug
|
||||
#
|
||||
# Only produce a debug build on x86_64:
|
||||
# $ fedpkg local --without release
|
||||
#
|
||||
|
||||
# Enable fastdebug builds by default on relevant arches.
|
||||
%bcond_without fastdebug
|
||||
# Enable slowdebug builds by default on relevant arches.
|
||||
@ -59,11 +56,11 @@
|
||||
%global staticlibs_suffix "%{staticlibs_suffix_unquoted}"
|
||||
|
||||
%global debug_warning This package is unoptimised with full debugging. Install only as needed and remove ASAP.
|
||||
%global debug_on with full debugging on
|
||||
%global fastdebug_on with minimal debugging on
|
||||
%global fastdebug_warning This package is optimised with full debugging. Install only as needed and remove ASAP.
|
||||
%global for_fastdebug_on for packages with minimal debugging on
|
||||
%global for_debug for packages with debugging on
|
||||
%global debug_on unoptimised with full debugging on
|
||||
%global fastdebug_on optimised with full debugging on
|
||||
%global for_fastdebug for packages with debugging on and optimisation
|
||||
%global for_debug for packages with debugging on and no optimisation
|
||||
|
||||
%if %{with release}
|
||||
%global include_normal_build 1
|
||||
@ -171,7 +168,7 @@
|
||||
|
||||
# If you disable both builds, then the build fails
|
||||
# Build and test slowdebug first as it provides the best diagnostics
|
||||
%global build_loop %{slowdebug_build} %{fastdebug_build} %{normal_build}
|
||||
%global build_loop %{slowdebug_build} %{fastdebug_build} %{normal_build}
|
||||
|
||||
%if %{include_staticlibs}
|
||||
%global staticlibs_loop %{staticlibs_suffix}
|
||||
@ -185,6 +182,17 @@
|
||||
%global bootstrap_build 1
|
||||
%endif
|
||||
|
||||
%if %{include_staticlibs}
|
||||
# Extra target for producing the static-libraries. Separate from
|
||||
# other targets since this target is configured to use in-tree
|
||||
# AWT dependencies: lcms, libjpeg, libpng, libharfbuzz, giflib
|
||||
# and possibly others
|
||||
%global static_libs_target static-libs-image
|
||||
%else
|
||||
%global static_libs_target %{nil}
|
||||
%endif
|
||||
|
||||
# unlike portables,the rpms have to use static_libs_target very dynamically
|
||||
%if %{bootstrap_build}
|
||||
%global release_targets bootcycle-images docs-zip
|
||||
%else
|
||||
@ -193,14 +201,6 @@
|
||||
# No docs nor bootcycle for debug builds
|
||||
%global debug_targets images
|
||||
|
||||
%if %{include_staticlibs}
|
||||
# Extra target for producing the static-libraries. Separate from
|
||||
# other targets since this target is configured to use in-tree
|
||||
# AWT dependencies: lcms, libjpeg, libpng, libharfbuzz, giflib
|
||||
# and possibly others
|
||||
%global static_libs_target static-libs-image
|
||||
%endif
|
||||
|
||||
|
||||
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
|
||||
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
|
||||
@ -298,7 +298,7 @@
|
||||
%global top_level_dir_name %{origin}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 12
|
||||
%global rpmrelease 2
|
||||
%global rpmrelease 3
|
||||
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
%if %is_system_jdk
|
||||
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
||||
@ -311,7 +311,7 @@
|
||||
# for techpreview, using 1, so slowdebugs can have 0
|
||||
%global priority %( printf '%08d' 1 )
|
||||
%endif
|
||||
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
||||
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
||||
%global javaver %{featurever}
|
||||
|
||||
# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
|
||||
@ -573,7 +573,7 @@ alternatives \\
|
||||
--slave %{_mandir}/man1/jstatd.1$ext jstatd.1$ext \\
|
||||
%{_mandir}/man1/jstatd-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||
--slave %{_mandir}/man1/serialver.1$ext serialver.1$ext \\
|
||||
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1$ext
|
||||
%{_mandir}/man1/serialver-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||
|
||||
for X in %{origin} %{javaver} ; do
|
||||
alternatives \\
|
||||
@ -754,7 +754,7 @@ exit 0
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.cfg
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.fips.cfg
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/management/jmxremote.access
|
||||
# these are config templates, thus not config-noreplace
|
||||
# This is a config template, thus not config-noreplace
|
||||
%config %{etcjavadir -- %{?1}}/conf/management/jmxremote.password.template
|
||||
%config %{etcjavadir -- %{?1}}/conf/sdp/sdp.conf.template
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/management/management.properties
|
||||
@ -777,6 +777,10 @@ exit 0
|
||||
%ghost %{_jvmdir}/jre-%{javaver}-%{origin}
|
||||
%endif
|
||||
%endif
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1820172
|
||||
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Replacement/
|
||||
%ghost %{_jvmdir}/%{sdkdir -- %{?1}}/conf.rpmmoved
|
||||
%ghost %{_jvmdir}/%{sdkdir -- %{?1}}/lib/security.rpmmoved
|
||||
}
|
||||
|
||||
%define files_devel() %{expand:
|
||||
@ -933,7 +937,9 @@ Requires: libXcomposite%{?_isa}
|
||||
Requires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
# for java-X-openjdk package's desktop binding
|
||||
%if 0%{?rhel} >= 8
|
||||
Recommends: gtk3%{?_isa}
|
||||
%endif
|
||||
|
||||
Provides: java-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
||||
@ -1003,9 +1009,9 @@ Provides: java-sdk-%{javaver}%{?1} = %{epoch}:%{version}-%{release}
|
||||
Provides: java-%{javaver}-devel%{?1} = %{epoch}:%{version}-%{release}
|
||||
Provides: java-%{javaver}-%{origin}-devel%{?1} = %{epoch}:%{version}-%{release}
|
||||
%if %is_system_jdk
|
||||
Provides: java-devel-%{origin}%{?1} = %{epoch}:%{version}-%{release}
|
||||
Provides: java-sdk-%{origin}%{?1} = %{epoch}:%{version}-%{release}
|
||||
Provides: java-devel%{?1} = %{epoch}:%{version}-%{release}
|
||||
Provides: java-%{origin}-devel%{?1} = %{epoch}:%{version}-%{release}
|
||||
Provides: java-sdk%{?1} = %{epoch}:%{version}-%{release}
|
||||
%endif
|
||||
}
|
||||
@ -1088,6 +1094,9 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist}
|
||||
|
||||
Epoch: 1
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
# HotSpot code is licensed under GPLv2
|
||||
# JDK library code is licensed under GPLv2 with the Classpath exception
|
||||
@ -1149,7 +1158,7 @@ Source17: nss.fips.cfg.in
|
||||
# NSS via SunPKCS11 Provider (disabled comment
|
||||
# due to memory leak).
|
||||
Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
|
||||
# enable build of speculative store bypass hardened alt-java
|
||||
# RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639)
|
||||
Patch600: rh1750419-redhat_alt_java.patch
|
||||
|
||||
# Ignore AWTError when assistive technologies are loaded
|
||||
@ -1246,6 +1255,9 @@ The %{origin_nice} %{featurever} runtime environment.
|
||||
%if %{include_debug_build}
|
||||
%package slowdebug
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment %{debug_on}
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_rpo -- %{debug_suffix_unquoted}}
|
||||
%description slowdebug
|
||||
@ -1256,7 +1268,9 @@ The %{origin_nice} %{featurever} runtime environment.
|
||||
%if %{include_fastdebug_build}
|
||||
%package fastdebug
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment %{fastdebug_on}
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_rpo -- %{fastdebug_suffix_unquoted}}
|
||||
%description fastdebug
|
||||
@ -1267,6 +1281,9 @@ The %{origin_nice} %{featurever} runtime environment.
|
||||
%if %{include_normal_build}
|
||||
%package headless
|
||||
Summary: %{origin_nice} %{featurever} Headless Runtime Environment
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_headless_rpo %{nil}}
|
||||
|
||||
@ -1277,6 +1294,7 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup
|
||||
%if %{include_debug_build}
|
||||
%package headless-slowdebug
|
||||
Summary: %{origin_nice} %{featurever} Runtime Environment %{debug_on}
|
||||
Group: Development/Languages
|
||||
|
||||
%{java_headless_rpo -- %{debug_suffix_unquoted}}
|
||||
|
||||
@ -1300,6 +1318,9 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup
|
||||
%if %{include_normal_build}
|
||||
%package devel
|
||||
Summary: %{origin_nice} %{featurever} Development Environment
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_devel_rpo %{nil}}
|
||||
|
||||
@ -1310,6 +1331,9 @@ The %{origin_nice} %{featurever} development tools.
|
||||
%if %{include_debug_build}
|
||||
%package devel-slowdebug
|
||||
Summary: %{origin_nice} %{featurever} Development Environment %{debug_on}
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_devel_rpo -- %{debug_suffix_unquoted}}
|
||||
|
||||
@ -1370,6 +1394,9 @@ The %{origin_nice} %{featurever} libraries for static linking.
|
||||
%if %{include_normal_build}
|
||||
%package jmods
|
||||
Summary: JMods for %{origin_nice} %{featurever}
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_jmods_rpo %{nil}}
|
||||
|
||||
@ -1380,6 +1407,9 @@ The JMods for %{origin_nice} %{featurever}.
|
||||
%if %{include_debug_build}
|
||||
%package jmods-slowdebug
|
||||
Summary: JMods for %{origin_nice} %{featurever} %{debug_on}
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_jmods_rpo -- %{debug_suffix_unquoted}}
|
||||
|
||||
@ -1400,10 +1430,12 @@ The JMods for %{origin_nice} %{featurever}.
|
||||
%{fastdebug_warning}
|
||||
%endif
|
||||
|
||||
|
||||
%if %{include_normal_build}
|
||||
%package demo
|
||||
Summary: %{origin_nice} %{featurever} Demos
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_demo_rpo %{nil}}
|
||||
|
||||
@ -1414,6 +1446,9 @@ The %{origin_nice} %{featurever} demos.
|
||||
%if %{include_debug_build}
|
||||
%package demo-slowdebug
|
||||
Summary: %{origin_nice} %{featurever} Demos %{debug_on}
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_demo_rpo -- %{debug_suffix_unquoted}}
|
||||
|
||||
@ -1437,6 +1472,9 @@ The %{origin_nice} %{featurever} demos.
|
||||
%if %{include_normal_build}
|
||||
%package src
|
||||
Summary: %{origin_nice} %{featurever} Source Bundle
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_src_rpo %{nil}}
|
||||
|
||||
@ -1448,6 +1486,9 @@ class library source code for use by IDE indexers and debuggers.
|
||||
%if %{include_debug_build}
|
||||
%package src-slowdebug
|
||||
Summary: %{origin_nice} %{featurever} Source Bundle %{for_debug}
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Development/Languages
|
||||
%endif
|
||||
|
||||
%{java_src_rpo -- %{debug_suffix_unquoted}}
|
||||
|
||||
@ -1468,10 +1509,12 @@ The %{compatiblename}-src-fastdebug sub-package contains the complete %{origin_n
|
||||
class library source code for use by IDE indexers and debuggers, %{for_fastdebug}.
|
||||
%endif
|
||||
|
||||
|
||||
%if %{include_normal_build}
|
||||
%package javadoc
|
||||
Summary: %{origin_nice} %{featurever} API documentation
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Documentation
|
||||
%endif
|
||||
Requires: javapackages-filesystem
|
||||
Obsoletes: javadoc-slowdebug < 1:13.0.0.33-1.rolling
|
||||
|
||||
@ -1484,6 +1527,9 @@ The %{origin_nice} %{featurever} API documentation.
|
||||
%if %{include_normal_build}
|
||||
%package javadoc-zip
|
||||
Summary: %{origin_nice} %{featurever} API documentation compressed in a single archive
|
||||
%if 0%{?rhel} <= 8
|
||||
Group: Documentation
|
||||
%endif
|
||||
Requires: javapackages-filesystem
|
||||
Obsoletes: javadoc-zip-slowdebug < 1:13.0.0.33-1.rolling
|
||||
|
||||
@ -1561,7 +1607,6 @@ cp -r tapset tapset%{debug_suffix}
|
||||
cp -r tapset tapset%{fastdebug_suffix}
|
||||
%endif
|
||||
|
||||
|
||||
for suffix in %{build_loop} ; do
|
||||
for file in "tapset"$suffix/*.in; do
|
||||
OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:%{version}-%{release}.%{_arch}.stp:g"`
|
||||
@ -1634,9 +1679,11 @@ export EXTRA_CFLAGS
|
||||
for suffix in %{build_loop} ; do
|
||||
if [ "x$suffix" = "x" ] ; then
|
||||
debugbuild=release
|
||||
debug_symbols=internal
|
||||
else
|
||||
# change --something to something
|
||||
debugbuild=`echo $suffix | sed "s/-//g"`
|
||||
debug_symbols=internal
|
||||
fi
|
||||
|
||||
for loop in %{main_suffix} %{staticlibs_loop} ; do
|
||||
@ -1701,7 +1748,7 @@ bash ${top_dir_abs_src_path}/configure \
|
||||
--with-vendor-vm-bug-url="%{bugs}" \
|
||||
--with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
|
||||
--with-debug-level=$debugbuild \
|
||||
--with-native-debug-symbols=internal \
|
||||
--with-native-debug-symbols=$debug_symbols \
|
||||
--enable-sysconf-nss \
|
||||
--enable-unlimited-crypto \
|
||||
--with-zlib=system \
|
||||
@ -1728,7 +1775,7 @@ make \
|
||||
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
|
||||
$maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
|
||||
|
||||
popd >& /dev/null
|
||||
popd
|
||||
|
||||
# Restore original source tree if we modified it by removing full in-tree sources
|
||||
if [ -d %{top_level_dir_name_backup} ] ; then
|
||||
@ -1819,8 +1866,9 @@ readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
|
||||
readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
|
||||
%endif
|
||||
|
||||
so_suffix="so"
|
||||
# Check debug symbols are present and can identify code
|
||||
find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
|
||||
find "$JAVA_HOME" -iname "*.$so_suffix" -print0 | while read -d $'\0' lib
|
||||
do
|
||||
if [ -f "$lib" ] ; then
|
||||
echo "Testing $lib for debug symbols"
|
||||
@ -1888,15 +1936,16 @@ quit
|
||||
end
|
||||
run -version
|
||||
EOF
|
||||
|
||||
%if 0%{?fedora} > 0
|
||||
# This fails on s390x for some reason. Disable for now. See:
|
||||
# https://koji.fedoraproject.org/koji/taskinfo?taskID=41499227
|
||||
%ifnarch s390x
|
||||
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# Check src.zip has all sources. See RHBZ#1130490
|
||||
jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
|
||||
$JAVA_HOME/bin/jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
|
||||
|
||||
# Check class files include useful debugging information
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
|
||||
@ -2277,6 +2326,9 @@ cjc.mainProgram(args)
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 26 2021 Jiri Vanek <jvanek@redhat.com> - 1:17.0.1.0.12-3.rolling
|
||||
- Minor cosmetic improvements to make spec more comparable between variants
|
||||
|
||||
* Thu Oct 21 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.1.0.12-2.rolling
|
||||
- Update tapsets from IcedTea 6.x repository with fix for JDK-8015774 changes (_heap->_heaps) and @JAVA_SPEC_VER@
|
||||
- Update icedtea_sync.sh with a VCS mode that retrieves sources from a Mercurial repository
|
||||
|
||||
Loading…
Reference in New Issue
Block a user