Skip to content

add --with-system-boost configure option for using system-wide boost headers #6972

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

Merged
merged 3 commits into from
Sep 17, 2021
+13 −0
Merged

add --with-system-boost configure option for using system-wide boost headers #6972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b30b34a
add --with-system-boost configure option for using system-wide boost …
real-dam Sep 15, 2021
959a484
rename USE_SYSTEM_BOOST define to FB_USE_SYSTEM_BOOST
real-dam Sep 16, 2021
6c0a8ce
rework --with-system-boost using sed to adjust Message.h
real-dam Sep 17, 2021
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
5 changes: 5 additions & 0 deletions builds/posix/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,11 @@ $(INCLUDE_DEST)/ib_util.h : $(SRC_OtherDistribHeaders)
mkdir -p $(INCLUDE_DEST)
$(CP) $^ $(INCLUDE_DEST)/

ifeq ($(SYSTEM_BOOST_FLG),Y)
$(INCLUDE_DEST)/firebird/Message.h : $(SRC_ROOT)/include/firebird/Message.h
sed 's,^#include "\./impl/boost/\(.\+\)",#include <boost/\1>,; s/\bFB_BOOST_PP_/BOOST_PP_/g' $< > $@
endif

$(INCLUDE_DEST)/firebird/%: $(SRC_ROOT)/include/firebird/%
mkdir -p $(@D)
$(CP) $< $@
Expand Down
1 change: 1 addition & 0 deletions builds/posix/make.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ IsCross=@IS_CROSS@
TOMMATH_BUILD_FLG=@TOMMATH_BUILD@
TOMCRYPT_BUILD_FLG=@TOMCRYPT_BUILD@
RE2_BUILD_FLG=@RE2_BUILD@
SYSTEM_BOOST_FLG=@SYSTEM_BOOST@

FB_BUILD=$(GEN_ROOT)/$(TARGET)/firebird
ifeq ($(IsCross), Y)
Expand Down
7 changes: 7 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,12 @@ AC_ARG_WITH(system-re2,
[RE2_BUILD=N])
AC_SUBST(RE2_BUILD)

SYSTEM_BOOST=N
AC_ARG_WITH(system-boost,
[ --with-system-boost use system-wide boost library instead of embedded copy],
[SYSTEM_BOOST=Y])
AC_SUBST(SYSTEM_BOOST)

dnl Avoid dumb '-g -O2' autoconf's default
dnl Debugging information and optimization flags should be set in prefix.$platform file
dnl Should be replaced with AC_PROG_GCC_DEFAULT_FLAGS() when available
Expand Down Expand Up @@ -616,6 +622,7 @@ if test "$LSB_FLG" = "Y"; then
AC_SUBST(TOMMATH_BUILD, Y)
AC_SUBST(TOMCRYPT_BUILD, Y)
AC_SUBST(RE2_BUILD, Y)
AC_SUBST(SYSTEM_BOOST, N)
AC_PATH_PROG(CC, lsbcc, "", [$PATH$PATH_SEPARATOR/opt/lsb/bin$PATH_SEPARATOR])
AC_PATH_PROG(CXX, lsbc++, "", [$PATH$PATH_SEPARATOR/opt/lsb/bin$PATH_SEPARATOR])
if test "x$CC" = "x" || test "x$CXX" = "x" ; then
Expand Down