diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2012-09-12 22:42:20 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-12 21:59:06 +0000 |
| commit | db5e8c0650ec5653f61706e6dabdcf47023dcd82 (patch) | |
| tree | 8eeacbab80b33112717ee3e8b22e3367512c29a7 /libxmlsec | |
| parent | 843c83f6405ab4f1a4f7734ec66f2b62248f4e34 (diff) | |
allow to build with XCode 2.x
* XCode 2.x only comes with automake 1.6.3, and that doesn't know
per-object CPPFLAGS, thus use per-object CFLAGS instead
* also it is picky about redefining the SOURCES in a conditional
statement, so use a variable in a condition instead and add that
* Its linker also needs help locating libs that are using the
relocation-placeholders, thus add -dylib_file linkerflag
* aclocal insists on a space between -I and argument
Change-Id: I35714a1a76a7b7823ee6b64a3296aeae96e7296a
Reviewed-on: https://gerrit.libreoffice.org/605
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 7 | ||||
| -rw-r--r-- | libxmlsec/xmlsec1-1.2.14_old_automake.patch | 126 |
2 files changed, 132 insertions, 1 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index b00520349107..2a8ac0f0b748 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -77,6 +77,11 @@ PATCH_FILES=\ xmlsec1-android.patch \ xmlsec1-1.2.14-ansi.patch +.IF "$(OS)$(CPU)"=="MACOSXP" +PATCH_FILES+=xmlsec1-1.2.14_old_automake.patch +EXTRA_LINKFLAGS+=-Wl,-dylib_file,@executable_path/libnssutil3.dylib:$(SOLARLIBDIR)/libnssutil3.dylib +.ENDIF + ADDITIONAL_FILES= \ include/xmlsec/mscrypto/akmngr.h \ src/mscrypto/akmngr.c \ @@ -177,7 +182,7 @@ CONFIGURE_ACTION=autoreconf ; ./configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS= .IF "$(ACLOCAL)" == "" ACLOCAL=aclocal .ENDIF -CONFIGURE_ACTION:=ACLOCAL="$(ACLOCAL) -I$(SRCDIR)/m4/mac" $(CONFIGURE_ACTION) +CONFIGURE_ACTION:=ACLOCAL="$(ACLOCAL) -I $(SRCDIR)/m4/mac" $(CONFIGURE_ACTION) .ENDIF CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" diff --git a/libxmlsec/xmlsec1-1.2.14_old_automake.patch b/libxmlsec/xmlsec1-1.2.14_old_automake.patch new file mode 100644 index 000000000000..a80265903b07 --- /dev/null +++ b/libxmlsec/xmlsec1-1.2.14_old_automake.patch @@ -0,0 +1,126 @@ +--- misc/xmlsec1-1.2.14/configure.in 2012-09-12 19:15:56.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/configure.in 2012-09-12 18:56:01.000000000 +0200 +@@ -21,8 +21,8 @@ + AC_SUBST(XMLSEC_VERSION_INFO) + + AC_CONFIG_MACRO_DIR(m4) +-AM_INIT_AUTOMAKE([1.7 tar-ustar]) +-AC_CONFIG_HEADERS([config.h]) ++AM_INIT_AUTOMAKE([1.6.3]) ++AM_CONFIG_HEADER([config.h]) + AM_MAINTAINER_MODE + + dnl +--- misc/xmlsec1-1.2.14/src/gnutls/Makefile.am 2009-12-05 22:19:18.000000000 +0100 ++++ misc/build/xmlsec1-1.2.14/src/gnutls/Makefile.am 2012-09-12 19:09:38.000000000 +0200 +@@ -18,7 +18,11 @@ + $(LIBXML_CFLAGS) \ + $(NULL) + +-libxmlsec1_gnutls_la_SOURCES =\ ++if SHAREDLIB_HACK ++SHAREDLIBHACKDEP = ../strings.c ++endif ++ ++libxmlsec1_gnutls_la_SOURCES = $(SHAREDLIBHACKDEP) \ + app.c \ + ciphers.c \ + crypto.c \ +@@ -28,10 +32,6 @@ + globals.h \ + $(NULL) + +-if SHAREDLIB_HACK +-libxmlsec1_gnutls_la_SOURCES += ../strings.c +-endif +- + libxmlsec1_gnutls_la_LIBADD = \ + ../libxmlsec1.la \ + $(GNUTLS_LIBS) \ +--- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.am 2012-09-12 19:15:56.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.am 2012-09-12 19:10:52.000000000 +0200 +@@ -19,7 +19,11 @@ + $(LIBXML_CFLAGS) \ + $(NULL) + +-libxmlsec1_mscrypto_la_SOURCES =\ ++if SHAREDLIB_HACK ++SHAREDLIBHACKDEP = ../strings.c ++endif ++ ++libxmlsec1_mscrypto_la_SOURCES = $(SHAREDLIBHACKDEP) \ + app.c \ + certkeys.c \ + ciphers.c \ +@@ -38,10 +42,6 @@ + akmngr.c \ + $(NULL) + +-if SHAREDLIB_HACK +-libxmlsec1_mscrypto_la_SOURCES += ../strings.c +-endif +- + libxmlsec1_mscrypto_la_LIBADD = \ + ../libxmlsec1.la \ + $(MSCRYPTO_LIBS) \ +--- misc/xmlsec1-1.2.14/src/nss/Makefile.am 2012-09-12 19:15:56.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.am 2012-09-12 19:11:58.000000000 +0200 +@@ -8,7 +8,7 @@ + libxmlsec1-nss.la \ + $(NULL) + +-libxmlsec1_nss_la_CPPFLAGS = \ ++libxmlsec1_nss_la_CFLAGS = \ + -DPACKAGE=\"@PACKAGE@\" \ + -I../../include \ + -I$(top_srcdir)/include \ +@@ -18,7 +18,11 @@ + $(LIBXML_CFLAGS) \ + $(NULL) + +-libxmlsec1_nss_la_SOURCES =\ ++if SHAREDLIB_HACK ++SHAREDLIBHACKDEP = ../strings.c ++endif ++ ++libxmlsec1_nss_la_SOURCES = $(SHAREDLIBHACKDEP) \ + app.c \ + bignum.c \ + ciphers.c \ +@@ -40,10 +44,6 @@ + tokens.c \ + $(NULL) + +-if SHAREDLIB_HACK +-libxmlsec1_nss_la_SOURCES += ../strings.c +-endif +- + libxmlsec1_nss_la_LIBADD = \ + ../libxmlsec1.la \ + $(NSS_LIBS) \ +--- misc/xmlsec1-1.2.14/src/openssl/Makefile.am 2009-12-05 22:19:18.000000000 +0100 ++++ misc/build/xmlsec1-1.2.14/src/openssl/Makefile.am 2012-09-12 19:12:55.000000000 +0200 +@@ -18,7 +18,11 @@ + $(LIBXML_CFLAGS) \ + $(NULL) + +-libxmlsec1_openssl_la_SOURCES =\ ++if SHAREDLIB_HACK ++SHAREDLIBHACKDEP = ../strings.c ++endif ++ ++libxmlsec1_openssl_la_SOURCES = $(SHAREDLIBHACKDEP) \ + app.c \ + bn.c \ + ciphers.c \ +@@ -36,10 +40,6 @@ + globals.h \ + $(NULL) + +-if SHAREDLIB_HACK +-libxmlsec1_openssl_la_SOURCES += ../strings.c +-endif +- + libxmlsec1_openssl_la_LIBADD = \ + ../libxmlsec1.la \ + $(OPENSSL_LIBS) \ |