diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/glibc/files/glibc-includes-fixed-isystem.patch | 32 | ||||
| -rw-r--r-- | packages/klibc/files/dash_readopt.patch | 105 | ||||
| -rw-r--r-- | packages/klibc/klibc-common.inc | 1 | ||||
| -rw-r--r-- | packages/klibc/klibc-utils-static_1.5.bb | 2 | ||||
| -rw-r--r-- | packages/klibc/klibc_1.5.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-rp_2.6.24.bb | 4 | ||||
| -rw-r--r-- | packages/ncurses/ncurses.inc | 3 | ||||
| -rw-r--r-- | packages/ncurses/ncurses_5.4.bb | 2 |
8 files changed, 146 insertions, 5 deletions
diff --git a/packages/glibc/files/glibc-includes-fixed-isystem.patch b/packages/glibc/files/glibc-includes-fixed-isystem.patch new file mode 100644 index 0000000000..06668f41ed --- /dev/null +++ b/packages/glibc/files/glibc-includes-fixed-isystem.patch @@ -0,0 +1,32 @@ +http://sourceware.org/ml/libc-alpha/2007-03/msg00017.html: + +GCC trunk now has multiple internal headers directories, one +containing the self-contained GCC-provided headers and one containing +the <limits.h> (not self-contained but including libc's <limits.h> or +a fixed version thereof) and the fixed headers; more such directories +may be added in future. + +When glibc uses -nostdinc, it needs to use -isystem options for all +these internal directories. This patch teaches it about the +include-fixed directory (and is harmless with old GCC versions without +that directory). + +2007-03-18 Joseph Myers <joseph@codesourcery.com> + + * configure.in: Also pass -isystem option for GCC's include-fixed + directory. + * configure: Regenerate. + +Index: configure.in +=================================================================== +--- /tmp/configure.in 2008-04-05 19:20:52.176759390 +0200 ++++ glibc-2.6.1/configure.in 2008-04-05 19:21:26.663424600 +0200 +@@ -912,7 +912,7 @@ + # thing on a system that doesn't need fixincludes. (Not presently a problem.) + if test -n "$sysheaders"; then + ccheaders=`$CC -print-file-name=include` +- SYSINCLUDES="-nostdinc -isystem $ccheaders \ ++ SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \ + -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`" + if test -n "$CXX"; then + cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && diff --git a/packages/klibc/files/dash_readopt.patch b/packages/klibc/files/dash_readopt.patch new file mode 100644 index 0000000000..49bc087edd --- /dev/null +++ b/packages/klibc/files/dash_readopt.patch @@ -0,0 +1,105 @@ +Index: klibc-1.5/usr/dash/miscbltin.c +=================================================================== +--- klibc-1.5.orig/usr/dash/miscbltin.c 2008-03-27 20:38:09.354564817 +0100 ++++ klibc-1.5/usr/dash/miscbltin.c 2008-04-04 18:05:32.063364195 +0200 +@@ -46,6 +46,7 @@ + #include <ctype.h> + #include <stdint.h> + #include <time.h> /* strtotimeval() */ ++#include <termios.h> + + #include "shell.h" + #include "options.h" +@@ -83,6 +84,11 @@ + int timeout; + int i; + fd_set set; ++ int n_flag = 0; ++ unsigned int nchars = 0; ++ int silent = 0; ++ struct termios tty, old_tty; ++ + struct timeval ts, t0, t1, to; + + ts.tv_sec = ts.tv_usec = 0; +@@ -90,11 +96,18 @@ + rflag = 0; + timeout = 0; + prompt = NULL; +- while ((i = nextopt("p:rt:")) != '\0') { ++ while ((i = nextopt("p:rt:n:s")) != '\0') { + switch(i) { + case 'p': + prompt = optionarg; + break; ++ case 'n': ++ nchars = strtoul(optionarg, NULL, 10); ++ n_flag = nchars; /* just a flag "nchars is nonzero" */ ++ break; ++ case 's': ++ silent = 1; ++ break; + case 't': + p = strtotimeval(optionarg, &ts); + if (*p || (!ts.tv_sec && !ts.tv_usec)) +@@ -118,6 +131,23 @@ + sh_error("arg count"); + if ((ifs = bltinlookup("IFS")) == NULL) + ifs = defifs; ++ if (n_flag || silent) { ++ if (tcgetattr(0, &tty) != 0) { ++ /* Not a tty */ ++ n_flag = 0; ++ silent = 0; ++ } else { ++ old_tty = tty; ++ if (n_flag) { ++ tty.c_lflag &= ~ICANON; ++ tty.c_cc[VMIN] = nchars < 256 ? nchars : 255; ++ } ++ if (silent) { ++ tty.c_lflag &= ~(ECHO | ECHOK | ECHONL); ++ } ++ tcsetattr(0, TCSANOW, &tty); ++ } ++ } + status = 0; + startword = 1; + backslash = 0; +@@ -133,13 +163,15 @@ + ts.tv_sec += t0.tv_sec; + } + STARTSTACKSTR(p); +- for (;;) { ++ do { + if (timeout) { + gettimeofday(&t1, NULL); + if (t1.tv_sec > ts.tv_sec || + (t1.tv_sec == ts.tv_sec && + t1.tv_usec >= ts.tv_usec)) { + status = 1; ++ if (n_flag) ++ tcsetattr(0, TCSANOW, &old_tty); + break; /* Timeout! */ + } + +@@ -156,6 +188,8 @@ + FD_SET(0, &set); + if (select(1, &set, NULL, NULL, &to) != 1) { + status = 1; ++ if (n_flag) ++ tcsetattr(0, TCSANOW, &old_tty); + break; /* Timeout! */ + } + } +@@ -191,7 +225,9 @@ + put: + STPUTC(c, p); + } +- } ++ } while (!n_flag || --nchars); ++ if (n_flag || silent) ++ tcsetattr(0, TCSANOW, &old_tty); + STACKSTRNUL(p); + /* Remove trailing blanks */ + while ((char *)stackblock() <= --p && strchr(ifs, *p) != NULL) diff --git a/packages/klibc/klibc-common.inc b/packages/klibc/klibc-common.inc index 41859d3243..5e890b3bc8 100644 --- a/packages/klibc/klibc-common.inc +++ b/packages/klibc/klibc-common.inc @@ -8,6 +8,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2 \ file://fstype-sane-vfat-and-jffs2-for-1.5.patch;patch=1 \ file://modprobe.patch;patch=1 \ file://losetup.patch;patch=1 \ + file://dash_readopt.patch;patch=1 \ " S = "${WORKDIR}/klibc-${PV}" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb index c6f54489ab..f0429e34a2 100644 --- a/packages/klibc/klibc-utils-static_1.5.bb +++ b/packages/klibc/klibc-utils-static_1.5.bb @@ -1,6 +1,6 @@ require klibc-common.inc -PR = "r8" +PR = "r9" # We only want the static utils. klibc build both. So we install only what we want. do_install() { diff --git a/packages/klibc/klibc_1.5.bb b/packages/klibc/klibc_1.5.bb index 925dcd0c36..967f88f948 100644 --- a/packages/klibc/klibc_1.5.bb +++ b/packages/klibc/klibc_1.5.bb @@ -1,2 +1,2 @@ require klibc.inc -PR = "r6" +PR = "r7" diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index 84a479eb02..62dca60e2a 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r8" +PR = "r9" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" @@ -100,7 +100,7 @@ SRC_URI_append_collie = "\ ${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \ ${TKSRC}/sa1100_spinlock.patch;patch=1 \ ${TKSRC}/sa1100-dma.patch;patch=1 \ - ${TKSRC}/sa1100_udc_g_ether.patch;patch=1 \ + ${TKSRC}/sa1100_udc_g_ether-2.patch;patch=1 \ " SRC_URI_append_poodle = "\ diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc index 9b4fff50ad..7b1d2cb022 100644 --- a/packages/ncurses/ncurses.inc +++ b/packages/ncurses/ncurses.inc @@ -83,6 +83,9 @@ pkg_prerm_ncurses-tools () { PACKAGES =+ "${PN}-ncurses ${PN}-panel ${PN}-menu ${PN}-form ${PN}-terminfo ${PN}-tools" FILES_${PN}-ncurses = "${libdir}/libncurses.so.*" +# You can'r really run any ncurses app without terminfo files, which is why the packaging was that way before mickeyl broke it. +# This RRECOMMENDS should pull in terminfo to fix that +RRECOMMENDS_${PN}-ncurses = "${PN}-terminfo" FILES_${PN}-panel = "${libdir}/libpanel.so.*" FILES_${PN}-menu = "${libdir}/libmenu.so.*" FILES_${PN}-form = "${libdir}/libform.so.*" diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb index 00dd7d1d1a..d73164d3c0 100644 --- a/packages/ncurses/ncurses_5.4.bb +++ b/packages/ncurses/ncurses_5.4.bb @@ -1,4 +1,4 @@ -PR = "r13" +PR = "r14" SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ file://visibility.patch;patch=1" |