diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-03 14:15:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-03 14:47:30 +0200 |
| commit | fc1eaf33e01872cab3c9cdc534de12b32d028899 (patch) | |
| tree | 786061a9dedb5352763b6f88ccc58fc9dc1f4cf8 | |
| parent | 7be158cd53aa7d05a903f566d6148dbfae6e3fbb (diff) | |
libxml2: remove usage of dmake remnant LIBXML2LIB
Change-Id: I8a4f298af99f3415b0ef7a3fc5d69642b5b71f62
| -rw-r--r-- | libxml2/libxml2-configure.patch | 2 | ||||
| -rw-r--r-- | libxslt/ExternalProject_xslt.mk | 2 | ||||
| -rw-r--r-- | redland/ExternalProject_raptor.mk | 4 | ||||
| -rw-r--r-- | redland/ExternalProject_rasqal.mk | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch index 125f6c052063..d8515016df5c 100644 --- a/libxml2/libxml2-configure.patch +++ b/libxml2/libxml2-configure.patch @@ -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" ] diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk index 15247dfc7029..357ae780762a 100644 --- a/libxslt/ExternalProject_xslt.mk +++ b/libxslt/ExternalProject_xslt.mk @@ -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) \ ) diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk index 173ce374b2f1..058da4965332 100644 --- a/redland/ExternalProject_raptor.mk +++ b/redland/ExternalProject_raptor.mk @@ -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 diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index 7576b05b423a..d722100755da 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -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="" \ |