diff options
-rwxr-xr-x | libxslt/dummy/bin/xml2-config | 17 | ||||
-rw-r--r-- | libxslt/makefile.mk | 10 |
2 files changed, 26 insertions, 1 deletions
diff --git a/libxslt/dummy/bin/xml2-config b/libxslt/dummy/bin/xml2-config new file mode 100755 index 000000000000..4ee8dd0206c5 --- /dev/null +++ b/libxslt/dummy/bin/xml2-config @@ -0,0 +1,17 @@ +#!/bin/sh + +# Use flags found out by configure when we *don't* want +# to use the "system" xml2-config in $PATH + +case $1 in +--cflags) + echo $LIBXML_CFLAGS + ;; +--libs) + echo $LIBXML_LIBS + ;; +--version) + # Assume it's close enough to the system version... + xml2-config --version + ;; +esac diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index dff40683bbda..576dedefa2b3 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -115,17 +115,25 @@ LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -l .IF "$(COMNAME)"=="sunpro5" CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none .ENDIF # "$(COMNAME)"=="sunpro5" + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure + .IF "$(OS)"=="IOS" -CONFIGURE_FLAGS=--disable-shared +# --with-libxml-prefix actually gives the prefix where bin/xml2-config is looked for, +# and we want it to find our dummy one that prints the LIBXML_CFLAGS and LIBXML_LIBS that +# the configure script found out. +CONFIGURE_FLAGS=--disable-shared --with-libxml-prefix=$(SRC_ROOT)/$(PRJNAME)/dummy .ELSE CONFIGURE_FLAGS=--disable-static .ENDIF + CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1=yes + .IF "$(CROSS_COMPILING)"=="YES" CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF + BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |