forked from pool/java-1_8_0-openjdk
This commit is contained in:
parent
987263d4f6
commit
530283a4ac
@ -444,6 +444,9 @@ Tue Jul 26 05:57:42 UTC 2016 - fstrba@suse.com
|
|||||||
- Modified patch:
|
- Modified patch:
|
||||||
* java-1_8_0-openjdk-gcc6.patch
|
* java-1_8_0-openjdk-gcc6.patch
|
||||||
- Rediff to new context
|
- Rediff to new context
|
||||||
|
- Remove hacks to make build on ix86, since it seems they are not
|
||||||
|
needed anymore
|
||||||
|
- Remove special flags for gcc6, since they are handled upstream
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 7 14:41:06 UTC 2016 - fstrba@suse.com
|
Thu Jul 7 14:41:06 UTC 2016 - fstrba@suse.com
|
||||||
|
@ -432,9 +432,6 @@ export ZLIB_LIBS="-L/%{_lib} -lz"
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//')
|
CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//')
|
||||||
%if 0%{?suse_version} >= 1330
|
|
||||||
CFLAGS+=" -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse"
|
|
||||||
%endif
|
|
||||||
export CFLAGS
|
export CFLAGS
|
||||||
export CXXFLAGS=${CFLAGS}
|
export CXXFLAGS=${CFLAGS}
|
||||||
%if %{with_sunec}
|
%if %{with_sunec}
|
||||||
@ -504,15 +501,7 @@ patch -p0 -i %{PATCH2001}
|
|||||||
bash ./autogen.sh
|
bash ./autogen.sh
|
||||||
)
|
)
|
||||||
|
|
||||||
%if 0%{?suse_version} >= 1330
|
|
||||||
%ifarch %{ix86}
|
|
||||||
for i in {1..10}; do make %{?_smp_mflags} && break; done
|
|
||||||
%else
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
%endif
|
|
||||||
%else
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
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