From 25c9440e4dbe5256ed079627d7148adaa6ac0c59 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 17 Jan 2025 11:10:26 +0100 Subject: [PATCH] Add `LIB_GETRANDOM` to `Libs.private` in `.pc` files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The omission was discovered while cross-compiling LilyPond with mingw 11.0.1: without this addition, linking with libguile causes the error undefined reference to `BCryptGenRandom' * meta/Makefile.am (dependency_substitutions): Add ‘LIB_GETRANDOM’. * meta/guile-3.0-uninstalled.pc.in (Libs.private): Likewise. * meta/guile-3.0.pc.in (Libs.private): Likewise. * NEWS: Update. Signed-off-by: Ludovic Courtès --- NEWS | 2 ++ meta/Makefile.am | 1 + meta/guile-3.0-uninstalled.pc.in | 8 ++++---- meta/guile-3.0.pc.in | 8 ++++---- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index c2fff8d14..135615fab 100644 --- a/NEWS +++ b/NEWS @@ -76,6 +76,8 @@ every line in a file. previously Guile would pass through the related exception. Now it prints the file descriptor instead (as it does when `ttyname` isn't available or the port isn't a tty). +** Fix build error when cross-compiling to MinGW + () Changes in 3.0.10 (since 3.0.9) diff --git a/meta/Makefile.am b/meta/Makefile.am index 28cd3b0b3..0525b0493 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -81,6 +81,7 @@ dependency_substitutions = \ -e "s|[@]BDW_GC_CFLAGS[@]|$(BDW_GC_CFLAGS)|g" \ -e "s|[@]BDW_GC_LIBS[@]|$(BDW_GC_LIBS)|g" \ -e "s|[@]LIB_CLOCK_GETTIME[@]|$(LIB_CLOCK_GETTIME)|g" \ + -e "s|[@]LIB_GETRANDOM[@]|$(LIB_GETRANDOM)|g" \ -e "s|[@]LIBGMP[@]|$(LIBGMP)|g" \ -e "s|[@]LIBLTDL[@]|$(LIBLTDL)|g" \ -e "s|[@]LIBFFI_LIBS[@]|$(LIBFFI_LIBS)|g" \ diff --git a/meta/guile-3.0-uninstalled.pc.in b/meta/guile-3.0-uninstalled.pc.in index e43fd3ae4..725c74c24 100644 --- a/meta/guile-3.0-uninstalled.pc.in +++ b/meta/guile-3.0-uninstalled.pc.in @@ -5,8 +5,8 @@ Name: GNU Guile (uninstalled) Description: GNU's Ubiquitous Intelligent Language for Extension (uninstalled) Version: @GUILE_VERSION@ Libs: -L${builddir}/libguile -lguile-@GUILE_EFFECTIVE_VERSION@ @BDW_GC_LIBS@ -Libs.private: @LIB_CLOCK_GETTIME@ @LIBGMP@ @LIBLTDL@ @LIBFFI_LIBS@ \ - @LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ @LIBSOCKET@ \ - @SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ @INET_NTOP_LIB@ \ - @INET_PTON_LIB@ +Libs.private: @LIB_CLOCK_GETTIME@ @LIB_GETRANDOM@ @LIBGMP@ @LIBLTDL@ \ + @LIBFFI_LIBS@ @LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ \ + @LIBSOCKET@ @SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ \ + @INET_NTOP_LIB@ @INET_PTON_LIB@ Cflags: -I${srcdir} -I${builddir} @GUILE_CFLAGS@ @BDW_GC_CFLAGS@ diff --git a/meta/guile-3.0.pc.in b/meta/guile-3.0.pc.in index c6d12b589..202868589 100644 --- a/meta/guile-3.0.pc.in +++ b/meta/guile-3.0.pc.in @@ -23,8 +23,8 @@ Name: GNU Guile Description: GNU's Ubiquitous Intelligent Language for Extension Version: @GUILE_VERSION@ Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ @BDW_GC_LIBS@ -Libs.private: @LIB_CLOCK_GETTIME@ @LIBGMP@ @LIBLTDL@ @LIBFFI_LIBS@ \ - @LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ @LIBSOCKET@ \ - @SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ @INET_NTOP_LIB@ \ - @INET_PTON_LIB@ +Libs.private: @LIB_CLOCK_GETTIME@ @LIB_GETRANDOM@ @LIBGMP@ @LIBLTDL@ \ + @LIBFFI_LIBS@ @LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ \ + @LIBSOCKET@ @SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ \ + @INET_NTOP_LIB@ @INET_PTON_LIB@ Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@