diff options
| -rw-r--r-- | libxml2/libxml2-2.6.31.patch | 2 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 6 | ||||
| -rw-r--r-- | libxml2/prj/build.lst | 2 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/libxml2/libxml2-2.6.31.patch b/libxml2/libxml2-2.6.31.patch index cba8f23e9663..31fcf72e8479 100644 --- a/libxml2/libxml2-2.6.31.patch +++ b/libxml2/libxml2-2.6.31.patch @@ -165,7 +165,7 @@ ;; --libs) -! echo -L${libdir} ${LIBXML2LIB} ${ZLIB3RDLIB} -lm +! echo -L${libdir} ${LIBXML2LIB} -lm ! # if [ "`uname`" = "Linux" ] ! # then ! # if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index b99c52f6aa88..a9c2336b16cc 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -70,7 +70,7 @@ xml2_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump" BUILD_ACTION=$(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) .ELSE @@ -99,10 +99,10 @@ xml2_LDFLAGS+=-Wl,-z,noexecstack CONFIGURE_DIR= .IF "$(OS)"=="OS2" CONFIGURE_ACTION=sh .$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" .ELSE CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" .ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) diff --git a/libxml2/prj/build.lst b/libxml2/prj/build.lst index 16c0b0d5e0b0..01d9b3fdee1b 100644 --- a/libxml2/prj/build.lst +++ b/libxml2/prj/build.lst @@ -1,3 +1,3 @@ -lx libxml2 : soltools ZLIB:zlib NULL +lx libxml2 : soltools NULL lx libxml2 usr1 - all lx_mkout NULL lx libxml2 nmake - all lx_libxml2 NULL diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index e2869683076b..4569a1810724 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -104,7 +104,6 @@ LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -l .EXPORT: CPPFLAGS .EXPORT: LDFLAGS .EXPORT: LIBXML2LIB -.EXPORT: ZLIB3RDLIB .IF "$(COMNAME)"=="sunpro5" CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none |