Skip to content

CFE-4385: Fix build on macOS #5739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
btriller wants to merge 1 commit into from
Closed

CFE-4385: Fix build on macOS #5739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/macos_unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ jobs:
run: libtool -V && automake --version && autoconf --version
- name: Run autotools / configure
run: >
LDFLAGS="-L`brew --prefix lmdb`/lib -L`brew --prefix openssl`/lib -L`brew --prefix pcre2`/lib -L`brew --prefix librsync`/lib"
CPPFLAGS="-I`brew --prefix lmdb`/include -I`brew --prefix openssl`/include -I`brew --prefix pcre2`/include -I`brew --prefix librsync`/include"
PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH"
./autogen.sh --enable-debug
- name: Compile and link
run: make -j8 CFLAGS="-Werror -Wall"
Expand Down
44 changes: 36 additions & 8 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,17 @@ AC_PROG_CC
AC_PROG_MKDIR_P
AC_EXEEXT

AS_CASE([${target_os}],
[darwin*], [
AC_CHECK_PROG([BREW], [brew], [brew])
AC_MSG_CHECKING([for OS X Homebrew])
AS_IF([test "x$BREW" = "xbrew"], [
have_brew=yes
AC_MSG_RESULT([OS X Homebrew detected])
],
[have_brew=])
])

dnl GCC specific flags
m4_include([m4/cf3_gcc_flags.m4])

Expand Down Expand Up @@ -374,6 +385,8 @@ then
fi
fi

AS_IF([test "x$have_brew" = "xyes" && test -d $(brew --prefix mysql)/], [with_mysql=$(brew --prefix mysql)])

