diff --git a/make/archives.mk b/make/archives.mk index a7026390..70560ee4 100644 --- a/make/archives.mk +++ b/make/archives.mk @@ -20,10 +20,6 @@ PUGIXML_VER=1.8 $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz: $(WGET) http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VER)/pugixml-$(PUGIXML_VER).tar.gz -LIBROXML_VER=2.3.0 -$(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz: - $(WGET) http://download.libroxml.net/pool/v2.x/libroxml-$(LIBROXML_VER).tar.gz - LIBXML2_VER=2.9.4 $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz: $(WGET) ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VER).tar.gz diff --git a/make/system-libs-extra.mk b/make/system-libs-extra.mk index 39a68605..7c64860a 100644 --- a/make/system-libs-extra.mk +++ b/make/system-libs-extra.mk @@ -43,3 +43,22 @@ $(D)/libFLAC: $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz | $(TARGETPREFIX) rm -rf $(TARGETPREFIX)/bin/metaflac $(REMOVE)/flac-$(LIBFLAC_VER) touch $@ + +LIBROXML_VER=2.3.0 +$(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz: + $(WGET) http://download.libroxml.net/pool/v2.x/libroxml-$(LIBROXML_VER).tar.gz + +$(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGETPREFIX) + $(UNTAR)/libroxml-$(LIBROXML_VER).tar.gz + set -e; cd $(BUILD_TMP)/libroxml-$(LIBROXML_VER); \ + $(CONFIGURE) \ + --prefix= \ + --disable-xml-read-write \ + --enable-xml-small-input-file \ + --disable-xml-commit-xml-tree \ + --disable-xml-xpath-engine \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(TARGETPREFIX) + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libroxml.pc + $(REMOVE)/libroxml-$(LIBROXML_VER) + touch $@ diff --git a/make/system-libs.mk b/make/system-libs.mk index c071f2d2..4fc723aa 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -823,21 +823,6 @@ $(D)/pugixml: $(ARCHIVE)/pugixml-$(PUGIXML_VER).tar.gz | $(TARGETPREFIX) $(REMOVE)/pugixml-$(PUGIXML_VER) touch $@ -$(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGETPREFIX) - $(UNTAR)/libroxml-$(LIBROXML_VER).tar.gz - set -e; cd $(BUILD_TMP)/libroxml-$(LIBROXML_VER); \ - $(CONFIGURE) \ - --prefix= \ - --disable-xml-read-write \ - --enable-xml-small-input-file \ - --disable-xml-commit-xml-tree \ - --disable-xml-xpath-engine \ - $(MAKE); \ - $(MAKE) install DESTDIR=$(TARGETPREFIX) - $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libroxml.pc - $(REMOVE)/libroxml-$(LIBROXML_VER) - touch $@ - $(D)/librtmp: $(D)/zlib $(D)/openssl | $(TARGETPREFIX) $(REMOVE)/rtmpdump git clone https://bitbucket.org/neutrino-images/ni-rtmpdump.git $(BUILD_TMP)/rtmpdump