diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-10 11:08:51 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-10 11:08:51 +0100 |
| commit | a79d5a546392cad57bb8855f88d4617caa852d27 (patch) | |
| tree | 28a5b26bf27ff1e594e13e6eb5aa76891f8f8aab /recipes/uclibc | |
| parent | 09a85ada712374f567b276067805c19b091a518a (diff) | |
| parent | 6e0172f360053c39bfad106592fbb55509167103 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/uclibc')
| -rw-r--r-- | recipes/uclibc/uclibc-nptl/installfix.patch | 13 | ||||
| -rw-r--r-- | recipes/uclibc/uclibc-nptl/uClibc.distro | 1 | ||||
| -rw-r--r-- | recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch | 12 | ||||
| -rw-r--r-- | recipes/uclibc/uclibc_nptl.bb | 4 |
4 files changed, 29 insertions, 1 deletions
diff --git a/recipes/uclibc/uclibc-nptl/installfix.patch b/recipes/uclibc/uclibc-nptl/installfix.patch new file mode 100644 index 0000000000..61908df179 --- /dev/null +++ b/recipes/uclibc/uclibc-nptl/installfix.patch @@ -0,0 +1,13 @@ +Index: git/Makefile.in +=================================================================== +--- git.orig/Makefile.in 2009-12-04 12:53:00.000000000 -0800 ++++ git/Makefile.in 2009-12-04 16:25:28.000000000 -0800 +@@ -300,7 +300,7 @@ else + endif + + # Installs development library links. +-install_dev: install_headers all ++install_dev: install_headers install_runtime + $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib + -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ + ifeq ($(HAVE_SHARED),y) diff --git a/recipes/uclibc/uclibc-nptl/uClibc.distro b/recipes/uclibc/uclibc-nptl/uClibc.distro index ebd16563f0..e5ac05273a 100644 --- a/recipes/uclibc/uclibc-nptl/uClibc.distro +++ b/recipes/uclibc/uclibc-nptl/uClibc.distro @@ -35,6 +35,7 @@ UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y UCLIBC_HAS___PROGNAME=y UNIX98PTY_ONLY=y ASSUME_DEVPTS=y +UCLIBC_HAS_LIBUTIL=y UCLIBC_HAS_TM_EXTENSIONS=y UCLIBC_HAS_TZ_CACHING=y UCLIBC_HAS_TZ_FILE=y diff --git a/recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch b/recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch new file mode 100644 index 0000000000..8c2b85db13 --- /dev/null +++ b/recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch @@ -0,0 +1,12 @@ +Index: git/libc/inet/rpc/rpc_thread.c +=================================================================== +--- git.orig/libc/inet/rpc/rpc_thread.c 2009-12-04 13:13:09.000000000 -0800 ++++ git/libc/inet/rpc/rpc_thread.c 2009-12-04 13:13:17.000000000 -0800 +@@ -14,6 +14,7 @@ + #ifdef __UCLIBC_HAS_THREADS__ + + #include <bits/libc-tsd.h> ++#include <bits/libc-lock.h> + + /* Variable used in non-threaded applications or for the first thread. */ + static struct rpc_thread_variables __libc_tsd_RPC_VARS_mem; diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb index d5d6d1ab20..a910590ab8 100644 --- a/recipes/uclibc/uclibc_nptl.bb +++ b/recipes/uclibc/uclibc_nptl.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30" -SRCREV="8a6a88f5032ccbc3bfb8836c783a55316b156481" +SRCREV="b3d31460fbf188997c7337296a61409529f7c974" PV = "${UCLIBC_BASE}+gitr${SRCREV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take @@ -34,6 +34,8 @@ SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \ file://uclibc-arm-ftruncate64.patch;patch=1 \ file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ file://uclibc_arm_remove_duplicate_sysdep_defs.patch;patch=1 \ + file://uclibc_rpc_thread.patch;patch=1 \ + file://installfix.patch;patch=1 \ " S = "${WORKDIR}/git" |