From ebcee4342b973c0d8816e9a3cc872d47cda2f3c2 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Mon, 18 Sep 2023 13:28:36 +0200 Subject: [PATCH] add patch apr-config-prefix-env to 1.7.4 in order to fix build of apr-util --- recipes/apr/all/conandata.yml | 23 +++++++++++-------- ...0001-cmake-build-only-shared-static.patch} | 0 ...=> 1.7.0-0002-apr-config-prefix-env.patch} | 0 ...0003-cmake-gen_test_char-use-target.patch} | 0 ...patch => 1.7.0-0004-autotools-mingw.patch} | 0 ...e.patch => 1.7.0-0005-clang12-apple.patch} | 0 ...patch => 1.7.0-0006-sys_siglist-fix.patch} | 0 ...> 1.7.0-0007-cmake-minimum-required.patch} | 0 ...0001-cmake-build-only-shared-static.patch} | 0 9 files changed, 14 insertions(+), 9 deletions(-) rename recipes/apr/all/patches/{0001-cmake-build-only-shared-static.patch => 1.7.0-0001-cmake-build-only-shared-static.patch} (100%) rename recipes/apr/all/patches/{0002-apr-config-prefix-env.patch => 1.7.0-0002-apr-config-prefix-env.patch} (100%) rename recipes/apr/all/patches/{0003-cmake-gen_test_char-use-target.patch => 1.7.0-0003-cmake-gen_test_char-use-target.patch} (100%) rename recipes/apr/all/patches/{0004-autotools-mingw.patch => 1.7.0-0004-autotools-mingw.patch} (100%) rename recipes/apr/all/patches/{0005-clang12-apple.patch => 1.7.0-0005-clang12-apple.patch} (100%) rename recipes/apr/all/patches/{0006-sys_siglist-fix.patch => 1.7.0-0006-sys_siglist-fix.patch} (100%) rename recipes/apr/all/patches/{0007-cmake-minimum-required.patch => 1.7.0-0007-cmake-minimum-required.patch} (100%) rename recipes/apr/all/patches/{0401-cmake-build-only-shared-static.patch => 1.7.4-0001-cmake-build-only-shared-static.patch} (100%) diff --git a/recipes/apr/all/conandata.yml b/recipes/apr/all/conandata.yml index 0e388265ecf5f..6ce547b4ee2f4 100644 --- a/recipes/apr/all/conandata.yml +++ b/recipes/apr/all/conandata.yml @@ -7,21 +7,26 @@ sources: sha256: "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea" patches: "1.7.4": - - patch_file: "patches/0401-cmake-build-only-shared-static.patch" + - patch_file: "patches/1.7.4-0001-cmake-build-only-shared-static.patch" patch_type: "conan" patch_description: "Use BUILD_SHARED_LIBS to conditionally build static/dynamic libs" - - patch_file: "patches/0006-sys_siglist-fix.patch" + - patch_file: "patches/1.7.0-0002-apr-config-prefix-env.patch" + patch_type: "conan" + patch_description: "Allow downtream recipes to detect some helpr build files of apr in a relocatalbe context" + - patch_file: "patches/1.7.0-0006-sys_siglist-fix.patch" patch_type: "bugfix" patch_description: "Replace deprecated sys_siglist[] with strsignal()" "1.7.0": - - patch_file: "patches/0001-cmake-build-only-shared-static.patch" + - patch_file: "patches/1.7.0-0001-cmake-build-only-shared-static.patch" patch_type: "conan" patch_description: "Use BUILD_SHARED_LIBS to conditionally build static/dynamic libs" - - patch_file: "patches/0002-apr-config-prefix-env.patch" - - patch_file: "patches/0003-cmake-gen_test_char-use-target.patch" - - patch_file: "patches/0004-autotools-mingw.patch" - - patch_file: "patches/0005-clang12-apple.patch" - - patch_file: "patches/0006-sys_siglist-fix.patch" + - patch_file: "patches/1.7.0-0002-apr-config-prefix-env.patch" + patch_type: "conan" + patch_description: "Allow downtream recipes to detect some helpr build files of apr in a relocatalbe context" + - patch_file: "patches/1.7.0-0003-cmake-gen_test_char-use-target.patch" + - patch_file: "patches/1.7.0-0004-autotools-mingw.patch" + - patch_file: "patches/1.7.0-0005-clang12-apple.patch" + - patch_file: "patches/1.7.0-0006-sys_siglist-fix.patch" patch_type: "bugfix" patch_description: "Replace deprecated sys_siglist[] with strsignal()" - - patch_file: "patches/0007-cmake-minimum-required.patch" + - patch_file: "patches/1.7.0-0007-cmake-minimum-required.patch" diff --git a/recipes/apr/all/patches/0001-cmake-build-only-shared-static.patch b/recipes/apr/all/patches/1.7.0-0001-cmake-build-only-shared-static.patch similarity index 100% rename from recipes/apr/all/patches/0001-cmake-build-only-shared-static.patch rename to recipes/apr/all/patches/1.7.0-0001-cmake-build-only-shared-static.patch diff --git a/recipes/apr/all/patches/0002-apr-config-prefix-env.patch b/recipes/apr/all/patches/1.7.0-0002-apr-config-prefix-env.patch similarity index 100% rename from recipes/apr/all/patches/0002-apr-config-prefix-env.patch rename to recipes/apr/all/patches/1.7.0-0002-apr-config-prefix-env.patch diff --git a/recipes/apr/all/patches/0003-cmake-gen_test_char-use-target.patch b/recipes/apr/all/patches/1.7.0-0003-cmake-gen_test_char-use-target.patch similarity index 100% rename from recipes/apr/all/patches/0003-cmake-gen_test_char-use-target.patch rename to recipes/apr/all/patches/1.7.0-0003-cmake-gen_test_char-use-target.patch diff --git a/recipes/apr/all/patches/0004-autotools-mingw.patch b/recipes/apr/all/patches/1.7.0-0004-autotools-mingw.patch similarity index 100% rename from recipes/apr/all/patches/0004-autotools-mingw.patch rename to recipes/apr/all/patches/1.7.0-0004-autotools-mingw.patch diff --git a/recipes/apr/all/patches/0005-clang12-apple.patch b/recipes/apr/all/patches/1.7.0-0005-clang12-apple.patch similarity index 100% rename from recipes/apr/all/patches/0005-clang12-apple.patch rename to recipes/apr/all/patches/1.7.0-0005-clang12-apple.patch diff --git a/recipes/apr/all/patches/0006-sys_siglist-fix.patch b/recipes/apr/all/patches/1.7.0-0006-sys_siglist-fix.patch similarity index 100% rename from recipes/apr/all/patches/0006-sys_siglist-fix.patch rename to recipes/apr/all/patches/1.7.0-0006-sys_siglist-fix.patch diff --git a/recipes/apr/all/patches/0007-cmake-minimum-required.patch b/recipes/apr/all/patches/1.7.0-0007-cmake-minimum-required.patch similarity index 100% rename from recipes/apr/all/patches/0007-cmake-minimum-required.patch rename to recipes/apr/all/patches/1.7.0-0007-cmake-minimum-required.patch diff --git a/recipes/apr/all/patches/0401-cmake-build-only-shared-static.patch b/recipes/apr/all/patches/1.7.4-0001-cmake-build-only-shared-static.patch similarity index 100% rename from recipes/apr/all/patches/0401-cmake-build-only-shared-static.patch rename to recipes/apr/all/patches/1.7.4-0001-cmake-build-only-shared-static.patch