build: Change structure of the linker version script templates

Split version files into one line per symbol/directive to allow compatibility
with the Solaris linker without preprocessing and eliminate $ from version file
templates to simplify the postprocessing shell command.

diff --git a/Makefile b/Makefile
index 8e0cfce..d90d9be 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,9 +63,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
        $(Q)echo '#include "$*.h"' >$@
 
 %.ver: %.v
-       $(M)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ | sed -e 's/:/:\
-/' -e 's/; /;\
-/g' > $@
+       $(M)sed 's/MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
 
 %.c %.h %.ver: TAG = GEN
 

diff --git a/libavcodec/libavcodec.v b/libavcodec/libavcodec.v
index bf14807..f1d5e5b 100644 (file)
--- a/libavcodec/libavcodec.v
+++ b/libavcodec/libavcodec.v
@@ -1,4 +1,6 @@
-LIBAVCODEC_$MAJOR {
-        global: av*;
-        local:  *;
+LIBAVCODEC_MAJOR {
+    global:
+        av*;
+    local:
+        *;
 };

diff --git a/libavdevice/libavdevice.v b/libavdevice/libavdevice.v
index 663af85..33042e5 100644 (file)
--- a/libavdevice/libavdevice.v
+++ b/libavdevice/libavdevice.v
@@ -1,4 +1,6 @@
-LIBAVDEVICE_$MAJOR {
-        global: avdevice_*;
-        local: *;
+LIBAVDEVICE_MAJOR {
+    global:
+        avdevice_*;
+    local:
+        *;
 };

diff --git a/libavfilter/libavfilter.v b/libavfilter/libavfilter.v
index 83e8887..6518e5f 100644 (file)
--- a/libavfilter/libavfilter.v
+++ b/libavfilter/libavfilter.v
@@ -1,4 +1,7 @@
-LIBAVFILTER_$MAJOR {
-        global: avfilter_*; av_*;
-        local: *;
+LIBAVFILTER_MAJOR {
+    global:
+        avfilter_*;
+        av_*;
+    local:
+        *;
 };

diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v
index 6f11d60..47d5ddc 100644 (file)
--- a/libavformat/libavformat.v
+++ b/libavformat/libavformat.v
@@ -1,4 +1,6 @@
-LIBAVFORMAT_$MAJOR {
-        global: av*;
-        local: *;
+LIBAVFORMAT_MAJOR {
+    global:
+        av*;
+    local:
+        *;
 };

diff --git a/libavresample/libavresample.v b/libavresample/libavresample.v
index b8c7c7d..d6fc751 100644 (file)
--- a/libavresample/libavresample.v
+++ b/libavresample/libavresample.v
@@ -1,4 +1,6 @@
-LIBAVRESAMPLE_$MAJOR {
-        global: av*;
-        local:  *;
+LIBAVRESAMPLE_MAJOR {
+    global:
+        av*;
+    local:
+        *;
 };

diff --git a/libavutil/libavutil.v b/libavutil/libavutil.v
index e9f04cb..fb17058 100644 (file)
--- a/libavutil/libavutil.v
+++ b/libavutil/libavutil.v
@@ -1,4 +1,6 @@
-LIBAVUTIL_$MAJOR {
-        global: av*;
-        local: *;
+LIBAVUTIL_MAJOR {
+    global:
+        av*;
+    local:
+        *;
 };

diff --git a/libswscale/libswscale.v b/libswscale/libswscale.v
index 8b9a96a..96170a1 100644 (file)
--- a/libswscale/libswscale.v
+++ b/libswscale/libswscale.v
@@ -1,4 +1,7 @@
-LIBSWSCALE_$MAJOR {
-        global: swscale_*; sws_*;
-        local: *;
+LIBSWSCALE_MAJOR {
+    global:
+        swscale_*;
+        sws_*;
+    local:
+        *;
 };