X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c18a2411a73370abd0efaf5c078a3fe7ea565eaf..a21cc0882d2e77f0d383ea85e0ee55d3a92637eb:/package/Makefile diff --git a/package/Makefile b/package/Makefile index 362a63cc8..786edd49f 100644 --- a/package/Makefile +++ b/package/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -17,12 +17,13 @@ else $(curdir)/builddirs-install:=. $(sort $(package-y)) endif ifneq ($(IGNORE_ERRORS),) - $(curdir)/builddirs-ignore-compile:= $(if $(filter m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(m))),$(package-m)) + $(curdir)/builddirs-ignore-compile:= $(if $(filter n m y, $(IGNORE_ERRORS)),$(foreach m,$(IGNORE_ERRORS),$(package-$(subst n,,$(m)))),$(package-m) $(package-)) endif $(curdir)/install:=$(curdir)/install-cleanup $(curdir)/cleanup: $(TMP_DIR)/.build + - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 rm -rf $(TARGET_DIR) $(STAGING_DIR_ROOT) ifdef CONFIG_USE_MKLIBS @@ -37,13 +38,14 @@ ifdef CONFIG_USE_MKLIBS file -r -N -F '' {} + | \ awk ' /shared object/ { print $$1 }' >> $(TMP_DIR)/mklibs-progs mkdir -p $(TMP_DIR)/mklibs-out - $(STAGING_DIR_HOST)/bin/mklibs.py -D -v \ + $(STAGING_DIR_HOST)/bin/mklibs.py -D \ -d $(TMP_DIR)/mklibs-out \ --sysroot $(STAGING_DIR_ROOT) \ -L /lib \ -L /usr/lib \ + -L /usr/lib/ebtables \ --ldlib $(patsubst $(STAGING_DIR_ROOT)/%,/%,$(firstword $(wildcard \ - $(foreach name,ld-uClibc.so.* ld-linux.so.*, \ + $(foreach name,ld-uClibc.so.* ld-linux.so.* ld-*.so, \ $(STAGING_DIR_ROOT)/lib/$(name) \ )))) \ --target $(REAL_GNU_TARGET_NAME) \ @@ -75,7 +77,7 @@ $(curdir)/rootfs-prepare: $(TMP_DIR)/.build @-find $(TARGET_DIR) -name CVS | $(XARGS) rm -rf @-find $(TARGET_DIR) -name .svn | $(XARGS) rm -rf @-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f - $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/ipkg) + $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg) $(call mklibs) $(curdir)/index: FORCE