X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/2c80abf922e948f8c96537faf1fa36cccd80e8d9..cc1b834fe966d40206d148e1f27f0502463ac69f:/prepare-release

diff --git a/prepare-release b/prepare-release
index 731eb1096..77d8580d9 100755
--- a/prepare-release
+++ b/prepare-release
@@ -21,7 +21,7 @@ librarysymbolsfromfile() {
 	echo '=== Missing required symbols:'
 	echo -n "$MISSING" | grep -v '|optional=' || true
 	echo '=== New symbols:'
-	grep '^+ ' "$1" | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do
+	grep '^+ ' "$1" | grep -v '^+ (c++' | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do
 		echo " (c++)\"${line}@${SYMVER}\" $VERSION"
 	done | sort -u
 }
@@ -127,7 +127,14 @@ elif [ "$1" = 'post-build' ]; then
 
 elif [ "$1" = 'library' ]; then
 	librarysymbols() {
+		local libname=$(echo "${1}" | cut -c 4-)
 		local buildlib="build/bin/${1}.so.${2}"
+		for dir in $libname */$libname; do
+			local new_buildlib="$dir/${1}.so.${2}"
+			if [  -r "${new_buildlib}" ] && [ ! -e "$buildlib" -o "$new_buildlib" -nt "$buildlib" ]; then
+				local buildlib="${new_buildlib}"
+			fi
+		done
 		if [ ! -r "$buildlib" ]; then
 			echo "ERROR: The library ${1} has to be built before symbols can be checked!"
 			return