Returned accidently removed %global miscinstalloutputdir install
This commit is contained in:
parent
20cc3c9117
commit
745aa05a47
@ -445,6 +445,7 @@
|
|||||||
# output dir stub
|
# output dir stub
|
||||||
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
|
%define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
|
||||||
%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
|
%define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
|
||||||
|
%global miscinstalloutputdir install
|
||||||
%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
|
%define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
|
||||||
# we can copy the javadoc to not arched dir, or make it not noarch
|
# we can copy the javadoc to not arched dir, or make it not noarch
|
||||||
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
|
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
|
||||||
@ -477,7 +478,6 @@
|
|||||||
%define jdkportablearchiveForFiles() %(echo %{jdkportablearchive -- ""})
|
%define jdkportablearchiveForFiles() %(echo %{jdkportablearchive -- ""})
|
||||||
%define jdkportablesourcesarchiveForFiles() %(echo %{jdkportablesourcesarchive -- ""})
|
%define jdkportablesourcesarchiveForFiles() %(echo %{jdkportablesourcesarchive -- ""})
|
||||||
%define staticlibsportablearchiveForFiles() %(echo %{staticlibsportablearchive -- ""})
|
%define staticlibsportablearchiveForFiles() %(echo %{staticlibsportablearchive -- ""})
|
||||||
%define jdkportablesourcesnameForFiles() %(echo %{jdkportablesourcesname -- ""})
|
|
||||||
|
|
||||||
#################################################################
|
#################################################################
|
||||||
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
|
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
|
||||||
@ -720,11 +720,7 @@ Patch1001: fips-17u-%{fipsver}.patch
|
|||||||
#
|
#
|
||||||
#############################################
|
#############################################
|
||||||
|
|
||||||
#############################################
|
# Currently empty
|
||||||
#
|
|
||||||
# OpenJDK patches targetted for 17.0.6
|
|
||||||
#
|
|
||||||
#############################################
|
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -1176,7 +1172,7 @@ function buildjdk() {
|
|||||||
|
|
||||||
cat spec.gmk
|
cat spec.gmk
|
||||||
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
|
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
|
||||||
scl enable devtoolset-%{dtsversion} -- make \
|
scl enable devtoolset-%{dtsversion} -- make \
|
||||||
%else
|
%else
|
||||||
make \
|
make \
|
||||||
%endif
|
%endif
|
||||||
|
Loading…
Reference in New Issue
Block a user