From 40b4a5b5571370843f44a9504ed7246e9413961c Mon Sep 17 00:00:00 2001 From: Paul I Date: Tue, 10 Apr 2018 23:44:54 +0300 Subject: [PATCH] Meson: disable libversion info for Windows (#9858) --- libr/anal/meson.build | 2 +- libr/asm/meson.build | 2 +- libr/bin/meson.build | 2 +- libr/bp/meson.build | 2 +- libr/config/meson.build | 2 +- libr/cons/meson.build | 2 +- libr/core/meson.build | 2 +- libr/crypto/meson.build | 2 +- libr/debug/meson.build | 2 +- libr/egg/meson.build | 2 +- libr/flag/meson.build | 2 +- libr/fs/meson.build | 2 +- libr/hash/meson.build | 2 +- libr/io/meson.build | 2 +- libr/lang/meson.build | 2 +- libr/magic/meson.build | 2 +- libr/parse/meson.build | 2 +- libr/reg/meson.build | 2 +- libr/search/meson.build | 2 +- libr/socket/meson.build | 2 +- libr/syscall/meson.build | 2 +- libr/util/meson.build | 2 +- meson.build | 2 ++ 23 files changed, 24 insertions(+), 22 deletions(-) diff --git a/libr/anal/meson.build b/libr/anal/meson.build index 4a36d27f2b..d78316d221 100644 --- a/libr/anal/meson.build +++ b/libr/anal/meson.build @@ -113,7 +113,7 @@ r_anal = library('r_anal', files, ], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/asm/meson.build b/libr/asm/meson.build index 9754d6632e..793bef6d89 100644 --- a/libr/asm/meson.build +++ b/libr/asm/meson.build @@ -168,7 +168,7 @@ r_asm = library('r_asm', files, ], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/bin/meson.build b/libr/bin/meson.build index dac1e66666..fe4bc25b80 100644 --- a/libr/bin/meson.build +++ b/libr/bin/meson.build @@ -123,7 +123,7 @@ r_bin = library('r_bin', files, link_with: [r_util, r_io, r_socket, r_magic, libr_shlr], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/bp/meson.build b/libr/bp/meson.build index ea963948ee..ee19e85394 100644 --- a/libr/bp/meson.build +++ b/libr/bp/meson.build @@ -18,7 +18,7 @@ r_bp = library('r_bp', files, link_with: [r_util], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/config/meson.build b/libr/config/meson.build index f187cb81d3..272a4796f5 100644 --- a/libr/config/meson.build +++ b/libr/config/meson.build @@ -8,7 +8,7 @@ r_config = library('r_config', files, link_with: [r_util, libr_shlr], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/cons/meson.build b/libr/cons/meson.build index 140021d7e5..b66b8c2366 100644 --- a/libr/cons/meson.build +++ b/libr/cons/meson.build @@ -22,7 +22,7 @@ r_cons = library('r_cons', files, link_with: [r_util, libr_shlr], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/core/meson.build b/libr/core/meson.build index 4e1a73b177..a339d02d1a 100644 --- a/libr/core/meson.build +++ b/libr/core/meson.build @@ -80,7 +80,7 @@ r_core = library('r_core', files, dependencies: [platform_deps], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/crypto/meson.build b/libr/crypto/meson.build index b590c20cbd..6a9a702440 100644 --- a/libr/crypto/meson.build +++ b/libr/crypto/meson.build @@ -26,7 +26,7 @@ r_crypto = library('r_crypto', files, c_args: ['-DCORELIB=1'], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkg = import('pkgconfig') diff --git a/libr/debug/meson.build b/libr/debug/meson.build index 2476c55ebf..7acdb3ff94 100644 --- a/libr/debug/meson.build +++ b/libr/debug/meson.build @@ -70,7 +70,7 @@ r_debug = library('r_debug', files, ], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/egg/meson.build b/libr/egg/meson.build index 5966d4b716..d268bcd7eb 100644 --- a/libr/egg/meson.build +++ b/libr/egg/meson.build @@ -21,7 +21,7 @@ r_egg = library('r_egg', files, link_with: [r_util, r_asm, r_syscall, libr_shlr], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/flag/meson.build b/libr/flag/meson.build index b0aa1c5856..611b523e6e 100644 --- a/libr/flag/meson.build +++ b/libr/flag/meson.build @@ -10,7 +10,7 @@ r_flag = library('r_flag', files, link_with: [r_util, libr_shlr], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/fs/meson.build b/libr/fs/meson.build index a20bf2b14d..fa6d4416c1 100644 --- a/libr/fs/meson.build +++ b/libr/fs/meson.build @@ -35,7 +35,7 @@ r_fs = library('r_fs', files, link_with: [r_util, libr_shlr], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/hash/meson.build b/libr/hash/meson.build index b37bf0270c..8dafcc9f00 100644 --- a/libr/hash/meson.build +++ b/libr/hash/meson.build @@ -20,7 +20,7 @@ r_hash = library('r_hash', files, link_with: [r_util], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/io/meson.build b/libr/io/meson.build index bd43f2a8b3..815e9244d0 100644 --- a/libr/io/meson.build +++ b/libr/io/meson.build @@ -73,7 +73,7 @@ r_io = library('r_io', files, c_args: ['-DCORELIB=1'], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/lang/meson.build b/libr/lang/meson.build index 5a5f66e93c..8eeaf73a8d 100644 --- a/libr/lang/meson.build +++ b/libr/lang/meson.build @@ -14,7 +14,7 @@ r_lang = library('r_lang', files, link_with: [r_util, r_cons], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/magic/meson.build b/libr/magic/meson.build index dd62a2bdb0..1acd1f4617 100644 --- a/libr/magic/meson.build +++ b/libr/magic/meson.build @@ -15,7 +15,7 @@ r_magic = library('r_magic', files, link_with: [r_util], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/parse/meson.build b/libr/parse/meson.build index 4bf5653760..c09619d3e3 100644 --- a/libr/parse/meson.build +++ b/libr/parse/meson.build @@ -28,7 +28,7 @@ r_parse = library('r_parse', files, link_with: [r_util, r_flag, r_syscall, r_reg, libr_shlr], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/reg/meson.build b/libr/reg/meson.build index c3b784cb61..67b8d1b6f8 100644 --- a/libr/reg/meson.build +++ b/libr/reg/meson.build @@ -12,7 +12,7 @@ r_reg = library('r_reg', files, link_with: [r_util], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/search/meson.build b/libr/search/meson.build index 4361000ebc..6cb8e8281e 100644 --- a/libr/search/meson.build +++ b/libr/search/meson.build @@ -15,7 +15,7 @@ r_search = library('r_search', files, link_with: [r_util], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/socket/meson.build b/libr/socket/meson.build index ac008bda93..0c918e546e 100644 --- a/libr/socket/meson.build +++ b/libr/socket/meson.build @@ -16,7 +16,7 @@ r_socket = library('r_socket', files, c_args: ['-DCORELIB=1'], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/libr/syscall/meson.build b/libr/syscall/meson.build index 569545c254..d9243b1812 100644 --- a/libr/syscall/meson.build +++ b/libr/syscall/meson.build @@ -8,7 +8,7 @@ r_syscall = library('r_syscall', files, link_with: [r_util, libr_shlr], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate(libraries: [r_syscall], diff --git a/libr/util/meson.build b/libr/util/meson.build index 8339ff9f34..12d722d1fe 100644 --- a/libr/util/meson.build +++ b/libr/util/meson.build @@ -91,7 +91,7 @@ r_util = library('r_util', files, link_with: [libr_shlr], install: true, implicit_include_directories: false, - soversion: r2version + soversion: r2libversion ) pkgconfig_mod.generate( diff --git a/meson.build b/meson.build index e8435fc2b0..42c04d5925 100644 --- a/meson.build +++ b/meson.build @@ -62,6 +62,8 @@ else r2birth = r2birth.stdout().strip() endif +r2libversion = host_machine.system() == 'windows' ? '' : r2version + # system dependencies cc = meson.get_compiler('c') # required for linux