From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SMEFo-00024z-4J for ptxdist@pengutronix.de; Mon, 23 Apr 2012 10:04:12 +0200 Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72) (envelope-from ) id 1SMEFo-0004iW-32 for ptxdist@pengutronix.de; Mon, 23 Apr 2012 10:04:12 +0200 Date: Mon, 23 Apr 2012 10:04:12 +0200 From: Michael Olbrich Message-ID: <20120423080412.GC7869@pengutronix.de> References: <1335017761-20968-1-git-send-email-bernhard@bwalle.de> <1335017761-20968-3-git-send-email-bernhard@bwalle.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1335017761-20968-3-git-send-email-bernhard@bwalle.de> Subject: Re: [ptxdist] [PATCH 2/5] 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: , 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 On Sat, Apr 21, 2012 at 04:15:58PM +0200, Bernhard Walle wrote: > Upstream solved it completely different > http://cgit.freedesktop.org/fontconfig/commit/?id=2a6b235ff6d2750171e8dff7cfdfe3bccb0f630e Please add this link to the patch description. And specify the fontconfig version that fixes the problem. > 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. Yes, updating Xorg is always scary. I try to avoid that as well :-) > Signed-off-by: Bernhard Walle > --- > .../0001-Fix-build-on-Darwin.patch | 68 ++++++++++++++++++++ > patches/fontconfig-2.6.0/autogen.sh | 1 + > patches/fontconfig-2.6.0/series | 4 ++ > 3 files changed, 73 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..89320dd > --- /dev/null > +++ b/patches/fontconfig-2.6.0/0001-Fix-build-on-Darwin.patch > @@ -0,0 +1,68 @@ > +From 4b0e469be28dc539dac7ec9eb504b6add37dd85a 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. > + > +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..802c999 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) $(CFLAGS) $(AM_LDFLAGS) -o $@ Shouldn't you remove the $(CFLAGS) as well? CROSS_CFLAGS are added here, right? Michael > + > + INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) > + > +diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am > +index d4fa12d..9ea539f 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) $(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..bd91007 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) $(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..73ff946 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) $(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 > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de