aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-06-11 00:57:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-06-11 00:57:36 +0000
commitbee3dd6a1b79da40d437f53c0b4547f156843369 (patch)
treeb848d45d53c717bd693cdc653d99b00ad8647216
parent34516d2b76750088f288b036f76e31b6e770ba19 (diff)
downloadupstream-bee3dd6a1b79da40d437f53c0b4547f156843369.tar.gz
upstream-bee3dd6a1b79da40d437f53c0b4547f156843369.tar.bz2
upstream-bee3dd6a1b79da40d437f53c0b4547f156843369.zip
build: add checks for missing package dependencies
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32185 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package-ipkg.mk22
-rwxr-xr-xscripts/gen-dependencies.sh24
2 files changed, 46 insertions, 0 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 93c4fdf2f7..e9bac7a23b 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -65,6 +65,26 @@ define FixupDependencies
$(call AddDependency,$(1),$$(DEPS))
endef
+ifneq ($(PKG_NAME),toolchain)
+ define CheckDependencies
+ @( \
+ rm -f $(PKG_INFO_DIR)/$(1).missing; \
+ ( \
+ export READELF=$(TARGET_CROSS)readelf XARGS="$(XARGS)"; \
+ $(SCRIPT_DIR)/gen-dependencies.sh "$$(IDIR_$(1))"; \
+ ) | while read FILE; do \
+ grep -q "$$$$FILE" $(PKG_INFO_DIR)/$(1).provides || \
+ echo "$$$$FILE" >> $(PKG_INFO_DIR)/$(1).missing; \
+ done; \
+ if [ -f "$(PKG_INFO_DIR)/$(1).missing" ]; then \
+ echo "Package $(1) is missing dependencies for the following libraries:"; \
+ cat "$(PKG_INFO_DIR)/$(1).missing"; \
+ false; \
+ fi; \
+ )
+ endef
+endif
+
ifeq ($(DUMP),)
define BuildTarget/ipkg
IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
@@ -124,6 +144,8 @@ ifeq ($(DUMP),)
fi; \
done; \
) | sort -u > $(PKG_INFO_DIR)/$(1).provides
+ $(CheckDependencies)
+
$(RSTRIP) $$(IDIR_$(1))
( \
echo "Package: $(1)"; \
diff --git a/scripts/gen-dependencies.sh b/scripts/gen-dependencies.sh
new file mode 100755
index 0000000000..ab047b6482
--- /dev/null
+++ b/scripts/gen-dependencies.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+SELF=${0##*/}
+
+READELF="${READELF:-readelf}"
+TARGETS=$*
+XARGS="${XARGS:-xargs -r}"
+
+[ -z "$TARGETS" ] && {
+ echo "$SELF: no directories / files specified"
+ echo "usage: $SELF [PATH...]"
+ exit 1
+}
+
+find $TARGETS -type f -a -exec file {} \; | \
+ sed -n -e 's/^\(.*\):.*ELF.*\(executable\|shared object\).*,.* stripped/\1/p' | \
+ $XARGS -n1 readelf -d | \
+ awk '$2 ~ /NEEDED/ && $NF !~ /interpreter/ { gsub(/[\[\]]/, "", $NF); print $NF }' | \
+ sort -u