From c70f4b15397886ce048d06c18a4d3883af887284 Mon Sep 17 00:00:00 2001 From: qrczak Date: Sun, 25 Feb 2007 19:23:38 +0000 Subject: [PATCH] - Filter out ldflags only for *-config, not for building. - Filter out -Wl,--as-needed too. Changed files: GraphicsMagick-ldflags.patch -> 1.1 GraphicsMagick.spec -> 1.13 --- GraphicsMagick-ldflags.patch | 21 +++++++++++++++++++++ GraphicsMagick.spec | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 GraphicsMagick-ldflags.patch diff --git a/GraphicsMagick-ldflags.patch b/GraphicsMagick-ldflags.patch new file mode 100644 index 0000000..22d94ef --- /dev/null +++ b/GraphicsMagick-ldflags.patch @@ -0,0 +1,21 @@ +--- GraphicsMagick-1.1.7/configure.ac~ 2007-02-25 17:55:08.000000000 +0100 ++++ GraphicsMagick-1.1.7/configure.ac 2007-02-25 18:10:49.000000000 +0100 +@@ -2713,7 +2713,17 @@ + + MAGICK_API_CFLAGS=$CFLAGS + MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'` +-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS" ++MAGICK_API_LDFLAGS="-L$LIB_DIR" ++for flag in $LDFLAGS ++do ++ case "$flag" in ++ -s|-Wl,-s|--strip-all|-Wl,--strip-all|-Wl,--as-needed) ++ ;; ++ *) ++ MAGICK_API_LDFLAGS="$MAGICK_API_LDFLAGS $flag" ++ ;; ++ esac ++done + MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_DEP_LIBS" + + AC_SUBST(MAGICK_API_CFLAGS) diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index de9b7ef..4e1cdbe 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -29,6 +29,7 @@ Patch0: %{name}-libpath.patch Patch1: %{name}-system-libltdl.patch Patch2: %{name}-link.patch Patch3: %{name}-png.patch +Patch4: %{name}-ldflags.patch URL: http://www.graphicsmagick.org/ BuildRequires: autoconf >= 2.59-9 BuildRequires: automake >= 1:1.8 @@ -58,8 +59,6 @@ Requires: %{name}-libs = %{version}-%{release} Obsoletes: GraphicsMagick-coder-dps BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -# we don't want "-s" here, because it would be added to `GraphicsMagick*-config --ldflags` -%define filterout_ld (-Wl,)?-s (-Wl,)?--strip-all %define modulesdir %{_libdir}/GraphicsMagick-%{version}/modules-Q%{QuantumDepth} %description @@ -548,6 +547,7 @@ Dokumentacja do GraphicsMagick. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 find PerlMagick scripts www -type f -exec perl -pi -e 's=!%{_prefix}/local/bin/perl=!%{__perl}=' {} \; -- 2.43.0