summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Walle <bernhard@bwalle.de>2012-01-22 00:15:54 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-01-22 10:46:39 +0100
commit2279d29265920de12707d18ab71e0d9e7fe70414 (patch)
treec2eb5a2561d98170768672d23243e4074b58309f
parent42599282182473249e9803a784ae66b4c54071d6 (diff)
downloadptxdist-2279d29265920de12707d18ab71e0d9e7fe70414.tar.gz
ptxdist-2279d29265920de12707d18ab71e0d9e7fe70414.tar.xz
gnuplot: Fix build on Darwin
This patch adds 0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch for gnuplot. This patch fixes building the documentation generator which is executed on the host. Signed-off-by: Bernhard Walle <bernhard@bwalle.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch30
-rw-r--r--patches/gnuplot-4.4.3/series3
2 files changed, 32 insertions, 1 deletions
diff --git a/patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch b/patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
new file mode 100644
index 000000000..968eaf856
--- /dev/null
+++ b/patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
@@ -0,0 +1,30 @@
+From: Bernhard Walle <bernhard@bwalle.de>
+Date: Sun, 22 Jan 2012 00:03:59 +0100
+Subject: [PATCH] Don't use LDFLAGS when building the documentation generator
+
+The documentation generator is a tool running on the build machine.
+Therefore the LDFLAGS computed for the cross compiler may not work, such
+as the "-Wl,-rpath-link" flag which is not understood by the Darwin
+linker.
+
+The doc2gih is simple and doesn't require an external library. So we
+don't also need special LDFLAGS. Omit them.
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+---
+ docs/Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/docs/Makefile.in b/docs/Makefile.in
+index 591d818..0e2ef8f 100644
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -83,7 +83,7 @@ LIBS =
+
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
++LINK = $(CCLD) $(CFLAGS) -o $@
+
+ .c.o:
+ $(COMPILE) -c $<
diff --git a/patches/gnuplot-4.4.3/series b/patches/gnuplot-4.4.3/series
index 2abd8f8ee..585745c96 100644
--- a/patches/gnuplot-4.4.3/series
+++ b/patches/gnuplot-4.4.3/series
@@ -1,4 +1,5 @@
# generated by git-ptx-patches
#tag:base --start-number 1
0001-gnuplot-build-documentation-generator-tools-with-CC_.patch
-# 3e114650ad53e5a48943395ff97a63b0 - git-ptx-patches magic
+0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch
+# ffd95c4575ca3e3194e093f925705906 - git-ptx-patches magic