[cairo-commit] 3 commits - src/meson-check-def.sh

[GitLab Mirror]

 src/meson-check-def.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2919f392d3a6f334610f39516d25b868d34c4756
Merge: 718e577ad 5118007b0
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Mon Jul 3 21:34:58 2023 +0000

    Merge branch 'check-def-arches' into 'master'
    
    meson-check-def: Exclude sections from symbol list seen on ARM & MIPS
    
    See merge request cairo/cairo!488

commit 5118007b064eda899e7283c326ff3e2069126117
Author: Jeremy Bícha <jeremy.bicha at canonical.com>
Date:   Sun Jul 2 09:58:06 2023 -0400

    meson-check-def: Exclude sections from symbol list seen on mips

diff --git a/src/meson-check-def.sh b/src/meson-check-def.sh
index 97c61cdf1..7c0e3e0e0 100644
--- a/src/meson-check-def.sh
+++ b/src/meson-check-def.sh
@@ -32,7 +32,7 @@ echo Checking that $so has the same symbol list as $def
 
 {
     echo EXPORTS
-    eval $get_cairo_syms | c++filt --no-params | grep -v '^_cairo_test_\|^_fini\|^_init\|^_save[fg]pr\|^_rest[fg]pr\|^_Z\|^__gnu\|^_bss_end\|^__bss\|^_edata\|^_end\|^__end' | sort -u
+    eval $get_cairo_syms | c++filt --no-params | grep -v '^_cairo_test_\|^_fini\|^_init\|^_save[fg]pr\|^_rest[fg]pr\|^_Z\|^__gnu\|^_bss_end\|^__bss\|^_edata\|^_end\|^__end\|^_fbss\|^_fdata\|^_ftext' | sort -u
 } | diff "$def" - >&2 || stat=1
 
 exit $stat
commit 67c020267449aa76739ba5e3c93b3e9ea76df0c6
Author: Jeremy Bícha <jeremy.bicha at canonical.com>
Date:   Sun Jul 2 09:53:21 2023 -0400

    meson-check-def: Exclude sections from symbol list seen on ARM

diff --git a/src/meson-check-def.sh b/src/meson-check-def.sh
index 550cf337f..97c61cdf1 100644
--- a/src/meson-check-def.sh
+++ b/src/meson-check-def.sh
@@ -32,7 +32,7 @@ echo Checking that $so has the same symbol list as $def
 
 {
     echo EXPORTS
-    eval $get_cairo_syms | c++filt --no-params | grep -v '^_cairo_test_\|^_fini\|^_init\|^_save[fg]pr\|^_rest[fg]pr\|^_Z\|^__gnu\|^__bss\|^_edata\|^_end' | sort -u
+    eval $get_cairo_syms | c++filt --no-params | grep -v '^_cairo_test_\|^_fini\|^_init\|^_save[fg]pr\|^_rest[fg]pr\|^_Z\|^__gnu\|^_bss_end\|^__bss\|^_edata\|^_end\|^__end' | sort -u
 } | diff "$def" - >&2 || stat=1
 
 exit $stat