[packages/qt4] - cleanup CXXFLAGS pollution in install - rel 24

baggins baggins at pld-linux.org
Mon Sep 16 23:02:50 CEST 2019


commit bff0e408472134dca06463eaa69f6930f0b408ef
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 16 22:31:47 2019 +0200

    - cleanup CXXFLAGS pollution in install
    - rel 24

 qt4.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/qt4.spec b/qt4.spec
index 3054d68..7a124bc 100644
--- a/qt4.spec
+++ b/qt4.spec
@@ -63,7 +63,7 @@ Summary(pl.UTF-8):	Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt4
 Version:	4.8.7
-Release:	23.1
+Release:	24
 License:	LGPL v2.1 or GPL v3.0
 Group:		X11/Libraries
 Source0:	http://download.qt-project.org/official_releases/qt/4.8/%{version}/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -1748,6 +1748,9 @@ echo '#QT_GRAPHICSSYSTEM=raster' > $RPM_BUILD_ROOT/etc/env.d/QT_GRAPHICSSYSTEM
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
+# this is only needed to build the library itself and breaks other build that use it
+%{__sed} -i -e 's|-std=gnu++98||g' $RPM_BUILD_ROOT%{_datadir}/qt4/mkspecs/common/g++-base.conf
+
 # for qt-creator sth is messed up in the Makefile, nothing for make install
 install bin/qdoc3 $RPM_BUILD_ROOT%{_qtdir}/bin/qdoc3
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/bff0e408472134dca06463eaa69f6930f0b408ef



More information about the pld-cvs-commit mailing list