fix pugixml for hd2

diff --git a/make/environment-build.mk b/make/environment-build.mk
index 950f58fd74e039445144faddd48f29fa0b6548c8..0a1ca8dbc0f74e07dd58e1710690b979c8fc4f02 100755 (executable)
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -8,6 +8,7 @@ DEBUG          ?= "no"
 SKEL_ROOT_DIR  ?= ""
 PLUGIN_PATH    ?= ""
 LIB_HAL_SOURCE ?= "libstb_hal_tuxbox"
+LTO_JOBS      ?= auto
 
 ARCHIVE      = $(BASE_DIR)/download
 PATCHES      = $(BASE_DIR)/archive-patches
@@ -109,19 +110,19 @@ ifeq ($(BOXSERIES), hd1)
 else ifeq ($(BOXSERIES), hd2)
   CORTEX-STRINGS         = -lcortex-strings
   TARGET                 = arm-cortex-linux-uclibcgnueabi
-  TARGET_O_CFLAGS        = -O2 -flto=auto
+  TARGET_O_CFLAGS        = -O2 -flto=$(LTO_JOBS)
   TARGET_ARCH            = arm
   TARGET_CPU             = armv7-a
   TARGET_ABI             = -march=$(TARGET_CPU) -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian
   TARGET_ENDIAN          = little
   TARGET_EXTRA_CFLAGS    =
   TARGET_EXTRA_CXXFLAGS  =
-  TARGET_EXTRA_LDFLAGS   = -flto=auto
+  TARGET_EXTRA_LDFLAGS   = -flto=$(LTO_JOBS)
   ifeq ($(BOXMODEL),kronos_v2)
-    TARGET_O_CFLAGS      = -Os -flto=auto
+    TARGET_O_CFLAGS      = -Os -flto=$(LTO_JOBS)
     TARGET_EXTRA_CFLAGS  = -fdata-sections -ffunction-sections
     TARGET_EXTRA_CXXFLAGS =
-    TARGET_EXTRA_LDFLAGS = -flto=auto -Wl,--gc-sections
+    TARGET_EXTRA_LDFLAGS = -flto=$(LTO_JOBS) -Wl,--gc-sections
   endif
   CXX11_ABI              = -D_GLIBCXX_USE_CXX11_ABI=0
 

diff --git a/make/libraries.mk b/make/libraries.mk
index f2d70a955c2a2138c6909a8d4ec9658f20f9c3b6..9fac97ef005f0cbe6111fc638259a9b81e7ccc11 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -800,6 +800,12 @@ $(D)/libxslt: $(D)/libxml2 $(ARCHIVE)/libxslt-git-snapshot.tar.gz | $(TARGETPREF
        $(REMOVE)/libxslt-1.1.28
        $(TOUCH)
 
+PUGIXML_BUILD_SHARED = ON
+PUGIXML_HD2_CXXFLAGS =
+ifeq ($(BOXSERIES), hd2)
+PUGIXML_HD2_CXXFLAGS = -D_GLIBCXX_USE_CXX11_ABI=0 -fno-exceptions -DPUGIXML_NO_EXCEPTIONS
+endif
+
 $(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
        $(UNTAR)/pugixml-$(PUGIXML_VER).tar.gz
@@ -808,7 +814,8 @@ $(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGETPREFIX)
                cmake \
                --no-warn-unused-cli \
                -DCMAKE_INSTALL_PREFIX=$(TARGETPREFIX) \
-               -DBUILD_SHARED_LIBS=ON \
+               -DBUILD_SHARED_LIBS=$(PUGIXML_BUILD_SHARED) \
+               -DCMAKE_CXX_FLAGS='$(PUGIXML_HD2_CXXFLAGS)' \
                -DCMAKE_BUILD_TYPE=Linux \
                -DCMAKE_C_COMPILER=$(TARGET)-gcc \
                -DCMAKE_CXX_COMPILER=$(TARGET)-g++ && \