webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into glibc-update2

Browse Source
This commit is contained in:
Michael Tremer
2012-08-22 22:05:14 +02:00
parent c3db745841 cd372b7de2
commit 86837f326e
3 changed files with 130 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lfs/glibc
View File

@@ -237,14 +237,13 @@ endif
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-nss_test1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-libgcc_s.patch
# Fixes:
# Makefile:235: *** mixed implicit and normal rules. Stop.
cd $(DIR_APP) && sed -i 's/ot \$$/ot:\n\ttouch $$@\n$$/' manual/Makefile
# Fix an issue when building glibc with gcc 4.7.
#cd $(DIR_APP) && sed -i "s/ -lgcc_s//" Makeconfig
ifeq "$(ROOT)" ""
ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \