You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

32 lines
1.4 KiB

  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: Eneas U de Queiroz <cotequeiroz@gmail.com>
  3. Date: Tue, 9 Mar 2021 16:56:13 -0300
  4. Subject: Openwrt: don't search for boost libs in host dirs
  5. While searching for the boost_system library in boost.m4, configure
  6. tries to find boost_system-mt before boost_system. The presence of
  7. boost_system-mt in the staging dir depends on
  8. CONFIG_boost-use-name-tags. If it is not defined (default), and there
  9. is a boost_system-mt library in the host system, it will be used, and
  10. the build will fail.
  11. This patch removes the host paths from the search loop, preserving the
  12. rest of the detection logic.
  13. Alternatively, boost_cv_lib_context_LIBS could be used to avoid library
  14. detection code entirely, but then the mt- variant would never be used.
  15. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
  16. --- a/m4/boost.m4
  17. +++ b/m4/boost.m4
  18. @@ -467,8 +467,7 @@ for boost_rtopt_ in $boost_rtopt '' -d;
  19. boost_tmp_lib=$with_boost
  20. test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
  21. for boost_ldpath in "$boost_tmp_lib/lib" '' \
  22. - /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
  23. - "$with_boost" C:/Boost/lib /lib*
  24. + "$with_boost"
  25. do
  26. # Don't waste time with directories that don't exist.
  27. if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then