From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay05.ispgateway.de ([80.67.31.100]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SN32v-0004el-Er for ptxdist@pengutronix.de; Wed, 25 Apr 2012 16:18:19 +0200 Received: from [93.104.137.198] (helo=localhost) by smtprelay05.ispgateway.de with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.68) (envelope-from ) id 1SN32u-0004se-3K for ptxdist@pengutronix.de; Wed, 25 Apr 2012 16:18:17 +0200 From: Bernhard Walle Date: Wed, 25 Apr 2012 16:18:03 +0200 Message-Id: <1335363483-19730-3-git-send-email-bernhard@bwalle.de> In-Reply-To: <1335363483-19730-1-git-send-email-bernhard@bwalle.de> References: <1335363483-19730-1-git-send-email-bernhard@bwalle.de> Subject: [ptxdist] [PATCH 3/3 v2] fontconfig: Fix Darwin build 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 Upstream solved it completely different http://cgit.freedesktop.org/fontconfig/commit/?id=2a6b235ff6d2750171e8dff7cfdfe3bccb0f630e now, so after updating fontconfig the patch will be obsolete. Applying that patch is not possible, however, since I would need to re-create the tarball. However, I don't want to update fontconfig since it touches the whole Xorg stack and I have no possibility to test that. The first upstream version that contains the release is 2.9.0. Signed-off-by: Bernhard Walle --- v1 -> v2: o Add comment about upstream status also in the patch header, not only in the commit message. o Also remove $(CFLAGS) since they contain cross cflags, not host cflags. .../0001-Fix-build-on-Darwin.patch | 76 ++++++++++++++++++++ patches/fontconfig-2.6.0/autogen.sh | 1 + patches/fontconfig-2.6.0/series | 4 ++ 3 files changed, 81 insertions(+) create mode 100644 patches/fontconfig-2.6.0/0001-Fix-build-on-Darwin.patch create mode 120000 patches/fontconfig-2.6.0/autogen.sh create mode 100644 patches/fontconfig-2.6.0/series diff --git a/patches/fontconfig-2.6.0/0001-Fix-build-on-Darwin.patch b/patches/fontconfig-2.6.0/0001-Fix-build-on-Darwin.patch new file mode 100644 index 0000000..fffb670 --- /dev/null +++ b/patches/fontconfig-2.6.0/0001-Fix-build-on-Darwin.patch @@ -0,0 +1,76 @@ +From beadde506169a71a89ba37e277c611a7b5b18154 Mon Sep 17 00:00:00 2001 +From: Bernhard Walle +Date: Sun, 8 Apr 2012 17:38:20 +0200 +Subject: [PATCH] Fix build on Darwin + +The problem is the -rpath-link that is used even on host CC but this +option is not available on Mac OS. + +Upstream solved it completely different +http://cgit.freedesktop.org/fontconfig/commit/?id=2a6b235ff6d2750171e8dff7cfdfe3bccb0f630e +now, so after updating fontconfig the patch will be obsolete. Applying +that patch is not possible, however, since it would be needed to +re-create the tarball. + +The first upstream version that contains the release is 2.9.0. + +Signed-off-by: Bernhard Walle +--- + fc-arch/Makefile.am | 2 +- + fc-case/Makefile.am | 2 +- + fc-glyphname/Makefile.am | 2 +- + fc-lang/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/fc-arch/Makefile.am b/fc-arch/Makefile.am +index 7e1dd3e..ddc1fc1 100644 +--- a/fc-arch/Makefile.am ++++ b/fc-arch/Makefile.am +@@ -24,7 +24,7 @@ + + CC = @CC_FOR_BUILD@ + EXEEXT = @EXEEXT_FOR_BUILD@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ + + INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + +diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am +index d4fa12d..1b63acf 100644 +--- a/fc-case/Makefile.am ++++ b/fc-case/Makefile.am +@@ -24,7 +24,7 @@ + + CC = @CC_FOR_BUILD@ + EXEEXT = @EXEEXT_FOR_BUILD@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ + + INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + +diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am +index 412d663..ea55b98 100644 +--- a/fc-glyphname/Makefile.am ++++ b/fc-glyphname/Makefile.am +@@ -24,7 +24,7 @@ + + CC = @CC_FOR_BUILD@ + EXEEXT = @EXEEXT_FOR_BUILD@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ + + INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + +diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am +index 60e4f31..44b103a 100644 +--- a/fc-lang/Makefile.am ++++ b/fc-lang/Makefile.am +@@ -24,7 +24,7 @@ + + CC = @CC_FOR_BUILD@ + EXEEXT = @EXEEXT_FOR_BUILD@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ + + INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + diff --git a/patches/fontconfig-2.6.0/autogen.sh b/patches/fontconfig-2.6.0/autogen.sh new file mode 120000 index 0000000..9f8a4cb --- /dev/null +++ b/patches/fontconfig-2.6.0/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/fontconfig-2.6.0/series b/patches/fontconfig-2.6.0/series new file mode 100644 index 0000000..d9df7e0 --- /dev/null +++ b/patches/fontconfig-2.6.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Fix-build-on-Darwin.patch +# e4c948951d2fafee17a83f484c126a7e - git-ptx-patches magic -- 1.7.10 -- ptxdist mailing list ptxdist@pengutronix.de