mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-07 15:02:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "meson: Use the new pic argument on static libs"

Browse source 
This reverts commit a5752240a1.

pic was added after 0.35 and will be present in 0.36 (meson
documentation was wrong).
This commit is contained in:
Thibault Saunier 2016-10-20 17:19:25 -03:00
parent a5752240a1
commit c0bfb1b524
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/printf/meson.build
View file

@ -74,7 +74,6 @@ endif
printf_lib = static_library('gstprintf', printf_lib = static_library('gstprintf',
printf_sources, printf_sources,
include_directories : [configinc], include_directories : [configinc],
c_args : printf_args, c_args : printf_args + pic_args,
install : false, install : false,
pic: true,
dependencies : [glib_dep]) dependencies : [glib_dep])

3
libs/gst/check/libcheck/meson.build
View file

@ -38,5 +38,4 @@ libcheck = static_library('check',
libcheck_files, libcheck_files,
include_directories : [ configinc, internal_check_h_inc ], include_directories : [ configinc, internal_check_h_inc ],
dependencies : [rt_lib, mathlib], dependencies : [rt_lib, mathlib],
c_args: gst_c_args, c_args: gst_c_args + pic_args)
pic: true)

8
meson.build
View file

@ -29,6 +29,14 @@ helpers_install_dir = libexecdir + '/gstreamer-1.0/'
cc = meson.get_compiler('c') 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 # 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 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 # If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once