Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2019-01-15 09:16:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Tue Jan 15 09:16:53 2019 rev:59 rq:664887 version:4.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2019-01-10 15:23:46.702303320 +0100 +++ /work/SRC/openSUSE:Factory/.octave.new.28833/octave.changes 2019-01-15 09:16:53.630206551 +0100 @@ -1,0 +2,7 @@ +Thu Jan 10 23:57:29 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Only set -fpie for octave executables, as LDFLAGS is set as link flag + in mkoctfile as default flags, leading to failing module builds. + Add octave_tools_pie.patch + +------------------------------------------------------------------- New: ---- octave_tools_pie.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.EZnnQq/_old 2019-01-15 09:16:54.578205668 +0100 +++ /var/tmp/diff_new_pack.EZnnQq/_new 2019-01-15 09:16:54.582205664 +0100 @@ -70,7 +70,14 @@ Source: https://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz Source2: octave.pc.in Source3: octave.macros +# PATCH-FIX-OPENSUSE +Patch0: octave_tools_pie.patch BuildRequires: arpack-ng-devel +# Required for Patch0 +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +# BuildRequires: bison BuildRequires: dejagnu BuildRequires: fftw3-threads-devel @@ -111,11 +118,6 @@ BuildRequires: hicolor-icon-theme BuildRequires: update-desktop-files %if %{with qt5gui} -# Required for Patch0 -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -# BuildRequires: libqscintilla_qt5-devel BuildRequires: libqt5-linguist BuildRequires: libqt5-qttools @@ -133,6 +135,7 @@ BuildRequires: qscintilla-devel %endif Obsoletes: octave-gui < 4.0 +Provides: octave-gui = %{version} %endif # Sound IO build requires %if %{with sound} @@ -225,23 +228,26 @@ %prep %setup -q -n %{name}-%{src_ver} +%if 0%{?suse_version} > 1315 +# autoconf in Leap 42.x is to old, so we just build without -pie there +%patch0 -p1 +%endif # define octave_blas macros sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/openblas/g' %{SOURCE3} %build - -export CFLAGS="%{optflags} -fPIE" -export CXXFLAGS="%{optflags} -fPIE" -export FFLAGS="%{optflags} -fPIE" -export LDFLAGS="-pie" +%if 0%{?suse_version} > 1315 +# rebuild makefiles after Patch0 +autoreconf -i -s -f +%endif %if 0%{?suse_version} > 1500 export QCOLLECTIONGENERATOR=qhelpgenerator-qt5 %endif %configure \ --libexecdir=%{_libdir} \ - %{?with_gui: --enable-gui} \ - %{!?with_gui: --disable-gui} \ + %{?with_gui: --with-qt} \ + %{!?with_gui: --without-qt} \ %{?with_jit: --enable-jit} \ %{!?with_java: --disable-java} \ --with-blas=openblas \ ++++++ octave_tools_pie.patch ++++++ --- octave-4.4.1/src/module.mk_orig 2019-01-11 00:52:01.913918346 +0100 +++ octave-4.4.1/src/module.mk 2019-01-11 18:44:13.272208383 +0100 @@ -68,6 +68,7 @@ %canon_reldir%_octave_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_LINK_OPTS) \ + -pie \ $(WARN_LDFLAGS) if AMCOND_BUILD_QT_GUI @@ -92,6 +93,7 @@ %canon_reldir%_octave_cli_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_LINK_OPTS) \ + -pie \ $(WARN_LDFLAGS) %canon_reldir%_octave_cli_CPPFLAGS = \ @@ -121,6 +123,7 @@ %canon_reldir%_octave_gui_LDFLAGS = \ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_GUI_LINK_OPTS) \ + -pie \ $(WARN_LDFLAGS) %canon_reldir%_octave_gui_CXXFLAGS = \ @@ -143,8 +146,14 @@ $(AM_CXXFLAGS) \ $(WARN_CXXFLAGS) +%canon_reldir%_mkoctfile_LDFLAGS = \ + -pie + %canon_reldir%_octave_config_SOURCES = +%canon_reldir%_octave_config_LDFLAGS = \ + -pie + nodist_%canon_reldir%_octave_config_SOURCES = %reldir%/octave-config.cc %canon_reldir%_octave_config_LDADD = \
