mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/boost: drop versioned layout

Browse Source 
boost.m4 embedded by cc-tool is not able to find boost libraries when
they are versionned (e.g. libboost_program_options-gcc9-mt-sd-1_78.a):

configure: error: cannot find the flags to link with Boost program_options

azmq and i2pd also have the same issue:

CMake Error at /nvmedata/autobuild/instance-8/output-1/host/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message):
  Could NOT find Boost (missing: Boost_INCLUDE_DIR system date_time thread
  chrono random) (Required is at least version "1.48")

So drop versioned layout option

Fixes:
 - http://autobuild.buildroot.org/results/4ae98aed925fbb1d54023075deda9a864f52cee6
 - http://autobuild.buildroot.org/results/de35ca0156d4b6f465e440ed9a3effd471f657fa
 - http://autobuild.buildroot.org/results/c3d2a066429d5f2889c2232d62e5950eb6a89311

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine
2022-04-06 19:29:34 +02:00
committed by Arnout Vandecappelle (Essensium/Mind)
parent 5b14969409
commit ec3ed4da3a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Config.in.legacy
View File

@@ -144,6 +144,15 @@ endif
############################################################################### ###############################################################################
comment "Legacy options removed in 2022.05"
config BR2_PACKAGE_BOOST_LAYOUT_VERSIONED
bool "boost versioned layout removed"
select BR2_LEGACY
help
Boost versioned layout isn't handled by a number of autotools
and cmake packages (e.g. azmq, cc-tool, i2pd).
comment "Legacy options removed in 2022.02" comment "Legacy options removed in 2022.02"
config BR2_PACKAGE_LIBCURL_LIBNSS config BR2_PACKAGE_LIBCURL_LIBNSS

7
package/boost/Config.in
View File

@@ -36,19 +36,12 @@ config BR2_PACKAGE_BOOST_LAYOUT_TAGGED
and version, or Boost version. This option is useful if you and version, or Boost version. This option is useful if you
build several variants of Boost, using the same compiler. build several variants of Boost, using the same compiler.
config BR2_PACKAGE_BOOST_LAYOUT_VERSIONED
bool "versioned"
help
Boost binary names include the Boost version number, name
and version of the compiler and encoded build properties.
endchoice endchoice
config BR2_PACKAGE_BOOST_LAYOUT config BR2_PACKAGE_BOOST_LAYOUT
string string
default "system" if BR2_PACKAGE_BOOST_LAYOUT_SYSTEM default "system" if BR2_PACKAGE_BOOST_LAYOUT_SYSTEM
default "tagged" if BR2_PACKAGE_BOOST_LAYOUT_TAGGED default "tagged" if BR2_PACKAGE_BOOST_LAYOUT_TAGGED
default "versioned" if BR2_PACKAGE_BOOST_LAYOUT_VERSIONED
config BR2_PACKAGE_BOOST_ATOMIC config BR2_PACKAGE_BOOST_ATOMIC
bool "boost-atomic" bool "boost-atomic"