Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (12b628779738ebe98dbb42ab5e6f85e0945215dd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (12b628779738ebe98dbb42ab5e6f85e0945215dd)
  • Date: Fri, 18 Jan 2008 09:46:07 -0600

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

shell-term-fm/busybox/PRE_BUILD | 6 +-----
shell-term-fm/busybox/applets.patch | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit 12b628779738ebe98dbb42ab5e6f85e0945215dd
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

busybox: forgot to add the applets patch. I was testing a dual version
spell, to also offer the unstable busybox. But that exploded on me on the
1st cast. So I removed the last of it from PRE_BUILD again.

diff --git a/shell-term-fm/busybox/PRE_BUILD b/shell-term-fm/busybox/PRE_BUILD
index 5f71115..c1746e7 100755
--- a/shell-term-fm/busybox/PRE_BUILD
+++ b/shell-term-fm/busybox/PRE_BUILD
@@ -1,11 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-if [[ "$BUSYBOX_UNSTABLE" = 'y' ]]; then
- patch -p0 < ${SCRIPT_DIRECTORY}/applets.dev.patch
-else
- patch -p0 < ${SCRIPT_DIRECTORY}/applets.patch
-fi &&
+patch -p0 < ${SCRIPT_DIRECTORY}/applets.patch

if [ -f $CONFIG_CACHE/busybox.config ]; then
cp ${CONFIG_CACHE}/busybox.config .config
diff --git a/shell-term-fm/busybox/applets.patch
b/shell-term-fm/busybox/applets.patch
new file mode 100644
index 0000000..d67676c
--- /dev/null
+++ b/shell-term-fm/busybox/applets.patch
@@ -0,0 +1,20 @@
+--- applets/applets.c 2007-11-10 02:40:53.000000000 +0100
++++ applets/applets.c-fixed 2008-01-18 01:25:01.000000000 +0100
+@@ -10,17 +10,6 @@
+ #include <assert.h>
+ #include "busybox.h"
+
+-/* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */
+-#if ENABLE_STATIC && defined(__GLIBC__) && !defined(__UCLIBC__)
+-#warning Static linking against glibc produces buggy executables
+-#warning (glibc does not cope well with ld --gc-sections).
+-#warning See sources.redhat.com/bugzilla/show_bug.cgi?id=3400
+-#warning Note that glibc is unsuitable for static linking anyway.
+-#warning If you still want to do it, remove -Wl,--gc-sections
+-#warning from top-level Makefile and remove this warning.
+-#error Aborting compilation.
+-#endif
+-
+ #if ENABLE_BUILD_LIBBUSYBOX
+ int main(int argc, char **argv)
+ {



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (12b628779738ebe98dbb42ab5e6f85e0945215dd), Arjan Bouter, 01/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page