[patch] Patch some additional makefiles that I needed

linktostdcpp.patch (text/plain), 2.82 KB, created by Greg Turner on 2012-11-29 11:44:34 UTC

diff -urN cairo-1.12.8.orig/src/Makefile.am cairo-1.12.8/src/Makefile.am
--- cairo-1.12.8.orig/src/Makefile.am
+++ cairo-1.12.8/src/Makefile.am
@@ -36,7 +36,7 @@ libcairo_cxx_la_SOURCES = \
 	$(enabled_cairo_private) \
 	$(enabled_cairo_cxx_sources) \
 	$(NULL)
-libcairo_cxx_la_LDFLAGS = $(AM_LDFLAGS) $(export_symbols)
+libcairo_cxx_la_LDFLAGS = $(AM_LDFLAGS) $(export_symbols) -lstdc++
 libcairo_cxx_la_LIBADD = $(CAIRO_LIBS)
 libcairo_cxx_la_DEPENDENCIES = $(cairo_def_dependency)
 
diff -urN cairo-1.12.8.orig/util/cairo-sphinx/Makefile.am cairo-1.12.8/util/cairo-sphinx/Makefile.am
--- cairo-1.12.8.orig/util/cairo-sphinx/Makefile.am	2012-11-29 11:42:32.044194694 +0100
+++ cairo-1.12.8/util/cairo-sphinx/Makefile.am	2012-11-29 11:50:17.427098648 +0100
@@ -26,7 +26,7 @@
 	$(top_builddir)/src/libcairo.la 			\
 	$(glib_LIBS) 						\
 	$(CAIRO_LDADD)						\
-	$(shm_LIBS)
+	$(shm_LIBS) -lstdc++
 cairo_sphinx_DEPENDENCIES = \
         $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
         $(top_builddir)/boilerplate/libcairoboilerplate.la	\
diff -urN cairo-1.12.8.orig/test/Makefile.am cairo-1.12.8/test/Makefile.am
--- cairo-1.12.8.orig/test/Makefile.am	2012-03-23 17:47:39.000000000 +0100
+++ cairo-1.12.8/test/Makefile.am	2012-11-29 11:56:07.595079504 +0100
@@ -89,7 +89,7 @@
 	$(top_builddir)/test/pdiff/libpdiff.la 			\
         $(top_builddir)/boilerplate/libcairoboilerplate.la	\
 	$(top_builddir)/src/libcairo.la 			\
-	$(CAIRO_LDADD)
+	$(CAIRO_LDADD) -lstdc++
 cairo_test_suite_DEPENDENCIES = \
 	$(top_builddir)/test/pdiff/libpdiff.la 			\
         $(top_builddir)/boilerplate/libcairoboilerplate.la	\
diff -urN cairo-1.12.8.orig/perf/Makefile.am cairo-1.12.8/perf/Makefile.am
--- cairo-1.12.8.orig/perf/Makefile.am	2012-02-02 01:48:14.000000000 +0100
+++ cairo-1.12.8/perf/Makefile.am	2012-11-29 12:37:49.075042561 +0100
@@ -41,7 +41,7 @@
 cairo_perf_micro_SOURCES = $(cairo_perf_micro_sources)
 cairo_perf_micro_LDADD = \
 	$(top_builddir)/perf/micro/libcairo-perf-micro.la \
-	$(LDADD)
+	$(LDADD) -lstdc++
 cairo_perf_micro_DEPENDENCIES = \
 	$(top_builddir)/perf/micro/libcairo-perf-micro.la \
 	$(LDADD)
@@ -58,7 +58,7 @@
 cairo_analyse_trace_LDADD =		\
 	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
 	$(top_builddir)/util/cairo-missing/libcairo-missing.la \
-	$(LDADD)
+	$(LDADD) -lstdc++
 cairo_analyse_trace_DEPENDENCIES = \
 	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
 	$(top_builddir)/util/cairo-missing/libcairo-missing.la \
@@ -70,7 +70,7 @@
 cairo_perf_trace_LDADD =		\
 	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
 	$(top_builddir)/util/cairo-missing/libcairo-missing.la \
-	$(LDADD)
+	$(LDADD) -lstdc++
 cairo_perf_trace_DEPENDENCIES = \
 	$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \
 	$(top_builddir)/util/cairo-missing/libcairo-missing.la \