strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libxml2: remove usage of dmake remnant LIBXML2LIB

Browse source 
Change-Id: I8a4f298af99f3415b0ef7a3fc5d69642b5b71f62
This commit is contained in:
Michael Stahl 2013-04-03 14:15:37 +02:00
parent 7be158cd53
commit fc1eaf33e0
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libxml2/libxml2-configure.patch
View file

@ -129,7 +129,7 @@
- else
- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
- fi
+ echo -L${libdir} ${LIBXML2LIB} -lm
+ echo -L${libdir} -lxml2 -lm
+# if [ "`uname`" = "Linux" ]
+# then
+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]

2
libxslt/ExternalProject_xslt.mk
View file

@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
$(if $(filter IOS,$(OS)),LIBS="-liconv") \
--disable-shared,--disable-static) \
$(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR) LIBXML2LIB=-lxml2) \
$(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR)) \
&& chmod 777 xslt-config \
&& $(MAKE) \
)

4
redland/ExternalProject_raptor.mk
View file

@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \
LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
./configure --disable-static --enable-shared --disable-gtk-doc \
@ -49,8 +48,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
$(if $(filter NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \
$(if $(filter NO,$(SYSTEM_LIBXML)), \
LIBXML2LIB=-lxml2 --with-xml2-config=$(OUTDIR)/bin/xml2-config) \
$(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(OUTDIR)/bin/xml2-config) \
&& $(MAKE) \
)
endif

1
redland/ExternalProject_rasqal.mk
View file

@ -26,7 +26,6 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L$,$(ILIB))" \
LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \