diff options
author | maximilian attems <max@stro.at> | 2011-06-03 18:40:05 +0200 |
---|---|---|
committer | maximilian attems <max@stro.at> | 2011-06-03 18:44:14 +0200 |
commit | 271066bb65a65802b3b10b7bf390abd2d4af68dc (patch) | |
tree | fc2902b057870388ec2c086f0f34a7988d8cd5e9 | |
parent | e651cea64590e7921da698cd909723ad658c7167 (diff) | |
download | klibc-271066bb65a65802b3b10b7bf390abd2d4af68dc.tar.gz |
[klibc] dash merge update
add latest config.h.
Also update sync README with newer git features.
Signed-off-by: maximilian attems <max@stro.at>
-rw-r--r-- | usr/dash/README.dash | 20 | ||||
-rw-r--r-- | usr/dash/config.h | 25 |
2 files changed, 37 insertions, 8 deletions
diff --git a/usr/dash/README.dash b/usr/dash/README.dash index cb87a6ed71928..dcce478cb20ff 100644 --- a/usr/dash/README.dash +++ b/usr/dash/README.dash @@ -2,24 +2,28 @@ This version of dash was obtained from git://git.kernel.org/pub/scm/utils/dash/dash.git -It corresponds up to changeset dc2bc17c7bbe3188cfb0c695dc472b39bcf0b27a. +It corresponds up to changeset ec2c84d3c4dba4b74440d72bdd1de416a9acd2a9. HOWTO sync branch: 1) Generate patch and fix up their path -Remember to set Herbert Xu name and email, as format-patch, looses -s blocks: -git format-patch -s <changeset>.. + git format-patch --subject-prefix=klibc -N <changeset>.. Path fixup: -perl -i -pe 's#^([-+]{3} [ab]/)src/#$1#g' 00*patch + perl -i -pe 's#^([-+]{3} [ab]/)src/#$1#g' 00*patch 2) Import patches on by one -git am --directory="usr/dash" --exclude="usr/dash/configure.ac" \ + git am --directory="usr/dash" --exclude="usr/dash/configure.ac" \ --exclude="usr/dash/ChangeLog" --exclude="usr/dash/dash.1" \ --exclude="usr/dash/Makefile.am" --exclude="usr/dash/mksignames.c" \ - -i -s ../dash/000X-foo.patch + --whitespace=fix -k -i -s ../dash/000X-foo.patch -The only changes made are the addition of config.h, Kbuild usage -and the omition of Changelog and manpage. +The only changes made are the addition of config.h, Kbuild usage, +the omition of Changelog and manpage and automatic whitespace fixups. 3) update config.h + +Generate klibc config.h in dash repository: + automake --add-missing + autoreconf + ./configure CC=klcc diff --git a/usr/dash/config.h b/usr/dash/config.h index ea090484acaa8..ebd98f9728530 100644 --- a/usr/dash/config.h +++ b/usr/dash/config.h @@ -10,6 +10,10 @@ /* Define to 1 if you have the `bsearch' function. */ #define HAVE_BSEARCH 1 +/* Define to 1 if you have the declaration of `isblank', and to 0 if you + don't. */ +#define HAVE_DECL_ISBLANK 1 + /* Define to 1 if you have the `faccessat' function. */ /* #undef HAVE_FACCESSAT */ @@ -43,6 +47,9 @@ /* Define to 1 if you have the `mempcpy' function. */ /* #undef HAVE_MEMPCPY */ +/* Define to 1 if you have the <paths.h> header file. */ +#define HAVE_PATHS_H 1 + /* Define to 1 if you have the `sigsetmask' function. */ /* #undef HAVE_SIGSETMASK */ @@ -109,6 +116,15 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "0.5.6" +/* Define to printf format string for intmax_t */ +/* #undef PRIdMAX */ + +/* The size of `intmax_t', as computed by sizeof. */ +#define SIZEOF_INTMAX_T 8 + +/* The size of `long long int', as computed by sizeof. */ +#define SIZEOF_LONG_LONG_INT 8 + /* Define if you build with -DSMALL */ #define SMALL 1 @@ -143,6 +159,15 @@ /* Define to 1 if on MINIX. */ /* #undef _MINIX */ +/* Define to system shell path */ +/* #undef _PATH_BSHELL */ + +/* Define to devnull device node path */ +/* #undef _PATH_DEVNULL */ + +/* Define to tty device node path */ +/* #undef _PATH_TTY */ + /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ /* #undef _POSIX_1_SOURCE */ |