diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-05-24 02:18:40 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-05-29 16:43:11 +0200 |
| commit | 535a742c2695a9e0c586b50d7fa76e318232ff24 (patch) | |
| tree | 8358ee5075109fc8725e072dbf82e06774013b51 | |
| parent | 5b1b495c8d21600eac694d50f428654a3125e217 (diff) | |
| download | ffmpeg-535a742c2695a9e0c586b50d7fa76e318232ff24.tar.gz | |
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.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/libavcodec.v | 8 | ||||
| -rw-r--r-- | libavdevice/libavdevice.v | 8 | ||||
| -rw-r--r-- | libavfilter/libavfilter.v | 9 | ||||
| -rw-r--r-- | libavformat/libavformat.v | 8 | ||||
| -rw-r--r-- | libavresample/libavresample.v | 8 | ||||
| -rw-r--r-- | libavutil/libavutil.v | 8 | ||||
| -rw-r--r-- | libswscale/libswscale.v | 9 |
8 files changed, 38 insertions, 24 deletions
@@ -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 bf148075c7..f1d5e5bc77 100644 --- 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 663af85ba8..33042e5201 100644 --- 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 83e8887080..6518e5fc09 100644 --- 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 6f11d600b9..47d5ddcdb1 100644 --- 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 b8c7c7d2e5..d6fc7512ba 100644 --- 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 e9f04cba65..fb17058df5 100644 --- 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 8b9a96ae66..96170a16a0 100644 --- a/libswscale/libswscale.v +++ b/libswscale/libswscale.v @@ -1,4 +1,7 @@ -LIBSWSCALE_$MAJOR { - global: swscale_*; sws_*; - local: *; +LIBSWSCALE_MAJOR { + global: + swscale_*; + sws_*; + local: + *; }; |