diff options
| author | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2021-03-10 13:16:58 -0300 |
|---|---|---|
| committer | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2021-03-10 13:42:44 -0300 |
| commit | 237fa1add41245c381a4708c61c7b5da36940d44 (patch) | |
| tree | e44cbc1ae003abb111ba3500a6571c530a96bfd8 /net | |
| parent | c9c03e60945f87402baabc3063b7aa549db34369 (diff) | |
pdns-recursor: don't search for boost libs in host
While searching for the boost_system library in boost.m4, configure
tries to find boost_system-mt before boost_system. The presence of
boost_system-mt in the staging dir depends on
CONFIG_boost-use-name-tags. If it is not defined (default), and there
is a boost_system-mt library in the host system, it will be used, and
the build will fail.
This adds a patch to remove the host paths from the search loop,
preserving the rest of the detection logic.
Alternatively, boost_cv_lib_context_LIBS could be used to avoid library
detection code entirely, but then the mt- variant would never be used.
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/pdns-recursor/patches/300-boost-dont-search-host-dirs.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/net/pdns-recursor/patches/300-boost-dont-search-host-dirs.patch b/net/pdns-recursor/patches/300-boost-dont-search-host-dirs.patch new file mode 100644 index 000000000..41b4d4d8d --- /dev/null +++ b/net/pdns-recursor/patches/300-boost-dont-search-host-dirs.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz <cotequeiroz@gmail.com> +Date: Tue, 9 Mar 2021 16:56:13 -0300 +Subject: Openwrt: don't search for boost libs in host dirs + +While searching for the boost_system library in boost.m4, configure +tries to find boost_system-mt before boost_system. The presence of +boost_system-mt in the staging dir depends on +CONFIG_boost-use-name-tags. If it is not defined (default), and there +is a boost_system-mt library in the host system, it will be used, and +the build will fail. + +This patch removes the host paths from the search loop, preserving the +rest of the detection logic. + +Alternatively, boost_cv_lib_context_LIBS could be used to avoid library +detection code entirely, but then the mt- variant would never be used. + +Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> + +--- a/m4/boost.m4 ++++ b/m4/boost.m4 +@@ -467,8 +467,7 @@ for boost_rtopt_ in $boost_rtopt '' -d; + boost_tmp_lib=$with_boost + test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include} + for boost_ldpath in "$boost_tmp_lib/lib" '' \ +- /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ +- "$with_boost" C:/Boost/lib /lib* ++ "$with_boost" + do + # Don't waste time with directories that don't exist. + if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then |