fix ustl package for systems with /bin/install instead of /usr/bin/install

[openwrt.git] / openwrt / package / libelf / Makefile

diff --git a/openwrt/package/libelf/Makefile b/openwrt/package/libelf/Makefile
index 4e82c31..29057b7 100644 (file)
--- a/openwrt/package/libelf/Makefile
+++ b/openwrt/package/libelf/Makefile
@@ -18,8 +18,6 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBELF,libelf,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-.NOTPARALLEL:
-
 $(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
@@ -27,6 +25,11 @@ $(PKG_BUILD_DIR)/.configured:
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
                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) \
@@ -49,29 +52,30 @@ $(PKG_BUILD_DIR)/.configured:
                  $(DISABLE_NLS) \
                  --enable-shared \
                  --enable-static \
+                 --enable-elf64=yes \
        );
-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@
 
 $(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
-               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH)
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \
+               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH) \
                instroot="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@
 
 $(IPKG_LIBELF):
        install -d -m0755 $(IDIR_LIBELF)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(IDIR_LIBELF)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(IDIR_LIBELF)/usr/lib/
        $(RSTRIP) $(IDIR_LIBELF)
        $(IPKG_BUILD) $(IDIR_LIBELF) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libelf.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/libelf* $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libelf* $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libelf.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.{a,so*} $(STAGING_DIR)/usr/lib/
 
 install-dev: $(STAGING_DIR)/usr/lib/libelf.so
 
@@ -79,5 +83,5 @@ uninstall-dev:
        rm -rf $(STAGING_DIR)/usr/include/libelf*
        rm -rf $(STAGING_DIR)/usr/lib/libelf.{a,so*}
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev