Attachment 871978 Details for Bug 1074041 – Fix QMAKE_STRIP handling

[patch] Fix QMAKE_STRIP handling

Fix-QMAKESTRIP-handling.patch (text/plain), 3.47 KB, created by Ville Skyttä on 2014-03-07 18:04:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-07 18:04:25 UTC

Size: 3.47 KB

patch

obsolete

>From 0bec7eb163e1e8fdc942775e0725dbe471c8449f Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Fri, 7 Mar 2014 20:02:10 +0200
>Subject: [PATCH] Fix QMAKE_STRIP handling
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1074041
>---
> qt-everywhere-opensource-src-4.8.5-nostrip.patch | 14 ++++++++++++++
> qt.spec                                          | 17 +++++++++--------
> 2 files changed, 23 insertions(+), 8 deletions(-)
> create mode 100644 qt-everywhere-opensource-src-4.8.5-nostrip.patch
>
>diff --git a/qt-everywhere-opensource-src-4.8.5-nostrip.patch b/qt-everywhere-opensource-src-4.8.5-nostrip.patch
>new file mode 100644
>index 0000000..01512b0
>--- /dev/null
>+++ b/qt-everywhere-opensource-src-4.8.5-nostrip.patch
>@@ -0,0 +1,14 @@
>+diff -up qt-everywhere-opensource-src-4.8.5/mkspecs/common/linux.conf~ qt-everywhere-opensource-src-4.8.5/mkspecs/common/linux.conf
>+--- qt-everywhere-opensource-src-4.8.5/mkspecs/common/linux.conf~	2013-06-07 08:17:00.000000000 +0300
>++++ qt-everywhere-opensource-src-4.8.5/mkspecs/common/linux.conf	2014-03-07 19:50:10.459040877 +0200
>+@@ -57,8 +57,8 @@ QMAKE_COPY_DIR        = $(COPY) -r
>+ QMAKE_MOVE            = mv -f
>+ QMAKE_DEL_FILE        = rm -f
>+ QMAKE_DEL_DIR         = rmdir
>+-QMAKE_STRIP           = strip
>+-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
>++QMAKE_STRIP           =
>++QMAKE_STRIPFLAGS_LIB +=
>+ QMAKE_CHK_DIR_EXISTS  = test -d
>+ QMAKE_MKDIR           = mkdir -p
>+ QMAKE_INSTALL_FILE    = install -m 644 -p
>diff --git a/qt.spec b/qt.spec
>index b882382..3bf4412 100644
>--- a/qt.spec
>+++ b/qt.spec
>@@ -25,7 +25,7 @@ Summary: Qt toolkit
> Name:    qt
> Epoch:   1
> Version: 4.8.5
>-Release: 22%{?dist}
>+Release: 23%{?dist}
> 
> # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
> License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
>@@ -48,6 +48,9 @@ Source4: Trolltech.conf
> # header file to workaround multilib issue
> Source5: qconfig-multilib.h
> 
>+# clear QMAKE_STRIP* so we get useful -debuginfo pkgs (#193602)
>+Patch0: qt-everywhere-opensource-src-4.8.5-nostrip.patch
>+
> # set default QMAKE_CFLAGS_RELEASE
> Patch2: qt-everywhere-opensource-src-4.8.0-tp-multilib-optflags.patch
> 
>@@ -498,9 +501,10 @@ and invoke methods on those objects.
> %prep
> %setup -q -n qt-everywhere-opensource-src-%{version} 
> 
>+%patch0 -p1 -b .nostrip
> %patch2 -p1 -b .multilib-optflags
> # drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
>-rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
>+rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags mkspecs/common/linux.conf
> %patch4 -p1 -b .uic_multilib
> %patch5 -p1 -b .webcore_debuginfo
> # ie, where cups-1.6+ is present
>@@ -576,12 +580,6 @@ sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" \
> sed -i -e "s|^$QMAKE_LFLAGS_RELEASE.*$|\1 $RPM_LD_FLAGS|" \
>   mkspecs/common/g++-unix.conf
> 
>-# undefine QMAKE_STRIP (and friends), so we get useful -debuginfo pkgs (#193602)
>-sed -i \
>-  -e 's|^QMAKE_STRIP             =.*|QMAKE_STRIP             =|' \
>-  -e 's|^QMAKE_STRIPFLAGS_LIB   +=.*|QMAKE_STRIPFLAGS_LIB   +=|' \
>-  mkspecs/common/linux.conf 
>-
> # set correct lib path
> if [ "%{_lib}" == "lib64" ] ; then
>   sed -i -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test
>@@ -1248,6 +1246,9 @@ fi
> 
> 
> %changelog
>+* Fri Mar  7 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 1:4.8.5-23
>+- Fix QMAKE_STRIP handling
>+
> * Fri Mar 07 2014 Rex Dieter <rdieter@fedoraproject.org> 4.8.5-22
> - respin mysql_config patch
> 
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1074041: 871978