]> git.webhop.me Git - bs-cst-neutrino-hd.git/commitdiff
fix libxml2 target
authorMarkham <markham001@gmx.de>
Sun, 3 Mar 2024 22:33:45 +0000 (23:33 +0100)
committerMarkham <markham001@gmx.de>
Sun, 3 Mar 2024 22:33:45 +0000 (23:33 +0100)
make/libraries.mk

index 839a42e650a0a8dbb6399a9a11a99b45a6fec095..414afc5aaf763f69a5496192af5ca75e1f2ce72f 100755 (executable)
@@ -658,11 +658,19 @@ $(D)/libjpeg-turbo2: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO2_VER).tar.gz | $(TARG
 
 
 #ifeq ($(BOXFAMILY), nevis)
-NEVIS_XML2_FLAGS  = --without-iconv
-NEVIS_XML2_FLAGS += --with-minimum
+NEVIS_XML2_FLAGS = \
+       --without-iconv \
+       --with-minimum
 #endif
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x hd6x))
 XML2_DEPS = $(D)/python3
+XML_CONF_OPTS = \
+       --with-python \
+       --with-c14n
+else
+XML_CONF_OPTS = \
+       --without-python \
+       --without-c14n
 endif
 
 $(D)/libxml2: $(XML2_DEPS) $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
@@ -676,9 +684,7 @@ $(D)/libxml2: $(XML2_DEPS) $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPR
                        --datarootdir=/.remove \
                        --enable-shared \
                        --disable-static \
-                       --with-python \
                        --without-debug \
-                       --with-c14n \
                        --without-legacy \
                        --without-catalog \
                        --without-docbook \
@@ -686,6 +692,7 @@ $(D)/libxml2: $(XML2_DEPS) $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPR
                        --without-lzma \
                        --without-schematron \
                        --with-tree \
+                       $(XML_CONF_OPTS) \
                        $(NEVIS_XML2_FLAGS) && \
                $(MAKE) all && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX) && \