From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay02.ispgateway.de ([80.67.31.29]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1RokAK-0006Qd-Uu for ptxdist@pengutronix.de; Sun, 22 Jan 2012 00:16:10 +0100 Received: from [93.104.153.52] (helo=galilei.fritz.box) by smtprelay02.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1RokAK-0008Up-FI for ptxdist@pengutronix.de; Sun, 22 Jan 2012 00:16:08 +0100 From: Bernhard Walle Date: Sun, 22 Jan 2012 00:15:54 +0100 Message-Id: <1327187754-53844-1-git-send-email-bernhard@bwalle.de> Subject: [ptxdist] [PATCH] gnuplot: Fix build on Darwin Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de 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 --- ...ld-documentation-generator-tools-with-CC_.patch | 2 - ...DFLAGS-when-building-the-documentation-ge.patch | 30 ++++++++++++++++++++ patches/gnuplot-4.4.3/series | 3 +- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 patches/gnuplot-4.4.3/0002-Don-t-use-LDFLAGS-when-building-the-documentation-ge.patch diff --git a/patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-tools-with-CC_.patch b/patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-tools-with-CC_.patch index cbc130b..702ab8b 100644 --- a/patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-tools-with-CC_.patch +++ b/patches/gnuplot-4.4.3/0001-gnuplot-build-documentation-generator-tools-with-CC_.patch @@ -9,8 +9,6 @@ CC_FOR_BUILD. Signed-off-by: Robert Schwebel --- -# 20091222 rsc: https://sourceforge.net/tracker/?func=detail&aid=2918992&group_id=2055&atid=302055 - configure.in | 42 ++++++++++++++++++++++++++++++++++++++++++ docs/Makefile.in | 4 ++-- 2 files changed, 44 insertions(+), 2 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 0000000..968eaf8 --- /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 +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 +--- + 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 2abd8f8..585745c 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 -- 1.7.7.4 -- ptxdist mailing list ptxdist@pengutronix.de