mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] busybox: Fix build on Darwin after update
@ 2012-06-13 19:54 Bernhard Walle
  0 siblings, 0 replies; only message in thread
From: Bernhard Walle @ 2012-06-13 19:54 UTC (permalink / raw)
  To: ptxdist

Just trivial. I'll send the patch upstream to Busybox developers.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 .../0001-reactivate-check-for-tty.patch            |    1 +
 .../0002-Fix-compilation-on-Darwin.patch           |   26 ++++++++++++++++++++
 patches/busybox-1.20.1/series                      |    3 ++-
 3 Dateien geändert, 29 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)
 create mode 100644 patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch

diff --git a/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch b/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch
index a44f6b6..186aa57 100644
--- a/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch
+++ b/patches/busybox-1.20.1/0001-reactivate-check-for-tty.patch
@@ -1,3 +1,4 @@
+From 1bfae474d5bde25836fa996506f89018d6fbd6e1 Mon Sep 17 00:00:00 2001
 From: Marc Kleine-Budde <mkl@pengutronix.de>
 Date: Fri, 6 Nov 2009 09:19:58 +0100
 Subject: [PATCH] reactivate check for tty
diff --git a/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch b/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch
new file mode 100644
index 0000000..031a84f
--- /dev/null
+++ b/patches/busybox-1.20.1/0002-Fix-compilation-on-Darwin.patch
@@ -0,0 +1,26 @@
+From 6b464e669163eee0fc71b57ba3530df812736541 Mon Sep 17 00:00:00 2001
+From: Bernhard Walle <bernhard@bwalle.de>
+Date: Wed, 13 Jun 2012 21:44:46 +0200
+Subject: [PATCH] Fix compilation on Darwin
+
+Upstream commit b83c9704128dd106071184e4b00335a3b8486857 [1] broke it.
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+
+[1] http://git.busybox.net/busybox/commit/?id=b83c9704128dd106071184e4b00335a3b8486857
+---
+ scripts/kconfig/mconf.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
+index d3f69f8..322fc89 100644
+--- a/scripts/kconfig/mconf.c
++++ b/scripts/kconfig/mconf.c
+@@ -9,6 +9,7 @@
+  */
+ 
+ #define _XOPEN_SOURCE 700
++#define _DARWIN_C_SOURCE /* for SIGWINCH */
+ 
+ #include <sys/ioctl.h>
+ #include <sys/wait.h>
diff --git a/patches/busybox-1.20.1/series b/patches/busybox-1.20.1/series
index 656cac6..4c4504b 100644
--- a/patches/busybox-1.20.1/series
+++ b/patches/busybox-1.20.1/series
@@ -1,4 +1,5 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 0001-reactivate-check-for-tty.patch
-# 12c8ba015e00868760efcb583679450e  - git-ptx-patches magic
+0002-Fix-compilation-on-Darwin.patch
+# 0f71f4e1223df5ecf36d97b5851e1c4c  - git-ptx-patches magic
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-06-13 19:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-13 19:54 [ptxdist] [PATCH] busybox: Fix build on Darwin after update Bernhard Walle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox