From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 21 Apr 2011 23:36:54 +0000 (+0200)
Subject: build-essentials: Fix bug that missed EXEC binaries and did not find them.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49b8c924e8ab46db2d5b60d3fb9ae55c33da6635;p=ipfire-3.x.git

build-essentials: Fix bug that missed EXEC binaries and did not find them.
---

diff --git a/pkgs/build-essentials/build-essentials.nm b/pkgs/build-essentials/build-essentials.nm
index 5c8997999..085b05003 100644
--- a/pkgs/build-essentials/build-essentials.nm
+++ b/pkgs/build-essentials/build-essentials.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = build-essentials
 PKG_VER        = $(DISTRO_VERSION)
-PKG_REL        = 14
+PKG_REL        = 15
 PKG_EPOCH      = 1
 PKG_ARCH       = noarch
 
diff --git a/pkgs/build-essentials/buildsystem-tools/functions-files b/pkgs/build-essentials/buildsystem-tools/functions-files
index 41ce3be0c..05920c8c0 100644
--- a/pkgs/build-essentials/buildsystem-tools/functions-files
+++ b/pkgs/build-essentials/buildsystem-tools/functions-files
@@ -179,7 +179,7 @@ function find_elf_files() {
 	for dir in ${dirs}; do
 		dir="${prefix}${dir}"
 		for file in $(find ${dir} -type f 2>/dev/null); do
-			if file_is_elf ${file} && file_is_shared_object ${file} && ! file_is_static ${file}; then
+			if file_is_elf ${file} && ! file_is_static ${file}; then
 				files="${files} ${file}"
 			fi
 		done
diff --git a/pkgs/build-essentials/quality-agent/quality-agent.d/050-relro b/pkgs/build-essentials/quality-agent/quality-agent.d/050-relro
index f01105657..e42e8ff9c 100755
--- a/pkgs/build-essentials/quality-agent/quality-agent.d/050-relro
+++ b/pkgs/build-essentials/quality-agent/quality-agent.d/050-relro
@@ -16,6 +16,9 @@ function check() {
 			continue
 		fi
 
+		# Skip all files that are not a shared object.
+		file_is_shared_object ${file} || continue
+
 		if ! file_is_relro_full ${file}; then
 			if [ "${QUALITY_AGENT_PERMIT_NOT_FULL_RELRO}" = "yes" ]; then
 				log_warning "  Is not full relro: ${file}"