diff --git a/ci_config.json b/ci_config.json index 7678e25c4..7f38ddbdc 100644 --- a/ci_config.json +++ b/ci_config.json @@ -324,12 +324,6 @@ "lmdb:programs=true" ] }, - "lz4": { - "_comment": "dllexport strikes again", - "build_on": { - "windows": false - } - }, "mpdecimal": { "build_options": [ "mpdecimal:examples=true", diff --git a/releases.json b/releases.json index 90a811ee1..88d77c951 100644 --- a/releases.json +++ b/releases.json @@ -1241,6 +1241,7 @@ "liblz4" ], "versions": [ + "1.9.4-2", "1.9.4-1", "1.9.3-1", "1.9.2-1" diff --git a/subprojects/packagefiles/lz4/meson.build b/subprojects/packagefiles/lz4/meson.build index fb97073e2..2476d6457 100644 --- a/subprojects/packagefiles/lz4/meson.build +++ b/subprojects/packagefiles/lz4/meson.build @@ -372,7 +372,7 @@ project( 'lz4', - ['c'], + 'c', license: 'BSD-2-Clause-Patent AND GPL-2.0-or-later', default_options: [ 'c_std=c99', @@ -383,4 +383,16 @@ project( meson_version: '>=0.49.0' ) +# upstream meson.build has this as c_args that get passed to nowhere +if host_machine.system() == 'windows' and get_option('default_library') != 'static' + add_project_arguments('-DLZ4_DLL_EXPORT=1', language: 'c') +endif + +if get_option('unstable') + add_project_arguments('-DLZ4_STATIC_LINKING_ONLY', language: 'c') + if get_option('default_library') != 'static' + add_project_arguments('-DLZ4_PUBLISH_STATIC_FUNCTIONS', language: 'c') + endif +endif + subdir('contrib/meson/meson')