Title: [280469] trunk
- Revision
- 280469
- Author
- ape...@igalia.com
- Date
- 2021-07-30 01:29:29 -0700 (Fri, 30 Jul 2021)
Log Message
[CMake] Fix fallback methods in the libgcrypt find module
https://bugs.webkit.org/show_bug.cgi?id=228581
Reviewed by Carlos Alberto Lopez Perez.
* Source/cmake/FindLibGcrypt.cmake: Make sure to use the libgcrypt-config script as
first fallback if libgcrypt.pc is not present, and fix the regexp used as last fallback
that checks the version from the gcrypt.h header as last fallback to only include digits
and periods.
Modified Paths
Diff
Modified: trunk/ChangeLog (280468 => 280469)
--- trunk/ChangeLog 2021-07-30 06:43:48 UTC (rev 280468)
+++ trunk/ChangeLog 2021-07-30 08:29:29 UTC (rev 280469)
@@ -1,3 +1,15 @@
+2021-07-30 Adrian Perez de Castro <ape...@igalia.com>
+
+ [CMake] Fix fallback methods in the libgcrypt find module
+ https://bugs.webkit.org/show_bug.cgi?id=228581
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * Source/cmake/FindLibGcrypt.cmake: Make sure to use the libgcrypt-config script as
+ first fallback if libgcrypt.pc is not present, and fix the regexp used as last fallback
+ that checks the version from the gcrypt.h header as last fallback to only include digits
+ and periods.
+
2021-07-29 Myles C. Maxfield <mmaxfi...@apple.com>
Stop building WebGPU and the WHLSL compiler to decrease binary size
Modified: trunk/Source/cmake/FindLibGcrypt.cmake (280468 => 280469)
--- trunk/Source/cmake/FindLibGcrypt.cmake 2021-07-30 06:43:48 UTC (rev 280468)
+++ trunk/Source/cmake/FindLibGcrypt.cmake 2021-07-30 08:29:29 UTC (rev 280469)
@@ -47,7 +47,9 @@
pkg_check_modules(PC_GPGERROR QUIET gpg-error)
set(LibGcrypt_COMPILE_OPTIONS ${PC_GCRYPT_CFLAGS_OTHER} ${PC_GPGERROR_CFLAGS_OTHER})
set(LibGcrypt_VERSION ${PC_GCRYPT_VERSION})
-elseif (LIBGCRYPTCONFIG_SCRIPT)
+endif ()
+
+if (LIBGCRYPTCONFIG_SCRIPT AND NOT PC_GCRYPT)
execute_process(
COMMAND "${LIBGCRYPTCONFIG_SCRIPT}" --prefix
RESULT_VARIABLE CONFIGSCRIPT_RESULT
@@ -105,8 +107,8 @@
)
if (LibGcrypt_INCLUDE_DIR AND NOT LibGcrypt_VERSION)
- file(STRINGS ${LIBGCRYPT_INCLUDE_DIR}/gcrypt.h GCRYPT_H REGEX "^#define GCRYPT_VERSION ")
- string(REGEX REPLACE "^#define GCRYPT_VERSION \"(.*)\".*$" "\\1" LibGcrypt_VERSION "${GCRYPT_H}")
+ file(STRINGS ${LibGcrypt_INCLUDE_DIR}/gcrypt.h GCRYPT_H REGEX "^#define GCRYPT_VERSION ")
+ string(REGEX REPLACE "^#define GCRYPT_VERSION \"([0-9.]\+)[^\"]*\".*$" "\\1" LibGcrypt_VERSION "${GCRYPT_H}")
endif ()
include(FindPackageHandleStandardArgs)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
