diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-09 06:30:34 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-09 06:46:28 +0000 |
commit | f5f7dc0746f7a4eaf38a6b2cb3beedcacf8da294 (patch) | |
tree | 7c19f65b6aa2a22453e9c69c4ccff283ba529c79 | |
parent | bd2baf32cd05f8a7631dbf100182b5077a16e077 (diff) | |
download | alpine_aports-f5f7dc0746f7a4eaf38a6b2cb3beedcacf8da294.tar.bz2 alpine_aports-f5f7dc0746f7a4eaf38a6b2cb3beedcacf8da294.tar.xz alpine_aports-f5f7dc0746f7a4eaf38a6b2cb3beedcacf8da294.zip |
main/libc0.9.32: fix static linking
solves issue when linking static apk-tools
(cherry picked from commit ef92ec9cb4a5eb8ffc3a352cf2dec7e7e8160a8b)
-rw-r--r-- | main/libc0.9.32/APKBUILD | 4 | ||||
-rw-r--r-- | main/libc0.9.32/ld-tls.patch | 16 |
2 files changed, 19 insertions, 1 deletions
diff --git a/main/libc0.9.32/APKBUILD b/main/libc0.9.32/APKBUILD index 2acccb9a88..11843bdfc1 100644 --- a/main/libc0.9.32/APKBUILD +++ b/main/libc0.9.32/APKBUILD | |||
@@ -3,7 +3,7 @@ _abiver=0.9.32 | |||
3 | pkgname=libc$_abiver | 3 | pkgname=libc$_abiver |
4 | _gitver=1008060645 | 4 | _gitver=1008060645 |
5 | pkgver=${_abiver}_alpha0_git$_gitver | 5 | pkgver=${_abiver}_alpha0_git$_gitver |
6 | pkgrel=3 | 6 | pkgrel=4 |
7 | pkgdesc="C library for developing embedded Linux systems" | 7 | pkgdesc="C library for developing embedded Linux systems" |
8 | url=http://uclibc.org | 8 | url=http://uclibc.org |
9 | license="LGPL-2" | 9 | license="LGPL-2" |
@@ -24,6 +24,7 @@ source="http://build.alpinelinux.org:8010/distfiles/$_snapfile | |||
24 | 0001-netdb-increase-line-size-for-etc-services.patch | 24 | 0001-netdb-increase-line-size-for-etc-services.patch |
25 | 0001-create-DEVEL_PREFIX-MULTILIB_DIR-dir-rather-than-DEV.patch | 25 | 0001-create-DEVEL_PREFIX-MULTILIB_DIR-dir-rather-than-DEV.patch |
26 | getproto.patch | 26 | getproto.patch |
27 | ld-tls.patch | ||
27 | uclibcconfig.x86 | 28 | uclibcconfig.x86 |
28 | uclibcconfig.i486 | 29 | uclibcconfig.i486 |
29 | " | 30 | " |
@@ -112,5 +113,6 @@ d351ca4e5c33f4a7a60d4f1d754db5c4 0001-config-parser-fix-memory-corruption.patch | |||
112 | 39ac96d750ad058030f917912bfea466 0001-netdb-increase-line-size-for-etc-services.patch | 113 | 39ac96d750ad058030f917912bfea466 0001-netdb-increase-line-size-for-etc-services.patch |
113 | 9dd8192227f54d6d3ccb49dc54137ff3 0001-create-DEVEL_PREFIX-MULTILIB_DIR-dir-rather-than-DEV.patch | 114 | 9dd8192227f54d6d3ccb49dc54137ff3 0001-create-DEVEL_PREFIX-MULTILIB_DIR-dir-rather-than-DEV.patch |
114 | 18afaad25c578bfbe1c7ddb0bea1228a getproto.patch | 115 | 18afaad25c578bfbe1c7ddb0bea1228a getproto.patch |
116 | b769ffe8e6df01328fc6afb4b50da1cd ld-tls.patch | ||
115 | e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86 | 117 | e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.x86 |
116 | e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486" | 118 | e2eb3bb00a0fe4d6f3d5b5c56b027bab uclibcconfig.i486" |
diff --git a/main/libc0.9.32/ld-tls.patch b/main/libc0.9.32/ld-tls.patch new file mode 100644 index 0000000000..057191c57e --- /dev/null +++ b/main/libc0.9.32/ld-tls.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in | ||
2 | index 99a726a..3e9676a 100644 | ||
3 | --- a/libpthread/nptl/Makefile.in | ||
4 | +++ b/libpthread/nptl/Makefile.in | ||
5 | @@ -48,9 +48,9 @@ libc-shared-routines-y := $(addprefix $(libpthread_OUT)/,$(libc-shared-routines- | ||
6 | libc-static-routines-y := $(addprefix $(libpthread_OUT)/,$(libc-static-routines-y:.c=.o)) | ||
7 | libc-shared-y += $(libc-shared-routines-y) $(libpthread_libc_OBJS:.o=.oS) | ||
8 | ifeq ($(DOPIC),y) | ||
9 | -libc-static-y += $(libc-static-routines-y:.o=.os) $(libpthread_libc_a_OBJS:.o=.os) # $(libpthread_ld_tls_COBJ:.o=.os) | ||
10 | +libc-static-y += $(libc-static-routines-y:.o=.os) $(libpthread_libc_a_OBJS:.o=.os) $(libpthread_ld_tls_COBJ:.o=.os) | ||
11 | else | ||
12 | -libc-static-y += $(libc-static-routines-y) $(libpthread_libc_a_OBJS) # $(libpthread_ld_tls_COBJ) | ||
13 | +libc-static-y += $(libc-static-routines-y) $(libpthread_libc_a_OBJS) $(libpthread_ld_tls_COBJ) | ||
14 | endif | ||
15 | |||
16 | librt-pt-routines-y := $(patsubst %.c,$(libpthread_pthread_OUT)/%.o,$(filter-out $(notdir $(libpthread_librt_OBJS:.o=.c)), $(librt-pt-routines-y))) | ||