X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Flibelf%2FMakefile;h=f4b0eed18e3eac376aa05032463d1f1b4adb25c4;hp=d861b9584ef023fb68ec57ed57a8dc6504148512;hb=72ccd5bd4aee6ece340ab7c4caba10695611b6b6;hpb=a7217e6ec9fa8964e90f53492cc1542637acbd5c

diff --git a/libs/libelf/Makefile b/libs/libelf/Makefile
index d861b9584e..f4b0eed18e 100644
--- a/libs/libelf/Makefile
+++ b/libs/libelf/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=libelf
 PKG_VERSION:=0.8.8
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.mr511.de/software/
 PKG_MD5SUM:=be84e553686dd50c8b6d520f86f46521
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,62 +26,29 @@ define Package/libelf
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=ELF object file access library
-  DESCRIPTION:=ELF object file access library
   URL:=http://www.stud.uni-hannover.de/~michael/software/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+		--enable-elf64=yes \
+		, \
 		mr_cv_target_elf=yes \
 		libelf_64bit=yes \
 		libelf_cv_struct_elf64_ehdr=yes \
 		libelf_cv_type_elf64_addr=no \
 		libelf_cv_struct_elf64_rel=yes \
-		ac_cv_sizeof_long_long=8 \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--enable-static \
-			--enable-elf64=yes \
-	);
+	)
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" LD="$(TARGET_CROSS)ld" ARCH=$(ARCH) \
 		instroot="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libelf/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/libelf* $(STAGING_DIR)/usr/include/
@@ -95,4 +62,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libelf.{a,so*}
 endef
 
+define Package/libelf/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libelf))