diff options
| author | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-20 17:17:54 -0300 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-20 17:17:58 -0300 |
| commit | 9842a6708d642da8e32eb26d5db319c0283ec068 (patch) | |
| tree | b22ff03fcc7d5e57e14da1531dc6c698c73fce29 | |
| parent | e3c22605ae96ee1747020c4f367d49faf6916e14 (diff) | |
| download | gstreamer-plugins-base-9842a6708d642da8e32eb26d5db319c0283ec068.tar.gz | |
Revert "meson: Use the new `pic` argument on static libs"
This reverts commit e3c22605ae96ee1747020c4f367d49faf6916e14.
pic was added after 0.35 and will be present in 0.36 (meson documentation
was wrong).
| -rw-r--r-- | gst-libs/gst/audio/meson.build | 15 | ||||
| -rw-r--r-- | meson.build | 8 |
2 files changed, 14 insertions, 9 deletions
diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build index 987c3600e..c68f113ad 100644 --- a/gst-libs/gst/audio/meson.build +++ b/gst-libs/gst/audio/meson.build @@ -91,11 +91,10 @@ 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], + c_args : gst_plugins_base_args + [sse_args] + [pic_args], include_directories : [configinc, libsinc], dependencies : [gst_base_dep], - install : false, - pic: true + install : false ) simd_cargs += ['-DHAVE_SSE'] @@ -105,11 +104,10 @@ 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], + c_args : gst_plugins_base_args + [sse2_args] + [pic_args], include_directories : [configinc, libsinc], dependencies : [gst_base_dep], - install : false, - pic: true + install : false ) simd_cargs += ['-DHAVE_SSE2'] @@ -119,11 +117,10 @@ 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], + c_args : gst_plugins_base_args + [sse41_args] + [pic_args], include_directories : [configinc, libsinc], dependencies : [gst_base_dep], - install : false, - pic: true + install : false ) simd_cargs += ['-DHAVE_SSE41'] diff --git a/meson.build b/meson.build index ec4ce9630..a0eaf084d 100644 --- a/meson.build +++ b/meson.build @@ -185,6 +185,14 @@ 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') |