package/ppp: fix typo in r28868 (closes: #10429)

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index e9bed9b..7d2c42d 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,10 +1,9 @@
 #
-# 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.
 #
-# $Id$
 
 curdir:=package
 
@@ -15,20 +14,64 @@ ifeq ($(SDK),1)
 else
   $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))
   $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
-  $(curdir)/builddirs-install:=. $(sort $(package-y))
+  $(curdir)/builddirs-install:=. $(filter-out base-files,$(sort $(package-y))) $(filter base-files,$(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
-       rm -rf $(TARGET_DIR)
+       - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
+       rm -rf $(TARGET_DIR) $(STAGING_DIR_ROOT)
+
+ifdef CONFIG_USE_MKLIBS
+  define mklibs
+       rm -rf $(TMP_DIR)/mklibs-progs $(TMP_DIR)/mklibs-out
+       # first find all programs and add them to the mklibs list
+       find $(STAGING_DIR_ROOT) -type f -perm +100 -exec \
+               file -r -N -F '' {} + | \
+               awk ' /executable.*dynamically/ { print $$1 }' > $(TMP_DIR)/mklibs-progs
+       # find all loadable objects that are not regular libraries and add them to the list as well
+       find $(STAGING_DIR_ROOT) -type f -name \*.so\* -exec \
+               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 \
+               -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.* ld-*.so, \
+                         $(STAGING_DIR_ROOT)/lib/$(name) \
+                       )))) \
+               --target $(REAL_GNU_TARGET_NAME) \
+               `cat $(TMP_DIR)/mklibs-progs` 2>&1
+       $(RSTRIP) $(TMP_DIR)/mklibs-out
+       for lib in `ls $(TMP_DIR)/mklibs-out/*.so.* 2>/dev/null`; do \
+               LIB="$${lib##*/}"; \
+               DEST="`ls "$(TARGET_DIR)/lib/$$LIB" "$(TARGET_DIR)/usr/lib/$$LIB" 2>/dev/null`"; \
+               [ -n "$$DEST" ] || continue; \
+               echo "Copying stripped library $$lib to $$DEST"; \
+               cp "$$lib" "$$DEST" || exit 1; \
+       done
+  endef
+endif
 
 $(curdir)/rootfs-prepare: $(TMP_DIR)/.build
        @-$(MAKE) package/preconfig
        @if [ -d $(TOPDIR)/files ]; then \
+               ( cd $(TOPDIR)/files; find -type f ) | \
+                       ( cd $(TARGET_DIR); while :; do \
+                               read FILE; \
+                               [ -z "$$FILE" ] && break; \
+                               [ -L "$$FILE" ] || continue; \
+                               echo "Removing symlink $(TARGET_DIR)/$$FILE"; \
+                               rm -f "$$FILE"; \
+                       done; ); \
                $(CP) $(TOPDIR)/files/. $(TARGET_DIR); \
        fi
        @mkdir -p $(TARGET_DIR)/etc/rc.d
@@ -42,10 +85,12 @@ $(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)
+       rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst
+       $(if $(CONFIG_CLEAN_IPKG),rm -rf $(TARGET_DIR)/usr/lib/opkg)
+       $(call mklibs)
 
 $(curdir)/index: FORCE
-       @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \
+       @(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages && \
                gzip -9c Packages > Packages.gz \
        )