diff options
| author | Rene Engelhard <rene@debian.org> | 2010-11-21 14:46:24 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2010-11-21 14:46:24 +0100 |
| commit | 19b23a511c019b757e5c8d165d49dc1c1e2b25bb (patch) | |
| tree | e6648d60d6b241c5afd2fc64fb64aa2a7afe328a | |
| parent | 7d95994e4aa4a4e00439a786226c87998a15450e (diff) | |
| parent | d35307cddf79a53a0a47f915d976407778d9fd60 (diff) | |
Merge commit 'ooo/OOO330_m16' into libreoffice-3-3
| -rw-r--r-- | solenv/bin/addsym.awk | 23 | ||||
| -rw-r--r-- | solenv/inc/minor.mk | 2 |
2 files changed, 19 insertions, 6 deletions
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk index 52efcb4ab740..621ca2e4bc42 100644 --- a/solenv/bin/addsym.awk +++ b/solenv/bin/addsym.awk @@ -26,16 +26,29 @@ #************************************************************************* # Add certain symbol patterns to the first global section. +# +# The below code fails with 'perverted' mapfiles (using a strange line layout, +# or containing version UDK_3_0_0 without a global section, ...). BEGIN { state = 0 } -/\{/ && state == 1 { exit 1 } #TODO: print error explanation to stderr? -/^[\t ]*UDK_3_0_0[\t ]*\{/ && state == 0 { state = 1 } -/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 } -{ print } +END { + if (state == 0) { + print "# Weak RTTI symbols for C++ exceptions:" + print "UDK_3_0_0 {" + print "global:" + print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions" + if (ENVIRON["USE_SYSTEM_STL"] != "YES") + print "_ZN4_STL7num_put*; # for STLport" + print "};" + } +} state == 2 { print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions" if (ENVIRON["USE_SYSTEM_STL"] != "YES") print "_ZN4_STL7num_put*; # for STLport" state = 3 } -END { if (state != 3) exit 1 } #TODO: print error explanation to stderr? +# #i66636# - ??? +/^[\t ]*UDK_3_0_0[\t ]*\{/ { state = 1 } +/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 } +{ print } diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 94f8dc2c56d6..80c9d765a529 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=330 RSCREVISION=330m15(Build:1) BUILD=1 -LAST_MINOR=m15 +LAST_MINOR=m16 SOURCEVERSION=OOO330 |