interpreter: add <lang>_(static|shared)_args

Which allow passing arguments specifically to the static or shared
libraries.

For design, this is all handled in the interpreter, by the build layer
the arguments are combined into the existing fields. This limits changes
required in the mid and backend layers

5 files changed, 54 insertions, 3 deletions

diff --git a/test cases/common/178 bothlibraries/meson.build b/test cases/common/178 bothlibraries/meson.build
index 843a607..62f2061 100644
--- a/test cases/common/178 bothlibraries/meson.build
+++ b/test cases/common/178 bothlibraries/meson.build
@@ -55,9 +55,17 @@ test('runtest-both-2', exe_both2)
 # the executable linking using the C compiler.
 # https://github.com/Netflix/vmaf/issues/1107
 libccpp = both_libraries('ccpp', 'foo.cpp', 'libfile.c',
-  cpp_args : ['-std=c++11'])
+  cpp_args : ['-std=c++11'],
+  c_static_args : ['-DSTATIC_COMPILATION'],
+  cpp_static_args : ['-DSTATIC_COMPILATION'],
+)
 exe = executable('prog-ccpp', 'main2.c',
   link_with: libccpp.get_static_lib(),
   c_args : ['-DSTATIC_COMPILATION'],
 )
 test('runtest-ccpp', exe)
+
+exe = executable('prog-ccpp-shared', 'main2.c',
+  link_with: libccpp.get_shared_lib(),
+)
+test('runtest-ccpp-shared', exe)
diff --git a/test cases/common/3 static/lib3.c b/test cases/common/3 static/lib3.c
new file mode 100644
index 0000000..f834cf8
--- /dev/null
+++ b/test cases/common/3 static/lib3.c
@@ -0,0 +1,11 @@
+int func3(const int x) {
+    return x + 1;
+}
+
+#ifndef WORK
+# error "did not get static only C args"
+#endif
+
+#ifdef BREAK
+# error "got shared only C args, but shouldn't have"
+#endif
diff --git a/test cases/common/3 static/meson.build b/test cases/common/3 static/meson.build
index 04ff2f6..1127ecb 100644
--- a/test cases/common/3 static/meson.build
+++ b/test cases/common/3 static/meson.build
@@ -1,4 +1,4 @@
-project('static library test', 'c')
+project('static library test', 'c', default_options : ['default_library=static'])
 
 lib = static_library('mylib', get_option('source'),
   link_args : '-THISMUSTNOBEUSED') # Static linker needs to ignore all link args.
@@ -12,3 +12,8 @@ endif
 assert(has_not_changed, 'Static library has changed.')
 
 assert(not is_disabler(lib), 'Static library is a disabler.')
+
+if get_option('default_library') == 'static'
+  library('lib2', 'lib3.c', c_static_args : ['-DWORK'], c_shared_args : ['-DBREAK'])
+endif
+build_target('lib4', 'lib3.c', c_static_args : ['-DWORK'], target_type : 'static_library')
diff --git a/test cases/common/4 shared/libfile2.c b/test cases/common/4 shared/libfile2.c
new file mode 100644
index 0000000..fee1d1e
--- /dev/null
+++ b/test cases/common/4 shared/libfile2.c
@@ -0,0 +1,22 @@
+#if defined _WIN32 || defined __CYGWIN__
+  #define DLL_PUBLIC __declspec(dllexport)
+#else
+  #if defined __GNUC__
+    #define DLL_PUBLIC __attribute__ ((visibility("default")))
+  #else
+    #pragma message ("Compiler does not support symbol visibility.")
+    #define DLL_PUBLIC
+  #endif
+#endif
+
+#ifndef WORK
+# error "Did not get shared only arguments"
+#endif
+
+#ifdef BREAK
+# error "got static only C args, but shouldn't have"
+#endif
+
+int DLL_PUBLIC libfunc(void) {
+    return 3;
+}
diff --git a/test cases/common/4 shared/meson.build b/test cases/common/4 shared/meson.build
index 1c88bc5..7f79ad6 100644
--- a/test cases/common/4 shared/meson.build
+++ b/test cases/common/4 shared/meson.build
@@ -1,4 +1,4 @@
-project('shared library test', 'c')
+project('shared library test', 'c', default_options : ['default_library=shared'])
 lib = shared_library('mylib', 'libfile.c')
 build_target('mylib2', 'libfile.c', target_type: 'shared_library')
 
@@ -11,3 +11,8 @@ endif
 assert(has_not_changed, 'Shared library has changed.')
 
 assert(not is_disabler(lib), 'Shared library is a disabler.')
+
+if get_option('default_library') == 'shared'
+  library('mylib5', 'libfile2.c', c_shared_args : ['-DWORK'])
+endif
+build_target('mylib4', 'libfile2.c', target_type: 'shared_library', c_shared_args : ['-DWORK'], c_static_args : ['-DBREAK'])