From: Michael Tremer Date: Sun, 26 Oct 2014 19:51:14 +0000 (+0100) Subject: glibc: Fix build on x86 X-Git-Tag: v2.17-core87~103^2~42 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=8acdb5225dd15f9f09bc22973bf55fda244cd3bf glibc: Fix build on x86 Some files that are patched for ARM are not available on the x86 source tree. Hence the sed command should not be executed. --- diff --git a/lfs/glibc b/lfs/glibc index 194f5565ee..df3e39224f 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -284,8 +284,10 @@ endif # Makefile:235: *** mixed implicit and normal rules. Stop. cd $(DIR_APP) && sed -i 's/ot \$$/ot:\n\ttouch $$@\n$$/' manual/Makefile +ifeq "$(MACHINE_TYPE)" "arm" # http://sourceware.org/ml/libc-ports/2011-09/msg00018.html cd $(DIR_APP) && sed -e "s/PIC/SHARED/g" -i ports/sysdeps/arm/{,eabi/}{set,__long}jmp.S +endif ifeq "$(ROOT)" "" ifeq "$(MACHINE_TYPE)" "arm"