From 1d9d25cd2960076ede653de755c350e63216e3c5 Mon Sep 17 00:00:00 2001 From: Caol?n McNamara Date: Sat, 10 Jul 2010 20:20:31 +0100 Subject: cmcfixes76: #i113076# missing includes in configure test --- libxmlsec/xmlsec1-configure.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'libxmlsec') diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch index 943ac98bf687..f2f5f4e8f642 100644 --- a/libxmlsec/xmlsec1-configure.patch +++ b/libxmlsec/xmlsec1-configure.patch @@ -590,6 +590,15 @@ if test "z$dir" = "z/usr/lib" ; then NSS_LIBS="$NSS_LIBS_LIST" else +@@ -13166,7 +13284,7 @@ + + if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then + OLD_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="$NSS_CFLAGS" ++ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + @@ -15036,7 +15154,7 @@ # values after options handling. ac_log=" @@ -734,6 +743,15 @@ dnl do not add -L/usr/lib because compiler does it anyway if test "z$dir" = "z/usr/lib" ; then NSS_LIBS="$NSS_LIBS_LIST" +@@ -738,7 +761,7 @@ + + if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then + OLD_CPPFLAGS=$CPPFLAGS +- CPPFLAGS="$NSS_CFLAGS" ++ CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS" + AC_EGREP_CPP(yes,[ + #include + #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2 --- misc/xmlsec1-1.2.14/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200 +++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2009-10-01 10:28:50.997747312 +0200 @@ -376,7 +376,7 @@ -- cgit From ae05c62681c56a11b1a6d8ca58a70fb767b0e8d1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 12 Jul 2010 15:57:50 +0200 Subject: solaris10u8: #i112480#: fix libxmlsec configure: xmlsec1-configure-libxml-libxslt.patch: do not prepend /bin to $PATH. --- libxmlsec/makefile.mk | 2 ++ libxmlsec/xmlsec1-configure-libxml-libxslt.patch | 40 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 libxmlsec/xmlsec1-configure-libxml-libxslt.patch (limited to 'libxmlsec') diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 1f0e5976f5e5..c3a604cd1ff1 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -48,6 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION) TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f #xmlsec1-configure.patch: Set up the build. Straightforward configuration +#xmlsec1-configure-libxml-libxslt.patch: empty "$with_libxml" prepends /bin :-( #xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx #xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it #xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec @@ -57,6 +58,7 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f #xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw PATCH_FILES=\ xmlsec1-configure.patch \ + xmlsec1-configure-libxml-libxslt.patch \ xmlsec1-olderlibxml2.patch \ xmlsec1-nssdisablecallbacks.patch \ xmlsec1-customkeymanage.patch \ diff --git a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch new file mode 100644 index 000000000000..fdf39ad19554 --- /dev/null +++ b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch @@ -0,0 +1,40 @@ +--- misc/xmlsec1-1.2.14/configure Wed Jun 30 11:55:36 2010 ++++ misc/build/xmlsec1-1.2.14/configure Wed Jun 30 11:57:28 2010 +@@ -12077,7 +12077,7 @@ + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="$with_libxml/bin:$PATH" ++as_dummy="$with_libxml${with_libxml:+/bin:}$PATH" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +@@ -12258,7 +12258,7 @@ + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="$with_libxslt/bin:$PATH" ++as_dummy="$with_libxslt${with_libxslt:+/bin:}$PATH" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +--- misc/xmlsec1-1.2.14/configure.in Wed Jun 30 11:55:37 2010 ++++ misc/build/xmlsec1-1.2.14/configure.in Wed Jun 30 11:53:55 2010 +@@ -231,7 +231,7 @@ + if test "z$LIBXML_FOUND" = "zno" ; then + if test "z$with_libxml" != "zyes" ; then + AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [], +- [$with_libxml/bin:$PATH]) ++ [$with_libxml${with_libxml:+/bin:}$PATH]) + fi + AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ]) + if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then +@@ -296,7 +296,7 @@ + if test "z$LIBXSLT_FOUND" = "zno" ; then + if test "z$with_libxslt" != "zyes" ; then + AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [], +- [$with_libxslt/bin:$PATH]) ++ [$with_libxslt${with_libxslt:+/bin:}:$PATH]) + fi + AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) + if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then -- cgit From 39565fee52df09b79977bb2c14e4bdc84b722d52 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Tue, 20 Jul 2010 12:46:55 +0200 Subject: #i107097# - pass MAXPROCESS to GNU make in external modules --- libxmlsec/makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libxmlsec') diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 9b7ea1b0aa08..d0f04834a221 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -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 @@ -166,7 +166,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 -- cgit