Commit c0bfb1b5 authored by Thibault Saunier's avatar Thibault Saunier

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

This reverts commit a5752240.

pic was added after 0.35 and will be present in 0.36 (meson
documentation was wrong).
parent a5752240
......@@ -74,7 +74,6 @@ endif
printf_lib = static_library('gstprintf',
printf_sources,
include_directories : [configinc],
c_args : printf_args,
c_args : printf_args + pic_args,
install : false,
pic: true,
dependencies : [glib_dep])
......@@ -38,5 +38,4 @@ libcheck = static_library('check',
libcheck_files,
include_directories : [ configinc, internal_check_h_inc ],
dependencies : [rt_lib, mathlib],
c_args: gst_c_args,
pic: true)
c_args: gst_c_args + pic_args)
......@@ -29,6 +29,14 @@ 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment