diff options
| author | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-20 15:38:46 -0300 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-20 16:04:42 -0300 |
| commit | a5752240a178c2c651ed10167025fad8b9c4e7bd (patch) | |
| tree | 8568c44409e8d9cd2aa65d81a1db3d924017c861 | |
| parent | d03bd547809f849405a3f706920091d9b03147b0 (diff) | |
meson: Use the new `pic` argument on static libs
We depend on meson 0.35 which makes it simpler to handle
Removes a meson warning
| -rw-r--r-- | gst/printf/meson.build | 3 | ||||
| -rw-r--r-- | libs/gst/check/libcheck/meson.build | 3 | ||||
| -rw-r--r-- | meson.build | 8 |
3 files changed, 4 insertions, 10 deletions
diff --git a/gst/printf/meson.build b/gst/printf/meson.build index 2a867a60e8..1b42d2a354 100644 --- a/gst/printf/meson.build +++ b/gst/printf/meson.build @@ -74,6 +74,7 @@ endif printf_lib = static_library('gstprintf', printf_sources, include_directories : [configinc], - c_args : printf_args + pic_args, + c_args : printf_args, install : false, + pic: true, dependencies : [glib_dep]) diff --git a/libs/gst/check/libcheck/meson.build b/libs/gst/check/libcheck/meson.build index 4f9a92bc3e..f86c187bc6 100644 --- a/libs/gst/check/libcheck/meson.build +++ b/libs/gst/check/libcheck/meson.build @@ -38,4 +38,5 @@ libcheck = static_library('check', libcheck_files, include_directories : [ configinc, internal_check_h_inc ], dependencies : [rt_lib, mathlib], - c_args: gst_c_args + pic_args) + c_args: gst_c_args, + pic: true) diff --git a/meson.build b/meson.build index 6fe6fa8c65..c5edeae355 100644 --- a/meson.build +++ b/meson.build @@ -29,14 +29,6 @@ helpers_install_dir = libexecdir + '/gstreamer-1.0/' cc = meson.get_compiler('c') -# 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 - # Ignore several spurious warnings for things gstreamer does very commonly # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it # If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once |