summaryrefslogtreecommitdiff
path: root/packages/uclibc
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-18 01:52:40 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-18 01:52:40 +0000
commit0f235b0f42575bfb50dd891cf44aa08c2e404a67 (patch)
tree280012a23de1185e7b135d5a033c60afed8589d3 /packages/uclibc
parent2650645237555cc24c532a4c9ccd81d8c01bcaf7 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/17 19:52:39-06:00 ti.com!kergoth Kill off the dyn-ldconfig patch for uclibc cvs, as the patch was accepted upstream. 2005/01/17 19:48:04-06:00 ti.com!kergoth Update the patcher-native build to set PATCHCMD, in case we want to actually apply patches to it at some point. 2005/01/17 19:45:23-06:00 ti.com!kergoth Add quilt-native and use quilt instead of patcher by default. BKrev: 41ec6be8oJA-Iu3VSh3tCDGFhr_Xkw
Diffstat (limited to 'packages/uclibc')
-rw-r--r--packages/uclibc/uclibc-cvs/dyn-ldconfig.patch34
-rw-r--r--packages/uclibc/uclibc_cvs.bb1
2 files changed, 0 insertions, 35 deletions
diff --git a/packages/uclibc/uclibc-cvs/dyn-ldconfig.patch b/packages/uclibc/uclibc-cvs/dyn-ldconfig.patch
deleted file mode 100644
index a053b9ee81..0000000000
--- a/packages/uclibc/uclibc-cvs/dyn-ldconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- uClibc/utils/Makefile~dyn-ldconfig
-+++ uClibc/utils/Makefile
-@@ -45,7 +45,7 @@
- $(STRIPTOOL) -x -R .note -R .comment $@
-
- ldconfig: ldconfig.c
-- $(CC) $(CFLAGS) -Wl,-s -static \
-+ $(CC) $(CFLAGS) -Wl,-s $(if $(filter $(UCLIBC_STATIC_LDCONFIG),y),-static) \
- -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
- -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I../ldso/include \
- $^ -o $@
---- uClibc/extra/Configs/Config.in~dyn-ldconfig
-+++ uClibc/extra/Configs/Config.in
-@@ -311,6 +311,15 @@
- if you are using an older Linux kernel (2.0.x) that lacks large file
- support. Enabling this option will increase the size of uClibc.
-
-+config UCLIBC_STATIC_LDCONFIG
-+ bool "Link ldconfig statically"
-+ default y
-+ help
-+ If you wish to link the ldconfig binary statically, enable this option.
-+ It being static can be beneficial if you have a library problem and need
-+ ldconfig to recover from it. If keeping the size down is more important
-+ to you than system recovery, disable this option.
-+
- choice
- prompt "Malloc Implementation"
- default MALLOC if ! ARCH_HAS_MMU
diff --git a/packages/uclibc/uclibc_cvs.bb b/packages/uclibc/uclibc_cvs.bb
index 3d303a8795..27e306c29e 100644
--- a/packages/uclibc/uclibc_cvs.bb
+++ b/packages/uclibc/uclibc_cvs.bb
@@ -63,7 +63,6 @@ UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCAL
SRC_URI = "cvs://anonymous:@uclibc.org/var/cvs;module=uClibc \
${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) == 'no']} \
file://nokernelheadercheck.patch;patch=1 \
- file://dyn-ldconfig.patch;patch=1 \
file://uClibc.config"
S = "${WORKDIR}/uClibc"