commit d1a9fc6bf420bcd64035a4c3ff500ca756d23a6a
Author: Jan Palus <[email protected]>
Date: Tue Feb 26 00:31:49 2019 +0100
rely on qmake's CXXFLAGS; rel 2
passing CXXFLAGS in environment overrides flags added by qt completely
resulting in build failure due to missing -fPIC. while it's possible to
add additional flags by means of:
qmake 'QMAKE_CFLAGS+=${QMAKE_CFLAGS}'
they're always prepended, never appended so qmake's flags take
precedence anyway. since build time %{rpmcxxflags} are already part of
qmake's flags let's just rely on them.
highlight.spec | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/highlight.spec b/highlight.spec
index 61d90fe..2bd9809 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -6,7 +6,7 @@ Summary: A source code converter to HTML, XHTML, RTF,
TeX, LaTeX, XSL-FO, and XM
Summary(pl.UTF-8): Konwerter kodu źródłowego do formatów HTML, XHTML, RTF,
TeX, LaTeX, XSL-FO oraz XML
Name: highlight
Version: 3.49
-Release: 1
+Release: 2
License: GPL v3
Group: Applications/Publishing
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
@@ -79,8 +79,7 @@ RTF, TeX, LaTeX, XSL-FO, and XML.
CXXFLAGS="%{rpmcxxflags} -std=c++11"
%{__make} gui \
QMAKE=qmake-qt5 \
- CXX="%{__cxx}" \
- CXXFLAGS="%{rpmcxxflags} -std=c++11 "'$(DEFINES)'
+ CXX="%{__cxx}"
%{?with_apidocs:%{__make} apidocs}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/highlight.git/commitdiff/d1a9fc6bf420bcd64035a4c3ff500ca756d23a6a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
