This commit is contained in:
parent
3469895bcf
commit
5f68fa48a8
@ -129,6 +129,12 @@
|
|||||||
%if 0%{?__isa_bits}
|
%if 0%{?__isa_bits}
|
||||||
%global bits %{__isa_bits}
|
%global bits %{__isa_bits}
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?suse_version} > 1500 && !0%{?sle_version}
|
||||||
|
%global with_shenandoah 1
|
||||||
|
%else
|
||||||
|
%global with_shenandoah 0
|
||||||
|
%endif
|
||||||
|
%global NSS_LIBDIR %(pkg-config --variable=libdir nss)
|
||||||
%bcond_without bootstrap
|
%bcond_without bootstrap
|
||||||
%bcond_with zero
|
%bcond_with zero
|
||||||
# Turn on/off some features depending on openSUSE version
|
# Turn on/off some features depending on openSUSE version
|
||||||
@ -141,12 +147,6 @@
|
|||||||
%else
|
%else
|
||||||
%global with_systemtap 0
|
%global with_systemtap 0
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version} > 1500 && !0%{?sle_version}
|
|
||||||
%global with_shenandoah 1
|
|
||||||
%else
|
|
||||||
%global with_shenandoah 0
|
|
||||||
%endif
|
|
||||||
%global NSS_LIBDIR %(pkg-config --variable=libdir nss)
|
|
||||||
%if %{with_systemtap}
|
%if %{with_systemtap}
|
||||||
# Where to install systemtap tapset (links)
|
# Where to install systemtap tapset (links)
|
||||||
# We would like these to be in a package specific subdir,
|
# We would like these to be in a package specific subdir,
|
||||||
@ -420,7 +420,7 @@ this package unless you really need to.
|
|||||||
|
|
||||||
# Setup nss.fips.cfg
|
# Setup nss.fips.cfg
|
||||||
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
|
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg
|
||||||
sed -i -e "s:@NSS_SECMOD@:/etc/pki/nssdb:g" nss.fips.cfg
|
sed -i -e "s:@NSS_SECMOD@:%{_sysconfdir}/pki/nssdb:g" nss.fips.cfg
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%define _lto_cflags %{nil}
|
%define _lto_cflags %{nil}
|
||||||
@ -520,7 +520,7 @@ sh autogen.sh
|
|||||||
%endif
|
%endif
|
||||||
--with-nashorn-src-zip=%{SOURCE10}
|
--with-nashorn-src-zip=%{SOURCE10}
|
||||||
|
|
||||||
make patch %{?_smp_mflags}
|
%make_build patch
|
||||||
|
|
||||||
patch -p0 -i %{PATCH2}
|
patch -p0 -i %{PATCH2}
|
||||||
patch -p0 -i %{PATCH3}
|
patch -p0 -i %{PATCH3}
|
||||||
@ -549,7 +549,7 @@ patch -p0 -i %{PATCH5001}
|
|||||||
bash ./autogen.sh
|
bash ./autogen.sh
|
||||||
)
|
)
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
export JAVA_HOME=$(pwd)/%{buildoutputdir}images/j2sdk-image
|
export JAVA_HOME=$(pwd)/%{buildoutputdir}images/j2sdk-image
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user