diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-core/eglibc/eglibc-2.12 | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-2.12')
6 files changed, 204 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch new file mode 100644 index 0000000000..4d3e0613b1 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.12/IO-acquire-lock-fix.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html | ||
2 | |||
3 | Index: libc/bits/stdio-lock.h | ||
4 | =================================================================== | ||
5 | --- libc.orig/bits/stdio-lock.h 2009-10-28 14:34:19.000000000 -0700 | ||
6 | +++ libc/bits/stdio-lock.h 2009-10-28 14:34:54.000000000 -0700 | ||
7 | @@ -50,6 +50,8 @@ __libc_lock_define_recursive (typedef, _ | ||
8 | _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \ | ||
9 | _IO_flockfile (_fp) | ||
10 | |||
11 | +# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp) | ||
12 | + | ||
13 | # define _IO_release_lock(_fp) \ | ||
14 | _IO_funlockfile (_fp); \ | ||
15 | _IO_cleanup_region_end (0) | ||
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch b/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch new file mode 100644 index 0000000000..6ab306180c --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.12/armv4t-interworking.patch | |||
@@ -0,0 +1,78 @@ | |||
1 | Index: libc/ports/sysdeps/arm/memcpy.S | ||
2 | =================================================================== | ||
3 | --- libc.orig/ports/sysdeps/arm/memcpy.S 2009-09-03 16:12:00.000000000 -0700 | ||
4 | +++ libc/ports/sysdeps/arm/memcpy.S 2009-10-28 12:51:22.000000000 -0700 | ||
5 | @@ -130,7 +130,12 @@ ENTRY(memcpy) | ||
6 | strcsb r4, [r0], #1 | ||
7 | strcsb ip, [r0] | ||
8 | |||
9 | +#if defined (__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__) | ||
10 | + ldmfd sp!, {r0, r4, lr} | ||
11 | + bx lr | ||
12 | +#else | ||
13 | ldmfd sp!, {r0, r4, pc} | ||
14 | +#endif | ||
15 | |||
16 | 9: rsb ip, ip, #4 | ||
17 | cmp ip, #2 | ||
18 | Index: libc/ports/sysdeps/arm/memmove.S | ||
19 | =================================================================== | ||
20 | --- libc.orig/ports/sysdeps/arm/memmove.S 2009-09-03 16:12:00.000000000 -0700 | ||
21 | +++ libc/ports/sysdeps/arm/memmove.S 2009-10-28 12:51:22.000000000 -0700 | ||
22 | @@ -144,7 +144,12 @@ ENTRY(memmove) | ||
23 | strneb r3, [r0, #-1]! | ||
24 | strcsb r4, [r0, #-1]! | ||
25 | strcsb ip, [r0, #-1] | ||
26 | +#if defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__) | ||
27 | + ldmfd sp!, {r0, r4, lr} | ||
28 | + bx lr | ||
29 | +#else | ||
30 | ldmfd sp!, {r0, r4, pc} | ||
31 | +#endif | ||
32 | |||
33 | 9: cmp ip, #2 | ||
34 | ldrgtb r3, [r1, #-1]! | ||
35 | Index: libc/ports/sysdeps/unix/sysv/linux/arm/clone.S | ||
36 | =================================================================== | ||
37 | --- libc.orig/ports/sysdeps/unix/sysv/linux/arm/clone.S 2009-09-03 16:12:04.000000000 -0700 | ||
38 | +++ libc/ports/sysdeps/unix/sysv/linux/arm/clone.S 2009-10-28 12:51:22.000000000 -0700 | ||
39 | @@ -96,8 +96,14 @@ ENTRY(__clone) | ||
40 | #endif | ||
41 | @ pick the function arg and call address off the stack and execute | ||
42 | ldr r0, [sp, #4] | ||
43 | +#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__) | ||
44 | + ldr ip, [sp], #8 | ||
45 | + mov lr, pc | ||
46 | + bx ip | ||
47 | +#else | ||
48 | mov lr, pc | ||
49 | ldr pc, [sp], #8 | ||
50 | +#endif | ||
51 | |||
52 | @ and we are done, passing the return value through r0 | ||
53 | b PLTJMP(HIDDEN_JUMPTARGET(_exit)) | ||
54 | Index: libc/ports/sysdeps/unix/sysv/linux/arm/sysdep.h | ||
55 | =================================================================== | ||
56 | --- libc.orig/ports/sysdeps/unix/sysv/linux/arm/sysdep.h 2009-09-16 13:58:18.000000000 +0100 | ||
57 | +++ libc/ports/sysdeps/unix/sysv/linux/arm/sysdep.h 2009-11-03 19:17:16.000000000 +0000 | ||
58 | @@ -129,6 +129,11 @@ | ||
59 | DO_RET(lr); \ | ||
60 | 1: .word C_SYMBOL_NAME(rtld_errno) - 0b - 8; | ||
61 | # else | ||
62 | +#if defined(__ARM_ARCH_4T__) && defined(__THUMB_INTERWORK__) | ||
63 | +#define POP_PC ldr lr, [sp], #4; bx lr | ||
64 | +#else | ||
65 | +#define POP_PC ldr pc, [sp], #4 | ||
66 | +#endif | ||
67 | # define SYSCALL_ERROR_HANDLER \ | ||
68 | __local_syscall_error: \ | ||
69 | str lr, [sp, #-4]!; \ | ||
70 | @@ -138,7 +143,7 @@ | ||
71 | rsb r1, r1, #0; \ | ||
72 | str r1, [r0]; \ | ||
73 | mvn r0, #0; \ | ||
74 | - ldr pc, [sp], #4; | ||
75 | + POP_PC; | ||
76 | # endif | ||
77 | #else | ||
78 | # define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */ | ||
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch new file mode 100644 index 0000000000..99c3fef802 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.12/eglibc-svn-arm-lowlevellock-include-tls.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21: | ||
2 | ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private': | ||
3 | ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM' | ||
4 | ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function) | ||
5 | ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once | ||
6 | ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.) | ||
7 | ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function) | ||
8 | make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1 | ||
9 | |||
10 | --- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig | ||
11 | +++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h | ||
12 | @@ -25,6 +25,7 @@ | ||
13 | #include <atomic.h> | ||
14 | #include <sysdep.h> | ||
15 | #include <kernel-features.h> | ||
16 | +#include <tls.h> | ||
17 | |||
18 | #define FUTEX_WAIT 0 | ||
19 | #define FUTEX_WAKE 1 | ||
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/etc/ld.so.conf b/meta/recipes-core/eglibc/eglibc-2.12/etc/ld.so.conf new file mode 100644 index 0000000000..dfa65edb85 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.12/etc/ld.so.conf | |||
@@ -0,0 +1,2 @@ | |||
1 | /usr/local/lib | ||
2 | /usr/X11R6/lib | ||
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/generate-supported.mk b/meta/recipes-core/eglibc/eglibc-2.12/generate-supported.mk new file mode 100644 index 0000000000..d2a28c2dc6 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.12/generate-supported.mk | |||
@@ -0,0 +1,11 @@ | |||
1 | #!/usr/bin/make | ||
2 | |||
3 | include $(IN) | ||
4 | |||
5 | all: | ||
6 | rm -f $(OUT) | ||
7 | touch $(OUT) | ||
8 | for locale in $(SUPPORTED-LOCALES); do \ | ||
9 | [ $$locale = true ] && continue; \ | ||
10 | echo $$locale | sed 's,/, ,' >> $(OUT); \ | ||
11 | done | ||
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch b/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch new file mode 100644 index 0000000000..57835adcdb --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.12/shorten-build-commands.patch | |||
@@ -0,0 +1,79 @@ | |||
1 | Source: http://sourceware.org/ml/libc-alpha/2010-03/msg00064.html | ||
2 | |||
3 | This patch scratches an itch. Each individual gcc command in the | ||
4 | glibc build is over 1K, which means it takes up a good chunk of my | ||
5 | terminal. Most of that is include paths. Any version of GCC new | ||
6 | enough to build glibc supports response files, which were added in | ||
7 | 2005. So use a response file for the static list of include paths. | ||
8 | Now the build commands are a lot shorter, and easier to use when | ||
9 | developing glibc. | ||
10 | |||
11 | Tested on x86_64-linux-gnu. Please apply if acceptable. | ||
12 | |||
13 | -- | ||
14 | Daniel Jacobowitz | ||
15 | CodeSourcery | ||
16 | |||
17 | 2010-03-30 Daniel Jacobowitz <dan@codesourcery.com> | ||
18 | |||
19 | * Makeconfig (+common-includes): Define. | ||
20 | (+includes): Use @$(common-objpfx)includes. | ||
21 | * Makefile (postclean): Remove includes and includes.mk. | ||
22 | * Makerules ($(common-objpfx)includes.mk): Include and create | ||
23 | includes.mk. Create includes. | ||
24 | |||
25 | Index: libc/Makeconfig | ||
26 | =================================================================== | ||
27 | --- libc.orig/Makeconfig 2009-10-13 22:55:12.000000000 -0700 | ||
28 | +++ libc/Makeconfig 2010-03-31 16:02:37.120489733 -0700 | ||
29 | @@ -678,9 +678,10 @@ endif # $(+cflags) == "" | ||
30 | # library source directory, in the include directory, and in the | ||
31 | # current directory. | ||
32 | +sysdep-includes = $(addprefix -I,$(+sysdep_dirs)) | ||
33 | ++common-includes = $(+sysdep-includes) $(includes) $(sysincludes) | ||
34 | +includes = -I$(..)include $(if $(subdir),$(objpfx:%/=-I%)) \ | ||
35 | - $(+sysdep-includes) $(includes) \ | ||
36 | - $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes) | ||
37 | + @$(common-objpfx)includes \ | ||
38 | + $(patsubst %/,-I%,$(..)) $(libio-include) -I. | ||
39 | |||
40 | # Since libio has several internal header files, we use a -I instead | ||
41 | # of many little headers in the include directory. | ||
42 | Index: libc/Makefile | ||
43 | =================================================================== | ||
44 | --- libc.orig/Makefile 2009-12-09 12:06:28.000000000 -0800 | ||
45 | +++ libc/Makefile 2010-03-31 16:02:37.132481508 -0700 | ||
46 | @@ -247,7 +247,7 @@ parent-mostlyclean: common-mostlyclean # | ||
47 | parent-clean: parent-mostlyclean common-clean | ||
48 | |||
49 | postclean = $(addprefix $(common-objpfx),$(postclean-generated)) \ | ||
50 | - $(addprefix $(objpfx),sysd-dirs sysd-rules) \ | ||
51 | + $(addprefix $(objpfx),sysd-dirs sysd-rules includes includes.mk) \ | ||
52 | $(addprefix $(objpfx),sysd-sorted soversions.mk soversions.i) | ||
53 | |||
54 | clean: parent-clean | ||
55 | Index: libc/Makerules | ||
56 | =================================================================== | ||
57 | --- libc.orig/Makerules 2009-12-09 12:06:28.000000000 -0800 | ||
58 | +++ libc/Makerules 2010-03-31 16:02:37.140481645 -0700 | ||
59 | @@ -254,6 +254,20 @@ ifndef sysd-rules-done | ||
60 | no_deps=t | ||
61 | endif | ||
62 | |||
63 | +-include $(common-objpfx)includes.mk | ||
64 | +ifneq ($(+common-includes),$(saved-includes)) | ||
65 | +# Recreate includes.mk (and includes). | ||
66 | +includes-force = FORCE | ||
67 | +FORCE: | ||
68 | +endif | ||
69 | +$(common-objpfx)includes.mk: $(includes-force) | ||
70 | + -@rm -f $@T $(common-objpfx)includesT | ||
71 | + for inc in $(+common-includes); do echo "$$inc"; done \ | ||
72 | + > $(common-objpfx)includesT | ||
73 | + mv -f $(common-objpfx)includesT $(common-objpfx)includes | ||
74 | + echo 'saved-includes := $(+common-includes)' > $@T | ||
75 | + mv -f $@T $@ | ||
76 | + | ||
77 | define o-iterator-doit | ||
78 | $(objpfx)%$o: %.S $(before-compile); $$(compile-command.S) | ||
79 | endef | ||