fix FreeBSD bundled protobuf build if system one is present (#12552)
* fix FreeBSD build where both bundled and pkg protobuf installed and bundled requested
Timotej S committed
Mar 30, 2022 at 17:53 UTC
cdcc3097592428f41f1e2527d9d602291777605a
1 file changed
+8
-4
configure.ac
+8
-4
@@ -280,11 +280,14 @@ fi
280
# -----------------------------------------------------------------------------
281
# operating system detection
282
283
+originalCFLAGS="${CFLAGS}"
284
AC_MSG_CHECKING([operating system])
285
case "$host_os" in
286
freebsd*)
287
build_target=freebsd
287
- CFLAGS="${CFLAGS} -I/usr/local/include -L/usr/local/lib"
288
+ OPTIONAL_OS_DEP_CFLAGS="-I/usr/local/include"
289
+ CFLAGS="${CFLAGS} ${OPTIONAL_OS_DEP_CFLAGS}"
290
+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"
291
;;
292
darwin*)
293
build_target=macos
@@ -1514,7 +1517,7 @@ test "${enable_lto}" = "yes" -a "${have_lto}" != "yes" && \
1517
AC_MSG_CHECKING([if LTO should be enabled])
1518
if test "${enable_lto}" != "no" -a "${have_lto}" = "yes"; then
1519
enable_lto="yes"
1517
- CFLAGS="${CFLAGS} -flto"
1520
+ OPTIONAL_LTO_CFLAGS="-flto"
1521
else
1522
enable_lto="no"
1523
fi
@@ -1565,11 +1568,12 @@ AC_SUBST([logdir])
1568
AC_SUBST([pluginsdir])
1569
AC_SUBST([webdir])
1570
1568
-CFLAGS="${CFLAGS} ${OPTIONAL_PROTOBUF_CFLAGS} ${OPTIONAL_MATH_CFLAGS} ${OPTIONAL_NFACCT_CFLAGS} ${OPTIONAL_ZLIB_CFLAGS} ${OPTIONAL_UUID_CFLAGS} \
1571
+CFLAGS="${originalCFLAGS} ${OPTIONAL_LTO_CFLAGS} ${OPTIONAL_PROTOBUF_CFLAGS} ${OPTIONAL_MATH_CFLAGS} ${OPTIONAL_NFACCT_CFLAGS} \
1572
+ ${OPTIONAL_ZLIB_CFLAGS} ${OPTIONAL_UUID_CFLAGS} \
1573
${OPTIONAL_LIBCAP_CFLAGS} ${OPTIONAL_IPMIMONITORING_CFLAGS} ${OPTIONAL_CUPS_CFLAGS} ${OPTIONAL_XENSTAT_FLAGS} \
1574
${OPTIONAL_KINESIS_CFLAGS} ${OPTIONAL_PUBSUB_CFLAGS} ${OPTIONAL_PROMETHEUS_REMOTE_WRITE_CFLAGS} \
1575
${OPTIONAL_MONGOC_CFLAGS} ${LWS_CFLAGS} ${OPTIONAL_JSONC_STATIC_CFLAGS} ${OPTIONAL_BPF_CFLAGS} ${OPTIONAL_JUDY_CFLAGS} \
1572
- ${OPTIONAL_ACLK_CFLAGS} ${OPTIONAL_ML_CFLAGS} ${OPTIONAL_ML_TESTS_CFLAGS}"
1576
+ ${OPTIONAL_ACLK_CFLAGS} ${OPTIONAL_ML_CFLAGS} ${OPTIONAL_ML_TESTS_CFLAGS} ${OPTIONAL_OS_DEP_CFLAGS}"
1577
1578
CXXFLAGS="${CFLAGS} ${CXX11FLAG}"
1579