Some attempts to get FreeBSD and Solaris build working

Author: NWilson

maint/RunSymbolTest

@@ -32,6 +32,10 @@ elif [ "`uname -s`" = "SunOS" ]; then
   nm="nm -p -h -D -g"
 elif [ "`uname -s`" = "Darwin" ]; then
   nm="nm -B -g"
+elif [ "`uname -s`" = "FreeBSD" ]; then
+  # Highly annoyingly, FreeBSD's nm doesn't show symbol versions, so we roll
+  # our own using readelf.
+  nm="readelf -D --version-info"
 fi
 
 supports_versions=1
@@ -54,6 +58,13 @@ for so_name in "libpcre2-8" "libpcre2-16" "libpcre2-32" "libpcre2-posix"; do
   so_file="$input_dir/$so_name.$so_ext"
   base=`basename $expected_file`
 
+  # XXX
+  if [ "`uname -s`" = "FreeBSD" ]; then
+    echo "==XXX=="
+    $nm "$so_file"
+    echo "==XXX=="
+  fi
+
   $nm "$so_file" | \
     $sed -E -e 's/^[0-9a-fA-F]* *//g' | \
     $grep -E -v '^[Uw] ' | \

maint/RunSymbolTest.ps1

@@ -37,8 +37,9 @@ foreach ($dllName in $dllNames) {
     $actualOutput = ($actualSymbols -join "`n") + "`n"
     $null = New-Item -Force $base -Value $actualOutput
 
-    $expectedOutput = Get-Content -Path $expectedFile -Raw
-    $actualOutput = Get-Content -Path $base -Raw
+    $expectedSymbols = (Get-Content -Path $expectedFile -Raw).TrimEnd("`n") |
+        ForEach-Object { $_ -replace '@@.*', '' }
+    $expectedOutput = ($expectedSymbols -join "`n") + "`n"
 
     if ($expectedOutput -ne $actualOutput) {
         Write-Host "Shared object contents for $dllFile differ from expected"

src/libpcre2-16.sym

@@ -79,6 +79,9 @@ PCRE2_10.46 {
     pcre2_substring_list_get_16;
     pcre2_substring_nametable_scan_16;
     pcre2_substring_number_from_name_16;
+  local:
+    _fini;
+    _init;
 };
 
 # PCRE2_10.47 {} PCRE2_10.46;

src/libpcre2-32.sym

@@ -79,6 +79,9 @@ PCRE2_10.46 {
     pcre2_substring_list_get_32;
     pcre2_substring_nametable_scan_32;
     pcre2_substring_number_from_name_32;
+  local:
+    _fini;
+    _init;
 };
 
 # PCRE2_10.47 {} PCRE2_10.46;

src/libpcre2-8.sym

@@ -79,6 +79,9 @@ PCRE2_10.46 {
     pcre2_substring_list_get_8;
     pcre2_substring_nametable_scan_8;
     pcre2_substring_number_from_name_8;
+  local:
+    _fini;
+    _init;
 };
 
 # PCRE2_10.47 {} PCRE2_10.46;

src/libpcre2-posix.sym

@@ -5,6 +5,9 @@ PCRE2_10.46 {
     pcre2_regerror;
     pcre2_regexec;
     pcre2_regfree;
+  local:
+    _fini;
+    _init;
 };
 
 # PCRE2_10.47 {} PCRE2_10.46;