diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 09:55:09 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 09:55:09 +0100 |
| commit | 89c4f8907fb3cf30b7e0a8837c01f525b8609d00 (patch) | |
| tree | e3151b3bd808b097c08e29519e59d0fe906950df /libxmlsec | |
| parent | b54d64f2b8234f620b0f11fbc298dcb68119b408 (diff) | |
| parent | 890599fd2bd872aaa52a278febc7b72036ce0664 (diff) | |
Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
cppunit/ldflags.patch
hyphen/hyphen-2.4.patch
libegg/source/eggtrayicon.c
libtextcat/makefile.mk
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 10 | ||||
| -rw-r--r-- | libxmlsec/xmlsec1-olderlibxml2.patch | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index c37e34deb06f..88e47510fc01 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -93,7 +93,7 @@ xmlsec_CC+=-shared-libgcc .ENDIF xmlsec_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -xmlsec_LIBS+=-lstdc++_s +xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure @@ -102,7 +102,7 @@ CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozi .IF "$(SYSTEM_MOZILLA)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF -BUILD_ACTION=$(GNUMAKE) +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) .ELSE CONFIGURE_DIR=win32 @@ -143,10 +143,6 @@ xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" -.IF "$(OS)$(COM)"=="LINUXGCC" -xmlsec_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - LDFLAGS:=$(xmlsec_LDFLAGS) .EXPORT: LDFLAGS @@ -166,7 +162,7 @@ CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=n .IF "$(SYSTEM_MOZILLA)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF -BUILD_ACTION=$(GNUMAKE) +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) .ENDIF diff --git a/libxmlsec/xmlsec1-olderlibxml2.patch b/libxmlsec/xmlsec1-olderlibxml2.patch index b5f3d5747586..f2bd85f5113b 100644 --- a/libxmlsec/xmlsec1-olderlibxml2.patch +++ b/libxmlsec/xmlsec1-olderlibxml2.patch @@ -4,7 +4,7 @@ return(0); } -+#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20706 ++#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20704 +/* + * xmlC14NMode: + * |