[git commit prelink] Fix GNU make v3.80 compatibility

Kevin Cernekee cernekee at gmail.com
Wed Apr 6 13:19:34 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=32814a2b15829df3a144391f5b8bd46e755f85f5
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/prelink

Commits 1f6601a and 094d82d introduced the "else ifeq" construct, which
requires GNU make v3.81 or higher.  This breaks the build on RHEL4 hosts.

Signed-off-by: Kevin Cernekee <cernekee at gmail.com>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/sysdeps/linux/common/Makefile.in |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
index cf4cf87..bd45d94 100644
--- a/libc/sysdeps/linux/common/Makefile.in
+++ b/libc/sysdeps/linux/common/Makefile.in
@@ -42,9 +42,11 @@ ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 CSRC := $(filter-out fork.c getpid.c raise.c open.c close.c read.c write.c, $(CSRC))
 ifeq ($(TARGET_ARCH),arm)
 CSRC := $(filter-out vfork.c, $(CSRC))
-else ifeq ($(TARGET_ARCH),x86_64)
+else
+ifeq ($(TARGET_ARCH),x86_64)
 CSRC := $(filter-out vfork.c, $(CSRC))
-else ifeq ($(TARGET_ARCH),mips)
+else
+ifeq ($(TARGET_ARCH),mips)
 ifeq ($(CONFIG_MIPS_O32_ABI),y)
 CSRC := $(filter-out waitpid.c, $(CSRC))
 endif
@@ -52,6 +54,8 @@ else
 CSRC := $(filter-out waitpid.c, $(CSRC))
 endif
 endif
+endif
+endif
 
 ifneq ($(ARCH_USE_MMU),y)
 # stubbed out in mman.h
-- 
1.7.3.4



More information about the uClibc-cvs mailing list