aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2016-08-15 17:15:04 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2016-08-16 16:14:09 +0530
commit2549ed8290bd1f754964cc2e1c706d431ad4259a (patch)
tree2c2607fbb1fd9386210b00b9d102fe916bebbff8
parentc6ca8a59be5f1a8dd42f2087c7f3f29a4e76a0ed (diff)
downloadmeson-2549ed8290bd1f754964cc2e1c706d431ad4259a.zip
meson-2549ed8290bd1f754964cc2e1c706d431ad4259a.tar.gz
meson-2549ed8290bd1f754964cc2e1c706d431ad4259a.tar.bz2
Add a test to find libfoo.X.dylib via -lfoo
Alex Băluț reported that on OS X libfoo.0.dylib cannot be found as -lfoo by the linker, and you must use -lfoo.0 instead. Add a test for this so the CI can catch such problems. The next commit will contain the fix.
-rw-r--r--test cases/osx/2 library versions/exe.orig.c4
-rw-r--r--test cases/osx/2 library versions/installed_files.txt6
-rw-r--r--test cases/osx/2 library versions/meson.build31
3 files changed, 34 insertions, 7 deletions
diff --git a/test cases/osx/2 library versions/exe.orig.c b/test cases/osx/2 library versions/exe.orig.c
new file mode 100644
index 0000000..1a8cc62
--- /dev/null
+++ b/test cases/osx/2 library versions/exe.orig.c
@@ -0,0 +1,4 @@
+int
+main (int argc, char *argv[])
+{
+}
diff --git a/test cases/osx/2 library versions/installed_files.txt b/test cases/osx/2 library versions/installed_files.txt
index 66470ab..4d58502 100644
--- a/test cases/osx/2 library versions/installed_files.txt
+++ b/test cases/osx/2 library versions/installed_files.txt
@@ -1,4 +1,4 @@
-usr/lib/libsome.0.dylib
+usr/lib/libsome.dylib
usr/lib/libnoversion.dylib
-usr/lib/libonlyversion.1.dylib
-usr/lib/libonlysoversion.5.dylib
+usr/lib/libonlyversion.dylib
+usr/lib/libonlysoversion.dylib
diff --git a/test cases/osx/2 library versions/meson.build b/test cases/osx/2 library versions/meson.build
index 504aa4e..107b467 100644
--- a/test cases/osx/2 library versions/meson.build
+++ b/test cases/osx/2 library versions/meson.build
@@ -1,18 +1,41 @@
project('library versions', 'c')
-shared_library('some', 'lib.c',
+some = shared_library('some', 'lib.c',
version : '1.2.3',
soversion : '0',
install : true)
-shared_library('noversion', 'lib.c',
+noversion = shared_library('noversion', 'lib.c',
install : true)
-shared_library('onlyversion', 'lib.c',
+onlyversion = shared_library('onlyversion', 'lib.c',
version : '1.4.5',
install : true)
-shared_library('onlysoversion', 'lib.c',
+onlysoversion = shared_library('onlysoversion', 'lib.c',
# Also test that int soversion is acceptable
soversion : 5,
install : true)
+
+# Hack to make the executables below depend on the shared libraries above
+# without actually adding them as `link_with` dependencies since we want to try
+# linking to them with -lfoo linker arguments.
+out = custom_target('library-dependency-hack',
+ input : 'exe.orig.c',
+ output : 'exe.c',
+ depends : [some, noversion, onlyversion, onlysoversion],
+ command : ['cp', '@INPUT@', '@OUTPUT@'])
+
+# Manually test if the linker can find the above libraries
+# i.e., whether they were generated with the right naming scheme
+executable('manuallink1', out,
+ link_args : ['-L.', '-lsome'])
+
+executable('manuallink2', out,
+ link_args : ['-L.', '-lnoversion'])
+
+executable('manuallink3', out,
+ link_args : ['-L.', '-lonlyversion'])
+
+executable('manuallink4', out,
+ link_args : ['-L.', '-lonlysoversion'])