From cfc8845b7bbd757860c6de8d56f9c48933cc4859 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 26 Feb 2010 10:03:36 +0000 Subject: [PATCH] fix building with "gold" linker --- .cvsignore | 1 + gimp-2.6.8-gold.patch | 616 ++++++++++++++++++++++++++++++++++++++++++ gimp.spec | 15 +- sources | 1 + 4 files changed, 632 insertions(+), 1 deletion(-) create mode 100644 gimp-2.6.8-gold.patch diff --git a/.cvsignore b/.cvsignore index 7b9922c..f67a080 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ gimp-2.6.8.tar.bz2 +gimp-2.6.8-4-automake.patch.bz2 diff --git a/gimp-2.6.8-gold.patch b/gimp-2.6.8-gold.patch new file mode 100644 index 0000000..d4e61df --- /dev/null +++ b/gimp-2.6.8-gold.patch @@ -0,0 +1,616 @@ +From 4dcab3c2904353c0a175765657316bbfc78af0d2 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Thu, 25 Feb 2010 18:04:18 +0100 +Subject: [PATCH] patch: gold + +Squashed commit of the following: + +commit afd331aca4c7cb4a0b53c7b0276253aab82424ae +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + selection-to-path: explicitly specify library dependencies + +commit db8abcd13a4d553d1f3e50e6fb0cc19a7c9f6ae5 +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + pagecurl: explicitly specify library dependencies + +commit 9d4e2aad81e339ae3e2971b7c12d3ae12bd60220 +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + map-object: explicitly specify library dependencies + +commit 257047325c0fb9297d764f34a6d4742fcfb837b7 +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + lighting: explicitly specify library dependencies + +commit 709c245217a301652c1e5a3a288f5ae7c101aa33 +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + imagemap: explicitly specify library dependencies + +commit a40311f72b994c5ffb37a206e7d40ffc099c8205 +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + ifs-compose: explicitly specify library dependencies + +commit aebab1503e2065fe7665abd5818def52603e2eec +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + gradient-flare: explicitly specify library dependencies + +commit 0c7c425d1acdfecf64b453681df25cb08e344338 +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + gimpressionist: explicitly specify library dependencies + +commit 2822fbfd9c0c1c099047d99d41ae9de8c8d52dc3 +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + gfig: explicitly specify library dependencies + +commit 4c0fd7d3f63f25a112271422cecef1b8958a94f9 +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + fractal-explorer: explicitly specify library dependencies + +commit 17e154a2856d0e97ebd76c706b6238fb3b40e74e +Author: Nils Philippsen +Date: Thu Feb 25 15:36:20 2010 +0100 + + flame: explicitly specify library dependencies + +commit f7fadce58851854abb1ed54ce0141c8dc0434c12 +Author: Nils Philippsen +Date: Thu Feb 25 15:11:04 2010 +0100 + + color-rotate: explicitly specify library dependencies + +commit abbb6a2472e7e31e3aaa30c772f8f5dbaaf476c5 +Author: Nils Philippsen +Date: Wed Feb 24 15:40:50 2010 +0100 + + script-fu: explicitly specify library dependencies + +commit da5ee1fe718d9bbbda6c786ebf0f4ded43a7a246 +Author: Manish Singh +Date: Wed Sep 9 17:41:20 2009 -0700 + + Explicit shared lib deps to support gold + + (attempted cherry-picking from commit + 15497c1d6808b1ea479574b0b3e132484f7f172f, resolved conflicts) + + Signed-off-by: Nils Philippsen + +commit 7cae0f249a5d2110a596f3fb22cdd33b07b05f1c +Author: Manish Singh +Date: Sun May 24 10:42:39 2009 -0700 + + Explicitly specify library dependencies at link time, so we can use gold. + (cherry picked from commit 582cb0f14eb9f145bd2a2f5c9fda12309ae0229f) + + Signed-off-by: Nils Philippsen +--- + libgimpthumb/Makefile.am | 5 ++++- + plug-ins/color-rotate/Makefile.am | 12 +++++++----- + plug-ins/common/Makefile.am | 11 ++++++----- + plug-ins/common/mkgen.pl | 11 ++++++----- + plug-ins/flame/Makefile.am | 12 +++++++----- + plug-ins/fractal-explorer/Makefile.am | 12 +++++++----- + plug-ins/gfig/Makefile.am | 12 +++++++----- + plug-ins/gimpressionist/Makefile.am | 12 +++++++----- + plug-ins/gradient-flare/Makefile.am | 12 +++++++----- + plug-ins/help-browser/Makefile.am | 1 + + plug-ins/ifs-compose/Makefile.am | 12 +++++++----- + plug-ins/imagemap/Makefile.am | 12 +++++++----- + plug-ins/lighting/Makefile.am | 12 +++++++----- + plug-ins/map-object/Makefile.am | 12 +++++++----- + plug-ins/metadata/Makefile.am | 5 ++++- + plug-ins/pagecurl/Makefile.am | 12 +++++++----- + plug-ins/script-fu/Makefile.am | 14 ++++++++------ + plug-ins/selection-to-path/Makefile.am | 12 +++++++----- + 18 files changed, 113 insertions(+), 78 deletions(-) + +diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am +index 2e7b531..ee26219 100644 +--- a/libgimpthumb/Makefile.am ++++ b/libgimpthumb/Makefile.am +@@ -86,7 +86,10 @@ noinst_PROGRAMS = gimp-thumbnail-list + + gimp_thumbnail_list_SOURCES = gimp-thumbnail-list.c + +-gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la ++gimp_thumbnail_list_LDADD = \ ++ libgimpthumb-$(GIMP_API_VERSION).la \ ++ $(GDK_PIXBUF_LIBS) \ ++ $(GLIB_LIBS) + + + install-data-local: install-ms-lib install-libtool-import-lib +diff --git a/plug-ins/color-rotate/Makefile.am b/plug-ins/color-rotate/Makefile.am +index c713c8c..f7e11b7 100644 +--- a/plug-ins/color-rotate/Makefile.am ++++ b/plug-ins/color-rotate/Makefile.am +@@ -1,16 +1,18 @@ + ## Process this file with automake to produce Makefile.in + ++if OS_WIN32 ++mwindows = -mwindows ++else ++libm = -lm ++endif ++ + libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la + libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la + libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la + libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la + libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la + libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la +-libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la +- +-if OS_WIN32 +-mwindows = -mwindows +-endif ++libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) + + AM_LDFLAGS = $(mwindows) + +diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am +index 66dc6dd..d58ecee 100644 +--- a/plug-ins/common/Makefile.am ++++ b/plug-ins/common/Makefile.am +@@ -7,21 +7,22 @@ + ## Modify those two files instead of this one; for most + ## plug-ins you should only need to modify plugin-defs.pl. + ++if OS_WIN32 ++mwindows = -mwindows ++else ++libm = -lm ++endif + + libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la + libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la + libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la + libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la +-libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la ++libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm) + libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la + libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la + libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la + + +-if OS_WIN32 +-mwindows = -mwindows +-endif +- + AM_LDFLAGS = $(mwindows) + + libexecdir = $(gimpplugindir)/plug-ins +diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl +index 40b4b74..b0cd786 100755 +--- a/plug-ins/common/mkgen.pl ++++ b/plug-ins/common/mkgen.pl +@@ -51,21 +51,22 @@ print MK < - 2:2.6.8-4 +- add missing explicit libraries + +* Wed Feb 24 2010 Nils Philippsen +- backport: fix building with "gold" linker +- add more explicit libraries + * Wed Jan 27 2010 Nils Philippsen - 2:2.6.8-3 - remove wrong dependency (#558836) diff --git a/sources b/sources index 71e9928..4304f9d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ a4d9462c9420954824a80c9b1963f9d9 gimp-2.6.8.tar.bz2 +b6e5b83adbc9ed543c697149757a5545 gimp-2.6.8-4-automake.patch.bz2