From 250085e2f75c413bf72b643e424286b755a83883 Mon Sep 17 00:00:00 2001 From: miwi Date: Fri, 27 Jan 2012 17:45:36 +0000 Subject: - Fix build with gcc4.6 PR: 164141 Submitted by: Heath Nielson --- graphics/ufraw/files/patch-Makefile | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 graphics/ufraw/files/patch-Makefile diff --git a/graphics/ufraw/files/patch-Makefile b/graphics/ufraw/files/patch-Makefile new file mode 100644 index 0000000..71b273d --- /dev/null +++ b/graphics/ufraw/files/patch-Makefile @@ -0,0 +1,34 @@ +When creating the nikon-curve app, the Makefile calls gcc46 which does not automatically include the libstdc++.so library causing the undefined symbols. By calling g++46 instead, libstdc++.so is included in the link resolving the symbols. + +Patch attached with submission follows: + +--- Makefile.in.orig 2012-01-15 08:13:07.000000000 -0700 ++++ Makefile.in 2012-01-15 08:14:38.000000000 -0700 +@@ -126,8 +126,6 @@ + @MAKE_EXTRAS_TRUE@ nikon_curve-nikon_curve.$(OBJEXT) + nikon_curve_OBJECTS = $(am_nikon_curve_OBJECTS) + @MAKE_EXTRAS_TRUE@nikon_curve_DEPENDENCIES = $(am__DEPENDENCIES_1) +-nikon_curve_LINK = $(CCLD) $(nikon_curve_CFLAGS) $(CFLAGS) \ +- $(nikon_curve_LDFLAGS) $(LDFLAGS) -o $@ + ufraw_SOURCES = ufraw.c + ufraw_OBJECTS = ufraw.$(OBJEXT) + ufraw_LDADD = $(LDADD) +@@ -491,6 +489,7 @@ + @MAKE_EXTRAS_TRUE@nikon_curve_CFLAGS = $(UFRAW_CPPFLAGS) -D_STAND_ALONE_ + @MAKE_EXTRAS_TRUE@nikon_curve_LDFLAGS = @CONSOLE@ + @MAKE_EXTRAS_TRUE@nikon_curve_LDADD = $(UFRAW_LDADD) ++@MAKE_EXTRAS_TRUE@nikon_curve_LINK = $(CXXLINK) @CONSOLE@ + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -709,7 +708,7 @@ + $(AM_V_CXXLD)$(dcraw_LINK) $(dcraw_OBJECTS) $(dcraw_LDADD) $(LIBS) + nikon-curve$(EXEEXT): $(nikon_curve_OBJECTS) $(nikon_curve_DEPENDENCIES) + @rm -f nikon-curve$(EXEEXT) +- $(AM_V_CCLD)$(nikon_curve_LINK) $(nikon_curve_OBJECTS) $(nikon_curve_LDADD) $(LIBS) ++ $(AM_V_GEN)$(nikon_curve_LINK) $(nikon_curve_OBJECTS) $(nikon_curve_LDADD) $(LIBS) + ufraw$(EXEEXT): $(ufraw_OBJECTS) $(ufraw_DEPENDENCIES) + @rm -f ufraw$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(ufraw_OBJECTS) $(ufraw_LDADD) $(LIBS) + + -- cgit v1.1