diff options
| author | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-20 15:48:34 -0300 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-20 16:07:33 -0300 |
| commit | e3c22605ae96ee1747020c4f367d49faf6916e14 (patch) | |
| tree | 35bb75ac4a403cc272f7b86e353c93c99fd3f439 | |
| parent | 7986a8ed3d2c83aab00ae6ea1e6944f5c8557230 (diff) | |
| download | gstreamer-plugins-base-e3c22605ae96ee1747020c4f367d49faf6916e14.tar.gz | |
meson: Use the new `pic` argument on static libs
We depend on 0.35 already
| -rw-r--r-- | gst-libs/gst/audio/meson.build | 15 | ||||
| -rw-r--r-- | meson.build | 8 |
2 files changed, 9 insertions, 14 deletions
diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build index c68f113ad..987c3600e 100644 --- a/gst-libs/gst/audio/meson.build +++ b/gst-libs/gst/audio/meson.build @@ -91,10 +91,11 @@ simd_dependencies = [] if have_sse audio_resampler_sse = static_library('audio_resampler_sse', ['audio-resampler-x86-sse.c', gstaudio_h], - c_args : gst_plugins_base_args + [sse_args] + [pic_args], + c_args : gst_plugins_base_args + [sse_args], include_directories : [configinc, libsinc], dependencies : [gst_base_dep], - install : false + install : false, + pic: true ) simd_cargs += ['-DHAVE_SSE'] @@ -104,10 +105,11 @@ endif if have_sse2 audio_resampler_sse2 = static_library('audio_resampler_sse2', ['audio-resampler-x86-sse2.c', gstaudio_h], - c_args : gst_plugins_base_args + [sse2_args] + [pic_args], + c_args : gst_plugins_base_args + [sse2_args], include_directories : [configinc, libsinc], dependencies : [gst_base_dep], - install : false + install : false, + pic: true ) simd_cargs += ['-DHAVE_SSE2'] @@ -117,10 +119,11 @@ endif if have_sse41 audio_resampler_sse41 = static_library('audio_resampler_sse41', ['audio-resampler-x86-sse41.c', gstaudio_h], - c_args : gst_plugins_base_args + [sse41_args] + [pic_args], + c_args : gst_plugins_base_args + [sse41_args], include_directories : [configinc, libsinc], dependencies : [gst_base_dep], - install : false + install : false, + pic: true ) simd_cargs += ['-DHAVE_SSE41'] diff --git a/meson.build b/meson.build index a0eaf084d..ec4ce9630 100644 --- a/meson.build +++ b/meson.build @@ -185,14 +185,6 @@ have_sse = cc.has_argument(sse_args) have_sse2 = cc.has_argument(sse2_args) have_sse41 = cc.has_argument(sse41_args) -# FIXME: Meson should have a way for portably adding -fPIC when needed for use -# with static libraries that are linked into shared libraries. Or, it should -# add it by default with an option to turn it off if needed. -pic_args = ['-fPIC'] -if host_machine.system() == 'windows' - pic_args = [] -endif - subdir('gst-libs') subdir('gst') subdir('ext') |