From 9fe4c7b56dc67b5e624c4ec3a2c5ae8d823fae53 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Mon, 24 Sep 2007 07:34:02 +0000
Subject: - bump version and make it compile also if 64bit is unavailable

---
 package/libelf/libelf.mk | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'package/libelf/libelf.mk')

diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index 293043199..d1443d9bb 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -3,7 +3,7 @@
 # libelf
 #
 #############################################################
-LIBELF_VERSION=0.8.9
+LIBELF_VERSION=0.8.10
 LIBELF_SOURCE=libelf-$(LIBELF_VERSION).tar.gz
 LIBELF_SITE=http://www.mr511.de/software/
 LIBELF_DIR=$(BUILD_DIR)/libelf-$(LIBELF_VERSION)
@@ -13,6 +13,10 @@ ifeq ("$(strip $(ARCH))","armeb")
 LIBELF_ARCH:=arm
 endif
 
+ifeq ($(BR2_LARGEFILE),y)
+LIBELF_CONFIG:=--enable-elf64
+endif
+
 $(DL_DIR)/$(LIBELF_SOURCE):
 	$(WGET) -P $(DL_DIR) $(LIBELF_SITE)/$(LIBELF_SOURCE)
 
@@ -23,19 +27,24 @@ $(LIBELF_DIR)/.unpacked: $(DL_DIR)/$(LIBELF_SOURCE)
 	touch $@
 
 $(LIBELF_DIR)/.configured: $(LIBELF_DIR)/.unpacked
-	(cd $(LIBELF_DIR); \
+	(cd $(LIBELF_DIR); rm -f config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
 		libelf_cv_working_memmove=yes \
 		mr_cv_target_elf=yes \
+		libelf_64bit=yes \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		$(DISABLE_NLS) \
 		--enable-shared \
+		--disable-debug \
+		--disable-sanity-checks \
+		$(LIBELF_CONFIG) \
+		$(DISABLE_NLS) \
 	)
 	touch $@
 
@@ -43,14 +52,14 @@ $(LIBELF_DIR)/lib/libelf.so.$(LIBELF_VERSION): $(LIBELF_DIR)/.configured
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBELF_DIR)
 
 $(STAGING_DIR)/usr/lib/libelf.a $(STAGING_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION): $(LIBELF_DIR)/lib/libelf.so.$(LIBELF_VERSION)
-	$(MAKE1) $(TARGET_CONFIGURE_OPTS) \
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		instroot=$(STAGING_DIR) -C $(LIBELF_DIR) install
 
 ifeq ($(BR2_PACKAGE_LIBELF_HEADERS),y)
 $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION): $(STAGING_DIR)/usr/lib/libelf.a
 	$(INSTALL) $(STAGING_DIR)/usr/lib/libelf* $(@D)
 	cp -dpR $(STAGING_DIR)/usr/include/{gelf.h,libelf*} $(TARGET_DIR)/usr/include/
-	$(STRIP) $@
+	$(STRIP) $(STRIP_STRIP_UNNEEDED) $@
 
 libelf: uclibc $(TARGET_DIR)/usr/lib/libelf.so.$(LIBELF_VERSION)
 else
-- 
cgit v1.2.3