Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: libreoffice-honor-strip.patch
Date: Tue, 06 Sep 2011 13:08:06
Message-Id: 20110906130755.A96A520051@flycatcher.gentoo.org
1 scarabeus 11/09/06 13:07:55
2
3 Added: libreoffice-honor-strip.patch
4 Log:
5 Apply patch to disable striping, we handle it by PM.
6
7 (Portage version: 2.2.0_alpha53/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-office/libreoffice/files/libreoffice-honor-strip.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-honor-strip.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-honor-strip.patch?rev=1.1&content-type=text/plain
14
15 Index: libreoffice-honor-strip.patch
16 ===================================================================
17 From dcdcc53e25fce09be486d4ea700f8a72895a1e69 Mon Sep 17 00:00:00 2001
18 From: Stephan Bergmann <sbergman@××××××.com>
19 Date: Tue, 06 Sep 2011 07:39:07 +0000
20 Subject: Honor --disable-strip in gbuild.
21
22 ---
23 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
24 index 48bebeb..329eefa 100644
25 --- a/solenv/gbuild/gbuild.mk
26 +++ b/solenv/gbuild/gbuild.mk
27 @@ -87,6 +87,12 @@ else
28 gb_SYMBOL := $(false)
29 endif
30
31 +ifeq ($(strip $(DISABLE_STRIP)$(disable_strip)),)
32 +gb_STRIP := $(true)
33 +else
34 +gb_STRIP := $(false)
35 +endif
36 +
37 gb_DEBUGLEVEL := 0
38 ifneq ($(strip $(DEBUG)$(debug)),)
39 gb_DEBUGLEVEL := 1
40 diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
41 index 4234c71..5c71bd4 100644
42 --- a/solenv/gbuild/platform/unxgcc.mk
43 +++ b/solenv/gbuild/platform/unxgcc.mk
44 @@ -163,9 +163,11 @@ gb_LinkTarget_LDFLAGS += \
45 endif
46
47 ifneq ($(gb_SYMBOL),$(true))
48 -gb_LinkTarget_LDFLAGS += \
49 - -Wl,--strip-all \
50 -
51 +ifeq ($(gb_STRIP),$(true))
52 +gb_LinkTarget_LDFLAGS += -Wl,--strip-all
53 +else
54 +gb_LinkTarget_LDFLAGS += -Wl,--strip-debug
55 +endif
56 endif
57
58 ifneq ($(gb_DEBUGLEVEL),0)
59 --
60 cgit v0.9.0.2-2-gbebe