From cc2d407a76274092b4ea1208c559e5065911cbc2dc167dc966caf7ca0fe045f8 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 11 Jul 2016 17:29:16 +0000 Subject: [PATCH] - Remove PIE from macro - Remove PIE from macros OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=255 --- cmake-gui.changes | 5 +++++ cmake-gui.spec | 3 --- cmake.changes | 5 +++++ cmake.macros | 12 ++++++------ cmake.spec | 3 --- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index e16585c..e721ef0 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 11 17:28:35 UTC 2016 - mpluskal@suse.com + +- Remove PIE from macro + ------------------------------------------------------------------- Sun Jul 10 08:18:57 UTC 2016 - foss@grueninger.de diff --git a/cmake-gui.spec b/cmake-gui.spec index a4d1ffc..871b424 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -81,9 +81,6 @@ echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURC %build EXTRA_FLAGS="--qt-gui" -export CXXFLAGS="%{optflags} -fPIE" -export CFLAGS="%{optflags} -fPIE" -export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" # FIXME: you should use the %%configure macro ./configure \ --prefix=%{_prefix} \ diff --git a/cmake.changes b/cmake.changes index 08f0e86..9cc6b89 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 11 17:28:01 UTC 2016 - mpluskal@suse.com + +- Remove PIE from macros + ------------------------------------------------------------------- Sun Jul 10 08:13:00 UTC 2016 - foss@grueninger.de diff --git a/cmake.macros b/cmake.macros index e74411c..97f7cbc 100644 --- a/cmake.macros +++ b/cmake.macros @@ -18,12 +18,12 @@ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ -DCMAKE_BUILD_TYPE=None \\\ - -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -fPIE -DNDEBUG" \\\ - -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -fPIE -DNDEBUG" \\\ - -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -fPIE -DNDEBUG" \\\ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \\\ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \\\ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \\\ + -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ + -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\ + -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \\\ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ %if "%{?_lib}" == "lib64" \ -DLIB_SUFFIX=64 \\\ %endif \ diff --git a/cmake.spec b/cmake.spec index 36b8b09..2ae52ba 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,9 +72,6 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU %patch6 -p1 %build -export CXXFLAGS="%{optflags} -fPIE" -export CFLAGS="%{optflags} -fPIE" -export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" # FIXME: you should use the %%configure macro ./configure \ --prefix=%{_prefix} \