forked from pool/cmake
- Remove PIE from macro
- Remove PIE from macros OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=255
This commit is contained in:
parent
ebbf5c10a8
commit
cc2d407a76
@ -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
|
Sun Jul 10 08:18:57 UTC 2016 - foss@grueninger.de
|
||||||
|
|
||||||
|
@ -81,9 +81,6 @@ echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURC
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
EXTRA_FLAGS="--qt-gui"
|
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
|
# FIXME: you should use the %%configure macro
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
|
@ -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
|
Sun Jul 10 08:13:00 UTC 2016 - foss@grueninger.de
|
||||||
|
|
||||||
|
12
cmake.macros
12
cmake.macros
@ -18,12 +18,12 @@
|
|||||||
-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
|
-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
|
||||||
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
|
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
|
||||||
-DCMAKE_BUILD_TYPE=None \\\
|
-DCMAKE_BUILD_TYPE=None \\\
|
||||||
-DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -fPIE -DNDEBUG" \\\
|
-DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\
|
||||||
-DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -fPIE -DNDEBUG" \\\
|
-DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\
|
||||||
-DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -fPIE -DNDEBUG" \\\
|
-DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \\\
|
||||||
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \\\
|
-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 -pie" \\\
|
-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 -pie" \\\
|
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\
|
||||||
%if "%{?_lib}" == "lib64" \
|
%if "%{?_lib}" == "lib64" \
|
||||||
-DLIB_SUFFIX=64 \\\
|
-DLIB_SUFFIX=64 \\\
|
||||||
%endif \
|
%endif \
|
||||||
|
@ -72,9 +72,6 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU
|
|||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
|
|
||||||
%build
|
%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
|
# FIXME: you should use the %%configure macro
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
|
Loading…
Reference in New Issue
Block a user