commit java-1_7_0-openjdk for openSUSE:Factory
Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2015-10-22 12:57:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes 2015-07-27 09:08:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes 2015-10-22 12:57:24.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 29 10:07:34 UTC 2015 - fstrba@suse.com + +- Add option to build Sun Elliptical Curve Crypto provider + * Enable for openSUSE:Factory +- Added patch: + * icedtea-2.6.1-sunec.patch + - make it easier to link the SUNEC Crypto provider + +------------------------------------------------------------------- java-1_7_0-openjdk.changes: same change New: ---- icedtea-2.6.1-sunec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.RUW5lw/_old 2015-10-22 12:57:26.000000000 +0200 +++ /var/tmp/diff_new_pack.RUW5lw/_new 2015-10-22 12:57:26.000000000 +0200 @@ -128,6 +128,15 @@ %global tapsetroot %{_datadir}/systemtap %global tapsetdir %{tapsetroot}/tapset/%{_build_cpu} %endif +%if 0%{?suse_version} >= 1330 +%if %{with bootstrap} +%global with_sunec 0 +%else +%global with_sunec 1 +%endif +%else +%global with_sunec 0 +%endif %if %{with bootstrap} %define _unpackaged_files_terminate_build 0 BuildRequires: ecj-bootstrap @@ -191,6 +200,7 @@ # SUSE patches - from java-1_6_0-openjdk package Patch1000: java-1_7_0-openjdk-suse-desktop-files.patch Patch1001: openjdk-7-src-b147-no-return-in-nonvoid.patch +Patch1002: icedtea-2.6.1-sunec.patch # PATCH-FIX-OPENSUSE: limit the maximum heap size of a rewriter - it fails on some servers Patch1003: java-1_7_0-openjdk-add-memory-limit.patch Patch1004: java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch @@ -487,6 +497,7 @@ cp %{SOURCE4} . %patch1000 -p1 +%patch1002 -p1 %patch1003 -p1 %build @@ -528,8 +539,15 @@ export CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//') export CXXFLAGS=${CFLAGS} +%if %{with_sunec} +export NSS_SOFTOKN_CFLAGS="`pkg-config --cflags nss` -I`pwd`" +export NSS_SOFTOKN_LIBS="-L%{_libdir} -lnssdbm3 -lsoftokn3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lfreebl -L%{_libdir}/nspr -lplds4 -lplc4 -lnspr4" +%endif sh autogen.sh %configure \ +%if %{with_sunec} + --enable-sunec \ +%endif %if %{with bootstrap} --enable-bootstrap \ --enable-bootstrap-tools \ ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.RUW5lw/_old 2015-10-22 12:57:26.000000000 +0200 +++ /var/tmp/diff_new_pack.RUW5lw/_new 2015-10-22 12:57:26.000000000 +0200 @@ -128,6 +128,15 @@ %global tapsetroot %{_datadir}/systemtap %global tapsetdir %{tapsetroot}/tapset/%{_build_cpu} %endif +%if 0%{?suse_version} >= 1330 +%if %{with bootstrap} +%global with_sunec 0 +%else +%global with_sunec 1 +%endif +%else +%global with_sunec 0 +%endif %if %{with bootstrap} %define _unpackaged_files_terminate_build 0 BuildRequires: ecj-bootstrap @@ -191,6 +200,7 @@ # SUSE patches - from java-1_6_0-openjdk package Patch1000: java-1_7_0-openjdk-suse-desktop-files.patch Patch1001: openjdk-7-src-b147-no-return-in-nonvoid.patch +Patch1002: icedtea-2.6.1-sunec.patch # PATCH-FIX-OPENSUSE: limit the maximum heap size of a rewriter - it fails on some servers Patch1003: java-1_7_0-openjdk-add-memory-limit.patch Patch1004: java-1_7_0-openjdk-zero-annotate-aborting-functions-zero.patch @@ -487,6 +497,7 @@ cp %{SOURCE4} . %patch1000 -p1 +%patch1002 -p1 %patch1003 -p1 %build @@ -528,8 +539,15 @@ export CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//') export CXXFLAGS=${CFLAGS} +%if %{with_sunec} +export NSS_SOFTOKN_CFLAGS="`pkg-config --cflags nss` -I`pwd`" +export NSS_SOFTOKN_LIBS="-L%{_libdir} -lnssdbm3 -lsoftokn3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lfreebl -L%{_libdir}/nspr -lplds4 -lplc4 -lnspr4" +%endif sh autogen.sh %configure \ +%if %{with_sunec} + --enable-sunec \ +%endif %if %{with bootstrap} --enable-bootstrap \ --enable-bootstrap-tools \ ++++++ icedtea-2.6.1-sunec.patch ++++++ --- icedtea-2.6.1/acinclude.m4 2015-07-21 12:37:00.711650445 +0200 +++ icedtea-2.6.1/acinclude.m4 2015-09-24 18:38:03.471762715 +0200 @@ -2711,7 +2711,7 @@ PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no]) if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS; - SUNEC_LIBS="$NSS_LIBS -lfreebl"; + SUNEC_LIBS=$NSS_SOFTOKN_LIBS; elif test "x${NSS_JAVA_FOUND}" = "xyes"; then SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS"; SUNEC_LIBS=$NSS_JAVA_LIBS; --- icedtea-2.6.1/configure 2015-07-21 12:37:14.027418338 +0200 +++ icedtea-2.6.1/configure 2015-09-24 18:37:54.731957804 +0200 @@ -9042,7 +9042,7 @@ fi if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS; - SUNEC_LIBS="$NSS_LIBS -lfreebl"; + SUNEC_LIBS=$NSS_SOFTOKN_LIBS; elif test "x${NSS_JAVA_FOUND}" = "xyes"; then SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS"; SUNEC_LIBS=$NSS_JAVA_LIBS;
participants (1)
-
root@hilbert.suse.de