NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/pugixml: drop header-only option

Browse Source 
Header-only option raises the following build failure with gerbera since
commit cc3a4a7b1d:

/home/thomas/autobuild/instance-2/output-1/host/lib/gcc/nios2-buildroot-linux-gnu/10.4.0/../../../../nios2-buildroot-linux-gnu/bin/ld: CMakeFiles/gerbera.dir/src/main.cc.o: in function `ConfigGenerator::~ConfigGenerator()':
/home/thomas/autobuild/instance-2/output-1/build/gerbera-1.10.0/src/config/config_generator.h:33: undefined reference to `pugi::xml_document::~xml_document()'

This build failure can't be fixed by adding a
!BR2_PACKAGE_PUGIXML_HEADER_ONLY dependency as it will create the
following recursive dependency:

package/gerbera/Config.in:1:error: recursive dependency detected!
package/gerbera/Config.in:1:    symbol BR2_PACKAGE_GERBERA depends on BR2_PACKAGE_PUGIXML_HEADER_ONLY
package/pugixml/Config.in:42:   symbol BR2_PACKAGE_PUGIXML_HEADER_ONLY depends on BR2_PACKAGE_PUGIXML
package/pugixml/Config.in:1:    symbol BR2_PACKAGE_PUGIXML is selected by BR2_PACKAGE_GERBERA

Moreover, commit 48b2e50eb8 stated that
"Compact and header-only modes are not strictly needed for our use case,
but we did the work anyway and may be useful for someone else."

So dropping header-only seems to be the right approach

Fixes:
 - http://autobuild.buildroot.org/results/800537a1ef5f48d24c20aad7a9c96c56dfdc77f5

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2023-02-28 23:16:24 +01:00 committed by Peter Korsgaard
parent b1312da765
commit 6454358fe1
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Config.in.legacy
View File

@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2023.02"
config BR2_PACKAGE_PUGIXML_HEADER_ONLY
bool "pugixml header-only removed"
select BR2_LEGACY
help
The header-only version raises a build failure with gerbera.
config BR2_PACKAGE_UCCP420WLAN
bool "uccp420wlan removed"
select BR2_LEGACY

9
package/pugixml/Config.in
View File

@ -39,15 +39,6 @@ config BR2_PACKAGE_PUGIXML_COMPACT
http://pugixml.org/docs/manual.html#dom.memory.compact
config BR2_PACKAGE_PUGIXML_HEADER_ONLY
bool "Enable header-only version"
help
All source code for pugixml will be included in every
translation unit that includes pugixml.hpp. This is how most
of Boost and STL libraries work.
http://pugixml.org/docs/manual.html#install.building.header
endif
comment "pugixml needs a toolchain w/ C++"

4
package/pugixml/pugixml.mk
View File

@ -31,10 +31,6 @@ endif
PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG
HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG
ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y)
PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY
endif
PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))"
HOST_PUGIXML_CONF_OPTS += \