CF3_WITH_LIBRARY(mysql,
[AC_CHECK_LIB(mysqlclient, mysql_real_connect,
[],
Expand Down Expand Up @@ -437,6 +450,8 @@ AC_ARG_WITH([lmdb],
AS_IF([test $WITH_TOKYO -eq 0 && test $WITH_QDBM -eq 0 && (! test -n "$with_lmdb" || test "x$with_lmdb" != "xno")], [WITH_LMDB=1], [WITH_LMDB=0])

if test $WITH_LMDB = 1; then
AS_IF([test "x$have_brew" = "xyes" && test -d $(brew --prefix lmdb)/], [with_lmdb=$(brew --prefix lmdb)])

CF3_WITH_LIBRARY(lmdb, [
AC_CHECK_LIB(lmdb, mdb_dbi_open, [], [AC_MSG_ERROR(Cannot find Lightning MDB)])
AC_CHECK_HEADERS(lmdb.h, [], [AC_MSG_ERROR(Cannot find Lightning MDB)])
Expand All @@ -460,13 +475,7 @@ if test x"$with_openssl" = xno ; then
AC_MSG_ERROR([This release of CFEngine requires OpenSSL >= 0.9.7])
fi

if test -d /usr/local/Cellar/ && \
test -d /usr/local/opt/openssl/ && \
test "x$with_openssl" = "xyes" ; then
with_openssl=$(brew --prefix openssl)
echo "OS X Homebrew detected"
echo "Defaulting to: --with-openssl=$with_openssl"
fi
AS_IF([test "x$have_brew" = "xyes" && test -d $(brew --prefix openssl)/], [with_openssl=$(brew --prefix openssl)])

CF3_WITH_LIBRARY(openssl, [
AC_CHECK_LIB(crypto, RSA_generate_key_ex, [], [])
Expand Down Expand Up @@ -505,12 +514,15 @@ CF3_WITH_LIBRARY(openssl, [
])

dnl PCRE2

AC_ARG_WITH([pcre2], [AS_HELP_STRING([--with-pcre2[[=PATH]]], [Specify PCRE2 path])], [], [with_pcre2=yes])

if test "x$with_pcre2" = "xno"; then
AC_MSG_ERROR([PCRE2 is required])
fi

AS_IF([test "x$have_brew" = "xyes" && test -d $(brew --prefix pcre2)/], [with_pcre2=$(brew --prefix pcre2)])

CF3_WITH_LIBRARY(pcre2, [
AC_CHECK_LIB(pcre2-8, pcre2_compile_8, [], [AC_MSG_ERROR(Cannot find PCRE2)])
AC_CHECK_HEADERS(
Expand All @@ -529,6 +541,8 @@ if test "x$with_librsync" = "xno"; then
AC_MSG_ERROR([librsync is required])
fi

AS_IF([test "x$have_brew" = "xyes" && test -d $(brew --prefix librsync)/], [with_librsync=$(brew --prefix librsync)])

CF3_WITH_LIBRARY(librsync, [
AC_CHECK_HEADERS([librsync.h], [], AC_MSG_ERROR(Cannot find librsync))
AC_CHECK_LIB(rsync, rs_job_iter, [], [AC_MSG_ERROR(Cannot find librsync)])
Expand All @@ -548,6 +562,8 @@ AC_ARG_WITH([libvirt],

if test "x$with_libvirt" != xno
then
AS_IF([test "x$have_brew" = "xyes" && test -d $(brew --prefix libvirt)/], [with_libvirt=$(brew --prefix libvirt)])

CF3_WITH_LIBRARY(libvirt, [
AC_CHECK_LIB(virt, virConnectOpen, [], [if test "x$with_libvirt" != xcheck; then AC_MSG_ERROR(Cannot find libvirt library); fi])
AC_CHECK_HEADERS(libvirt/libvirt.h, [], [if test "x$with_libvirt" != xcheck; then AC_MSG_ERROR(Cannot find libvirt library headers); fi])
Expand Down Expand Up @@ -587,6 +603,8 @@ AC_ARG_WITH([libcurl],

if test "x$with_libcurl" != xno
then
AS_IF([test "x$have_brew" = "xyes" && test -d $(brew --prefix curl)/], [with_libcurl=$(brew --prefix curl)])

CF3_WITH_LIBRARY(libcurl, [
AC_CHECK_LIB(curl, curl_global_init,
[],
Expand All @@ -612,6 +630,8 @@ AC_ARG_WITH([libyaml],

if test "x$with_libyaml" != xno
then
AS_IF([test "x$have_brew" = "xyes" && test -d $(brew --prefix libyaml)/], [with_libyaml=$(brew --prefix libyaml)])

CF3_WITH_LIBRARY(libyaml, [
AC_CHECK_LIB(yaml, yaml_parser_initialize,
[],
Expand All @@ -634,7 +654,13 @@ AC_ARG_WITH([libxml2],
have_libxml2="no"

if test "x$with_libxml2" != "xno"; then
if test -n "$PKG_CONFIG"; then
if test "x$have_brew" = "xyes" && \
test -d $(brew --prefix libxml2)/; then
with_libxml2=$(brew --prefix libxml2)
echo "OS X Homebrew detected"
echo "Defaulting to: --with-libxml2=$with_libxml2"
have_libxml2="yes"
elif test -n "$PKG_CONFIG"; then
AC_MSG_CHECKING([for libxml2 via pkg-config])
if `$PKG_CONFIG --exists libxml-2.0`; then
LIBXML2_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0`
Expand Down Expand Up @@ -1774,6 +1800,8 @@ AC_MSG_RESULT([-> OpenSSL: $OPENSSL_PATH])

AC_MSG_RESULT([-> PCRE2: $PCRE2_PATH])

AC_MSG_RESULT([-> Rsync: $LIBRSYNC_PATH])

if test $WITH_TOKYO = 1; then
AC_MSG_RESULT([-> DB: Tokyo Cabinet: $TOKYOCABINET_PATH])
elif test $WITH_QDBM = 1; then
Expand Down
1 change: 1 addition & 0 deletions libcfnet/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/libntech/libutils \
-I$(top_srcdir)/libpromises \
$(PCRE2_CPPFLAGS) \
$(SYSTEMD_SOCKET_CPPFLAGS) \
$(LIBRSYNC_CPPFLAGS) \
$(OPENSSL_CPPFLAGS)

libcfnet_la_SOURCES = \
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ xml_c14nize_CPPFLAGS = \
-I$(srcdir)/../../libntech/libutils \
$(LIBXML2_CPPFLAGS)

xml_c14nize_CFLAGS = $(LIBXML2_CFLAGS)
xml_c14nize_LDFLAGS = $(LIBXML2_LDFLAGS)
xml_c14nize_LDADD = ../../libntech/libutils/libutils.la $(LIBXML2_LIBS)
xml_c14nize_CFLAGS = $(LIBXML2_CFLAGS) $(LMDB_CFLAGS) $(LIBRSYNC_CFLAGS)
xml_c14nize_LDFLAGS = $(LIBXML2_LDFLAGS) $(LMDB_LDFLAGS) $(LIBRSYNC_LDFLAGS)
xml_c14nize_LDADD = ../../libntech/libutils/libutils.la $(LIBXML2_LIBS) $(LMDB_LIBS) $(LIBRSYNC_LIBS)
endif

TESTS =
Expand Down
Loading