[git.ipfire.org] IPFire 2.x development tree branch, seventeen, updated. 8acdb5225dd15f9f09bc22973bf55fda244cd3bf

[git.ipfire.org] IPFire 2.x development tree branch, seventeen, updated. 8acdb5225dd15f9f09bc22973bf55fda244cd3bf

[git]

[-- Attachment #1: Type: text/plain, Size: 1665 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, seventeen has been updated
       via  8acdb5225dd15f9f09bc22973bf55fda244cd3bf (commit)
      from  57629914e8dd6559c163093312bd51adf677ddb7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8acdb5225dd15f9f09bc22973bf55fda244cd3bf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Oct 26 20:51:14 2014 +0100

    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.

-----------------------------------------------------------------------

Summary of changes:
 lfs/glibc | 2 ++
 1 file changed, 2 insertions(+)

Difference in files:
diff --git a/lfs/glibc b/lfs/glibc
index 194f556..df3e392 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"


hooks/post-receive
--
IPFire 2.x development tree