diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/bash | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/bash')
| -rw-r--r-- | package/bash/Config.in | 8 | ||||
| -rw-r--r-- | package/bash/Makefile | 9 | ||||
| -rw-r--r-- | package/bash/patches/patch-builtins_Makefile_in | 11 |
3 files changed, 14 insertions, 14 deletions
diff --git a/package/bash/Config.in b/package/bash/Config.in deleted file mode 100644 index db966be01..000000000 --- a/package/bash/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_PACKAGE_BASH - prompt "bash.............................. GNU Bourne-Again SHell" - tristate - default n - help - GNU Bourne-Again SHell - - http://www.gnu.org/software/bash/ diff --git a/package/bash/Makefile b/package/bash/Makefile index 838bb92e4..b06ee4991 100644 --- a/package/bash/Makefile +++ b/package/bash/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= bash -PKG_VERSION:= 4.0 +PKG_VERSION:= 4.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= a90a1b5a6db4838483f05438e05e8eb9 +PKG_MD5SUM:= 9800d8724815fd84994d9be65ab5e7b8 PKG_DESCR:= Bourne-Again SHell PKG_SECTION:= shells -PKG_URL:= http://www.gnu.org/software/bash +PKG_URL:= http://www.gnu.org/software/bash/ PKG_SITES:= http://ftp.gnu.org/gnu/bash/ include $(TOPDIR)/mk/package.mk @@ -17,9 +17,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BASH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) XAKE_FLAGS+= LIBS_FOR_BUILD='' -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto post-install: $(INSTALL_DIR) $(IDIR_BASH)/bin diff --git a/package/bash/patches/patch-builtins_Makefile_in b/package/bash/patches/patch-builtins_Makefile_in new file mode 100644 index 000000000..69c175663 --- /dev/null +++ b/package/bash/patches/patch-builtins_Makefile_in @@ -0,0 +1,11 @@ +--- bash-4.0.orig/builtins/Makefile.in 2009-01-04 20:32:22.000000000 +0100 ++++ bash-4.0/builtins/Makefile.in 2009-10-21 13:17:04.681674304 +0200 +@@ -56,7 +56,7 @@ LIBBUILD = ${BUILD_DIR}/lib + + PROFILE_FLAGS = @PROFILE_FLAGS@ + CFLAGS = @CFLAGS@ +-CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ @CROSS_COMPILE@ ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ + CPPFLAGS = @CPPFLAGS@ + CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ + LOCAL_CFLAGS = @LOCAL_CFLAGS@ ${DEBUG} |