Hello community, here is the log from the commit of package swig for openSUSE:Factory checked in at 2016-05-26 23:53:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swig (Old) and /work/SRC/openSUSE:Factory/.swig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swig" Changes: -------- --- /work/SRC/openSUSE:Factory/swig/swig.changes 2016-02-12 11:21:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.swig.new/swig.changes 2016-05-26 23:53:40.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 23 15:19:08 UTC 2016 - [email protected] + +- Add disabled build conditional for ocaml support (fate#320836) +- Add swig-ocaml-int64.patch (ocaml PR#6517, fate#320836) + +------------------------------------------------------------------- @@ -139,0 +146,5 @@ + +------------------------------------------------------------------- +Mon Mar 10 01:00:30 CET 2014 - [email protected] + +- set CCSHARED to "-fPIC" on s390/s390x New: ---- swig-ocaml-int64.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swig.spec ++++++ --- /var/tmp/diff_new_pack.dcF0rF/_old 2016-05-26 23:53:41.000000000 +0200 +++ /var/tmp/diff_new_pack.dcF0rF/_new 2016-05-26 23:53:41.000000000 +0200 @@ -16,6 +16,8 @@ # +%bcond_with swig_ocaml + Name: swig Version: 3.0.8 Release: 0 @@ -27,11 +29,18 @@ Source1: %{name}.rpmlintrc Patch1: swig308-Fix-li_boost_array-test.patch Patch2: swig308-isfinite.diff +Patch3: swig-ocaml-int64.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel BuildRequires: gcc-c++ BuildRequires: libtool +%if %{with swig_ocaml} +BuildRequires: ncurses-devel +BuildRequires: ocaml +BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-findlib +%endif BuildRequires: pcre-devel BuildRequires: perl BuildRequires: python-devel @@ -122,10 +131,18 @@ %setup -q %patch1 -p1 %patch2 +%patch3 -p1 %build +%ifarch s390 s390x +export CCSHARED="-fPIC" +%endif ./autogen.sh -%configure --disable-ccache +%configure \ +%if %{without swig_ocaml} + --without-ocaml \ +%endif + --disable-ccache make %{?_smp_mflags} %check ++++++ swig-ocaml-int64.patch ++++++ ocaml pr#6517 --- Lib/ocaml/ocamldec.swg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/Lib/ocaml/ocamldec.swg +++ b/Lib/ocaml/ocamldec.swg @@ -101,9 +101,9 @@ SWIGEXT { #ifndef ARCH_ALIGN_INT64 -#define SWIG_Int64_val(v) (*((int64 *) SWIG_Data_custom_val(v))) +#define SWIG_Int64_val(v) (*((int64_t *) SWIG_Data_custom_val(v))) #else -CAMLextern int64 Int64_val(caml_value_t v); +CAMLextern int64_t Int64_val(caml_value_t v); #define SWIG_Int64_val(v) Int64_val(v) #endif
