diff options
| -rw-r--r-- | recipes/libpsl.recipe | 9 | ||||
| -rw-r--r-- | recipes/libpsl/0001-meson-Use-libtool-library-versioning-same-as-autotoo.patch | 41 |
2 files changed, 49 insertions, 1 deletions
diff --git a/recipes/libpsl.recipe b/recipes/libpsl.recipe index 702aec79..62f3f6a7 100644 --- a/recipes/libpsl.recipe +++ b/recipes/libpsl.recipe @@ -10,11 +10,18 @@ class Recipe(recipe.Recipe): tarball_checksum = '41bd1c75a375b85c337b59783f5deb93dbb443fb0a52d257f403df7bd653ee12' meson_options = {'runtime': 'no', 'builtin': 'no'} - patches = ['libpsl/0001-Initial-import-of-meson-build-files-from-upstream.patch'] + patches = [ + # Taken from upstream git tag 0.21.0 + 'libpsl/0001-Initial-import-of-meson-build-files-from-upstream.patch', + # https://github.com/rockdaboot/libpsl/pull/148 + 'libpsl/0001-meson-Use-libtool-library-versioning-same-as-autotoo.patch', + ] files_libs = ['libpsl'] files_devel = ['include/libpsl.h', 'lib/pkgconfig/libpsl.pc'] def prepare(self): + # FIXME: The actual upstreamable fix would be to not use system() at + # all, or to have an option to disable building of tests. if self.config.target_platform == Platform.IOS: self.patches += ['libpsl/0002-meson-Do-not-build-tests-on-iOS.patch'] diff --git a/recipes/libpsl/0001-meson-Use-libtool-library-versioning-same-as-autotoo.patch b/recipes/libpsl/0001-meson-Use-libtool-library-versioning-same-as-autotoo.patch new file mode 100644 index 00000000..acfcb0e3 --- /dev/null +++ b/recipes/libpsl/0001-meson-Use-libtool-library-versioning-same-as-autotoo.patch @@ -0,0 +1,41 @@ +From 841ae6ddddf848a05509e27ad516e4d5c1758f10 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@centricular.com> +Date: Fri, 28 Feb 2020 13:20:23 +0530 +Subject: [PATCH] meson: Use libtool library versioning, same as autotools + +This helps maintain ABI compatibility with the Autotools build so it's +a drop-in replacement. +--- + meson.build | 3 +++ + src/meson.build | 1 + + 2 files changed, 4 insertions(+) + +diff --git a/meson.build b/meson.build +index 773e6af..2f54339 100644 +--- a/meson.build ++++ b/meson.build +@@ -2,6 +2,9 @@ project('libpsl', 'c', + version : '0.20.2', + meson_version : '>=0.47.0') + ++# Derived from LIBPSL_SO_VERSION in configure.ac ++lt_version = '5.3.2' ++ + cc = meson.get_compiler('c') + + enable_runtime = get_option('runtime') +diff --git a/src/meson.build b/src/meson.build +index 9bce343..50a272e 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -20,6 +20,7 @@ libpsl = library('psl', sources, suffixes_dafsa_h, + include_directories : [configinc, includedir], + c_args : cargs, + dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps], ++ version: lt_version, + install: true, + ) + +-- +2.24.1 + |