From 3f1103ea8d6aba2aad6eee95d8a0009bd24bd337 Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Mon, 24 Jun 2024 18:28:45 +0100 Subject: [PATCH] portable: fix compilation on OpenBSD Make -portable work on OpenBSD; explicitly use -ltls, and dont't use PKG_CONFIG to check for a library which won't exist on OpenBSD. --- configure.ac | 3 ++- gotd/libexec/got-notify-http/Makefile.am | 4 ++++ libexec/got-fetch-http/Makefile.am | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6a3a18fa..1a04a063 100644 --- a/configure.ac +++ b/configure.ac @@ -759,7 +759,7 @@ AC_CHECK_DECL( [#include ] ) -#FIXME: May need OS-wrapping. +if test "x$PLATFORM" != "xopenbsd"; then PKG_CHECK_MODULES( LIBTLS, [libtls], @@ -771,6 +771,7 @@ PKG_CHECK_MODULES( ], AC_MSG_ERROR(["*** Couldn't find libtls ***"]) ) +fi # Look for __progname. AC_MSG_CHECKING(for __progname) diff --git a/gotd/libexec/got-notify-http/Makefile.am b/gotd/libexec/got-notify-http/Makefile.am index 074f0901..1cbc9bf7 100644 --- a/gotd/libexec/got-notify-http/Makefile.am +++ b/gotd/libexec/got-notify-http/Makefile.am @@ -20,4 +20,8 @@ if HOST_FREEBSD LDADD += -lmd endif +if HOST_OPENBSD +LDADD += -ltls +endif + AM_CPPFLAGS += $(zlib_CFLAGS) $(libbsd_CFLAGS) $(libmd_CFLAGS) $(libtls_CFLAGS) diff --git a/libexec/got-fetch-http/Makefile.am b/libexec/got-fetch-http/Makefile.am index 65311c88..09e3108e 100644 --- a/libexec/got-fetch-http/Makefile.am +++ b/libexec/got-fetch-http/Makefile.am @@ -22,4 +22,8 @@ if HOST_FREEBSD LDADD += -lmd endif +if HOST_OPENBSD +LDADD += -ltls +endif + AM_CPPFLAGS += $(zlib_CFLAGS) $(libbsd_CFLAGS) $(libmd_CFLAGS) $(libtls_CFLAGS) -- 2.11.4.GIT