From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 2/5] fontconfig: Fix Darwin build
Date: Mon, 23 Apr 2012 10:04:12 +0200 [thread overview]
Message-ID: <20120423080412.GC7869@pengutronix.de> (raw)
In-Reply-To: <1335017761-20968-3-git-send-email-bernhard@bwalle.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 <bernhard@bwalle.de>
> ---
> .../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 <bernhard@bwalle.de>
> +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 <bernhard@bwalle.de>
> +---
> + 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
next prev parent reply other threads:[~2012-04-23 8:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-21 14:15 [ptxdist] Outstanding patches Bernhard Walle
2012-04-21 14:15 ` [ptxdist] [PATCH 1/5] Add sp-oops-extract package Bernhard Walle
2012-04-23 7:54 ` Michael Olbrich
2012-04-21 14:15 ` [ptxdist] [PATCH 2/5] fontconfig: Fix Darwin build Bernhard Walle
2012-04-23 8:04 ` Michael Olbrich [this message]
2012-04-21 14:15 ` [ptxdist] [PATCH 3/5] libcap: Fix build on non-Linux host Bernhard Walle
2012-04-23 7:54 ` Michael Olbrich
2012-04-21 14:16 ` [ptxdist] [PATCH 4/5] Add host-parted Bernhard Walle
2012-05-31 10:08 ` Andreas Bießmann
2012-04-21 14:16 ` [ptxdist] [PATCH 5/5] Allow creation of bootable SD card for OMAP CPUs Bernhard Walle
2012-05-31 10:09 ` Andreas Bießmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120423080412.GC7869@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox