From 21120483cfef46d9c8acf00a7ba91b525c8e1421 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 10 May 2025 08:44:00 -0600 Subject: [PATCH] libgcrypt: update and fix --- recipes/wip/libs/other/libgcrypt/recipe.toml | 18 +++++++++++++++--- recipes/wip/libs/other/libgcrypt/redox.patch | 20 ++++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 recipes/wip/libs/other/libgcrypt/redox.patch diff --git a/recipes/wip/libs/other/libgcrypt/recipe.toml b/recipes/wip/libs/other/libgcrypt/recipe.toml index 441fc1b6..c02dd88d 100644 --- a/recipes/wip/libs/other/libgcrypt/recipe.toml +++ b/recipes/wip/libs/other/libgcrypt/recipe.toml @@ -1,5 +1,17 @@ -#TODO compilation error [source] -tar = "https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.2.tar.bz2" +tar = "https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.11.1.tar.bz2" +blake3 = "68844e12b92960d66c4ce85a4c3db1df8377b232980f1218b4c5d904e9c02511" +patches = ["redox.patch"] +script = """ +DYNAMIC_INIT +autotools_recursive_regenerate +""" + [build] -template = "configure" \ No newline at end of file +dependencies = ["libgpg-error"] +template = "custom" +script = """ +DYNAMIC_INIT +export GPGRT_CONFIG="${COOKBOOK_SYSROOT}/usr/bin/gpgrt-config" +cookbook_configure +""" diff --git a/recipes/wip/libs/other/libgcrypt/redox.patch b/recipes/wip/libs/other/libgcrypt/redox.patch new file mode 100644 index 00000000..4ac898dc --- /dev/null +++ b/recipes/wip/libs/other/libgcrypt/redox.patch @@ -0,0 +1,20 @@ +--- libgcrypt-1.11.1/tests/stopwatch.h 2025-03-17 03:55:24.000000000 -0600 ++++ source/tests/stopwatch.h 2025-05-10 08:42:52.113921935 -0600 +@@ -45,6 +45,8 @@ + &started_at.creation_time, &started_at.exit_time, + &started_at.kernel_time, &started_at.user_time); + stopped_at = started_at; ++#elif defined(__redox__) ++ //TODO: times on redox + #else + struct tms tmp; + +@@ -60,6 +62,8 @@ + GetProcessTimes (GetCurrentProcess (), + &stopped_at.creation_time, &stopped_at.exit_time, + &stopped_at.kernel_time, &stopped_at.user_time); ++#elif defined(__redox__) ++ //TODO: times on redox + #else + struct tms tmp; +