rpm/doxygen
SHA256
1
0
Fork 0
forked from pool/doxygen
Code Pull Requests Activity

Accepting request 360669 from home:elvigia:branches:devel:tools

Browse Source 
- Do not link with -pie if we are not compiling with -fPIE

- Build against QT5 in newer products
- Do not link with -pie as we are not compiling with -fPIE

OBS-URL: https://build.opensuse.org/request/show/360669
OBS-URL: https://build.opensuse.org/package/show/devel:tools/doxygen?expand=0&rev=102
This commit is contained in:
Martin Pluskal 2016-02-21 06:51:20 +00:00 committed by Git OBS Bridge
parent a80cd8d774
commit 4d48eba7bb
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doxygen.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Feb 21 00:48:27 UTC 2016 - crrodriguez@opensuse.org
- Do not link with -pie if we are not compiling with -fPIE
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 5 07:31:22 UTC 2016 - foss@grueninger.de Tue Jan 5 07:31:22 UTC 2016 - foss@grueninger.de

6
doxygen.spec
View File

@ -65,9 +65,9 @@ export CXXFLAGS="%{optflags} -fPIC"
-Dbuild_xmlparser=ON \ -Dbuild_xmlparser=ON \
-Dbuild_search=OFF \ -Dbuild_search=OFF \
-Dbuild_wizard=OFF \ -Dbuild_wizard=OFF \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install

6
doxywizard.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Feb 21 00:41:56 UTC 2016 - crrodriguez@opensuse.org
- Build against QT5 in newer products
- Do not link with -pie as we are not compiling with -fPIE
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 5 09:35:48 UTC 2016 - pgajdos@suse.com Tue Jan 5 09:35:48 UTC 2016 - pgajdos@suse.com

14
doxywizard.spec
View File

@ -32,7 +32,15 @@ BuildRequires: cmake >= 2.8.12
BuildRequires: flex BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: python-xml
%if 0%{?suse_version} < 1320
BuildRequires: libqt4-devel >= 4.3 BuildRequires: libqt4-devel >= 4.3
%else
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
%endif
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
Requires: doxygen = %{version} Requires: doxygen = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -55,9 +63,9 @@ export CFLAGS="%{optflags} -fPIC"
export CXXFLAGS="%{optflags} -fPIC" export CXXFLAGS="%{optflags} -fPIC"
%cmake \ %cmake \
-Dbuild_wizard=ON \ -Dbuild_wizard=ON \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,relro,-z,now"
make %{?_smp_mflags} make %{?_smp_mflags}
%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 %if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315