[ptxdist] Darwin fixes: fontconfig and libcap

[ptxdist] Darwin fixes: fontconfig and libcap

[Bernhard Walle]

I just tested fbterm now and discovered that fontconfig doesn't build.  Quite
easy to fix and as mentioned in the patch it should be already solved. I think
it's also not really Darwin-specific: Using linker flags of the target when
building a hosttool is always a bad idea.

libcap needs a host tool to generate a header file with the capability names in
it. That fix is also quite trivial and I already sent something upstream.

BTW: I have all pending patches at https://bitbucket.org/bwalle/ptxdist.git in
the 'for-mol' branch, so you can also pick them from there if it's easier for
you.


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/2] fontconfig: Fix Darwin build

[Bernhard Walle]

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.

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 $@
+ 
+ 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.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] libcap: Fix build on non-Linux host

[Bernhard Walle]

The patch has been already sent upstream (in a lightly different
variant). For now, it works.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 .../0002-Fix-build-on-non-Linux-host.patch         |   41 ++++++++++++++++++++
 patches/libcap-2.21/series                         |    4 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 patches/libcap-2.21/0002-Fix-build-on-non-Linux-host.patch

diff --git a/patches/libcap-2.21/0002-Fix-build-on-non-Linux-host.patch b/patches/libcap-2.21/0002-Fix-build-on-non-Linux-host.patch
new file mode 100644
index 0000000..b226906
--- /dev/null
+++ b/patches/libcap-2.21/0002-Fix-build-on-non-Linux-host.patch
@@ -0,0 +1,41 @@
+From dd53fb42020b5a0612870924dd95e3a488ddf13d Mon Sep 17 00:00:00 2001
+From: Bernhard Walle <bernhard@bwalle.de>
+Date: Sun, 8 Apr 2012 17:55:56 +0200
+Subject: [PATCH] Fix build on non-Linux host
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+---
+ libcap/include/linux/capability.h |    6 ++++++
+ libcap/include/sys/capability.h   |    1 -
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h
+index 4924f2a..6d2fdaf 100644
+--- a/libcap/include/linux/capability.h
++++ b/libcap/include/linux/capability.h
+@@ -13,7 +13,13 @@
+ #ifndef _LINUX_CAPABILITY_H
+ #define _LINUX_CAPABILITY_H
+ 
++#ifdef __linux__
+ #include <linux/types.h>
++#else
++#include <stdint.h>
++typedef uint32_t __u32;
++typedef uint32_t __le32;
++#endif
+ 
+ struct task_struct;
+ 
+diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h
+index 4b54acc..d6ef07f 100644
+--- a/libcap/include/sys/capability.h
++++ b/libcap/include/sys/capability.h
+@@ -21,7 +21,6 @@ extern "C" {
+ 
+ #include <sys/types.h>
+ #include <stdint.h>
+-#include <linux/types.h>
+ 
+ /*
+  * Required to limit what gets defined in the kernel header file.
diff --git a/patches/libcap-2.21/series b/patches/libcap-2.21/series
index ab798c0..d16ef28 100644
--- a/patches/libcap-2.21/series
+++ b/patches/libcap-2.21/series
@@ -1,3 +1,5 @@
 # generated by git-ptx-patches
+#tag:base --start-number 1
 0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch
-# 1d206f03899ee1c148cbf9652fc1aec3  - git-ptx-patches magic
+0002-Fix-build-on-non-Linux-host.patch
+# 187508e7e810aa0efb7a7ad4d7af2d9e  - git-ptx-patches magic
-- 
1.7.9.5


-- 
ptxdist mailing list
ptxdist@pengutronix.de