ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Noux: have bash use libc's 'getcwd()' function

Browse Source 
The bash configure script cannot detect if the 'getcwd()' function in
Genode's libc works correctly, so it assumes that it is broken and makes
bash use its own version of this function. With this patch bash uses the
libc version, which has a Noux-specific implementation in the 'libc_noux'
plugin.

Fixes #324.
This commit is contained in:
Christian Prochaska 2012-08-14 00:32:48 +02:00 committed by Norman Feske
parent 69fd7e1c32
commit 74b7b768f8
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/ports/bash.mk
View File

@ -17,5 +17,5 @@ $(DOWNLOAD_DIR)/$(BASH_TGZ):
$(CONTRIB_DIR)/$(BASH): $(DOWNLOAD_DIR)/$(BASH_TGZ)
$(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@
$(VERBOSE)patch -N -p0 < src/noux-pkg/bash/build.patch
$(VERBOSE)patch -d $(CONTRIB_DIR)/$(BASH) -N -p1 < src/noux-pkg/bash/build.patch

32
ports/src/noux-pkg/bash/build.patch
View File

@ -1,6 +1,6 @@
diff -ru bash-4.1/builtins/Makefile.in _bash-4.1/builtins/Makefile.in
--- contrib/bash-4.1/builtins/Makefile.in 2009-05-30 06:34:30.000000000 +0200
+++ contrib/bash-4.1/builtins/Makefile.in 2011-02-02 22:03:49.000000000 +0100
diff --git a/builtins/Makefile.in b/builtins/Makefile.in
--- a/builtins/Makefile.in
+++ b/builtins/Makefile.in
@@ -68,7 +68,7 @@
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
LOCAL_LDFLAGS = @LOCAL_LDFLAGS@
@ -10,9 +10,23 @@ diff -ru bash-4.1/builtins/Makefile.in _bash-4.1/builtins/Makefile.in
BASHINCDIR = ${topdir}/include
diff -ru bash-4.1/lib/intl/l10nflist.c _bash-4.1/lib/intl/l10nflist.c
--- contrib/bash-4.1/lib/intl/l10nflist.c 2009-01-04 20:32:30.000000000 +0100
+++ contrib/bash-4.1/lib/intl/l10nflist.c 2011-02-02 21:55:34.000000000 +0100
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -28398,8 +28398,8 @@
else
if test "$cross_compiling" = yes; then
{ $as_echo "$as_me:$LINENO: WARNING: cannot check whether getcwd allocates memory when cross-compiling -- defaulting to no" >&5
-$as_echo "$as_me: WARNING: cannot check whether getcwd allocates memory when cross-compiling -- defaulting to no" >&2;}
- bash_cv_getcwd_malloc=no
+$as_echo "$as_me: WARNING: cannot check whether getcwd allocates memory when cross-compiling -- defaulting to yes" >&2;}
+ bash_cv_getcwd_malloc=yes
else
cat >conftest.$ac_ext <<_ACEOF
diff --git a/lib/intl/l10nflist.c b/lib/intl/l10nflist.c
--- a/lib/intl/l10nflist.c
+++ b/lib/intl/l10nflist.c
@@ -33,7 +33,7 @@
#include <string.h>
@ -22,9 +36,9 @@ diff -ru bash-4.1/lib/intl/l10nflist.c _bash-4.1/lib/intl/l10nflist.c
#endif
#include <ctype.h>
#include <sys/types.h>
diff -u bash-4.1/shell.c /home/no/src/genode/ports/contrib/bash-4.1/shell.c
--- contrib/bash-4.1/shell.c 2009-11-19 16:05:54.000000000 +0100
+++ contrib/bash-4.1/shell.c 2011-02-23 14:09:24.000000000 +0100
diff --git a/shell.c b/shell.c
--- a/shell.c
+++ b/shell.c
@@ -364,6 +364,12 @@
env = environ;
#endif /* __OPENNT */