diff options
| author | David Bremner <david@tethera.net> | 2020-12-13 08:37:47 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-12-13 08:37:47 -0400 |
| commit | ced341e82e8cb84dc2c90187d208838335511f6e (patch) | |
| tree | cd5b3ef0940a4fa2fe00fcf211907189f9e2775c | |
| parent | 06a629826208358dc6448986a47423124d7e0479 (diff) | |
| parent | 17540b73e812d51777fd63709beb8e9be22e26b8 (diff) | |
Merge tag 'debian/0.31.2-5'
notmuch release 0.31.2-5 for unstable (sid) [dgit]
[dgit distro=debian no-split --quilt=linear]
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/debian-changes | 14 | ||||
| -rwxr-xr-x | test/T360-symbol-hiding.sh | 5 |
3 files changed, 23 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a8943124..8c157bc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +notmuch (0.31.2-5) unstable; urgency=medium + + * Use readelf instead of nm in T360, hopefully build in ppc64 + + -- David Bremner <bremner@debian.org> Sun, 13 Dec 2020 08:24:23 -0400 + notmuch (0.31.2-4) unstable; urgency=medium * Move prerequisite to file targets from phony ones. Thanks to diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 40ee7d00..3e6eefca 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -14,3 +14,17 @@ atomic patches. endif sphinx-html: $(DOCBUILDDIR)/.html.stamp +--- notmuch-0.31.2.orig/test/T360-symbol-hiding.sh ++++ notmuch-0.31.2/test/T360-symbol-hiding.sh +@@ -26,8 +26,9 @@ test_begin_subtest 'checking output' + test_expect_equal "$result" "$output" + + test_begin_subtest 'comparing existing to exported symbols' +-nm -P $NOTMUCH_BUILDDIR/lib/libnotmuch.so | awk '$2 == "T" && $1 ~ "^notmuch" {print $1}' | sort | uniq > ACTUAL +-sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort | uniq > EXPORTED ++readelf -Ws $NOTMUCH_BUILDDIR/lib/libnotmuch.so | \ ++ awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $8}' | sort -u > ACTUAL ++sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort -u > EXPORTED + test_expect_equal_file EXPORTED ACTUAL + + test_done diff --git a/test/T360-symbol-hiding.sh b/test/T360-symbol-hiding.sh index b34f1e54..3f00dd38 100755 --- a/test/T360-symbol-hiding.sh +++ b/test/T360-symbol-hiding.sh @@ -26,8 +26,9 @@ test_begin_subtest 'checking output' test_expect_equal "$result" "$output" test_begin_subtest 'comparing existing to exported symbols' -nm -P $NOTMUCH_BUILDDIR/lib/libnotmuch.so | awk '$2 == "T" && $1 ~ "^notmuch" {print $1}' | sort | uniq > ACTUAL -sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort | uniq > EXPORTED +readelf -Ws $NOTMUCH_BUILDDIR/lib/libnotmuch.so | \ + awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $8}' | sort -u > ACTUAL +sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort -u > EXPORTED test_expect_equal_file EXPORTED ACTUAL test_done |