diff options
Diffstat (limited to 'libxmlsec/makefile.mk')
| -rw-r--r-- | libxmlsec/makefile.mk | 66 |
1 files changed, 45 insertions, 21 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 950a490..b7dff3e 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.19 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,25 +42,41 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE # --- Files -------------------------------------------------------- -XMLSEC1VERSION=1.2.6 +XMLSEC1VERSION=1.2.14 TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION) -PATCH_FILES=$(TARFILE_NAME).patch +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 +#xmlsec1-nssmangleciphers.patch: Dubious, do we still need this ? +#xmlsec1-noverify.patch: As per readme.txt. +#xmlsec1-mingw32.patch: Mingw32 support. +#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 \ + xmlsec1-nssmangleciphers.patch \ + xmlsec1-noverify.patch \ + xmlsec1-mingw32.patch \ + xmlsec1-mingw-keymgr-mscrypto.patch + ADDITIONAL_FILES= \ + include$/xmlsec$/mscrypto$/akmngr.h \ + src$/mscrypto$/akmngr.c \ include$/xmlsec$/nss$/akmngr.h \ include$/xmlsec$/nss$/ciphers.h \ include$/xmlsec$/nss$/tokens.h \ - include$/xmlsec$/mscrypto$/akmngr.h \ src$/nss$/akmngr.c \ - src$/mscrypto$/akmngr.c \ - src$/nss$/keytrans.c \ src$/nss$/keywrapers.c \ - src$/nss$/tokens.c \ - xmlsec-mscrypto.pc.in \ - include$/xmlsec$/mscrypto$/Makefile.in \ - src$/mscrypto$/Makefile.in \ - libxml2-config + src$/nss$/tokens.c .IF "$(GUI)"=="WNT" CRYPTOLIB=mscrypto @@ -77,9 +89,18 @@ CRYPTOLIB=nss .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" +xmlsec_CC=$(CC) -mthreads +.IF "$(MINGW_SHARED_GCCLIB)"=="YES" +xmlsec_CC+=-shared-libgcc +.ENDIF +xmlsec_LIBS= +.IF "$(MINGW_SHARED_GXXLIB)"=="YES" +xmlsec_LIBS+=-lstdc++_s +.ENDIF CONFIGURE_DIR= -CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure -CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --with-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="-lmingwthrd" LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_ACTION=.$/configure +CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump" + .IF "$(SYSTEM_MOZILLA)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF @@ -110,9 +131,12 @@ xmlsec_CFLAGS+=$(C_RESTRICTIONFLAGS) .ENDIF # "$(COMNAME)"=="sunpro5" .IF "$(EXTRA_CFLAGS)"!="" xmlsec_CFLAGS+=$(EXTRA_CFLAGS) +xmlsec_CPPFLAGS+=$(EXTRA_CFLAGS) .ENDIF # "$(EXTRA_CFLAGS)"!="" xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib -.ENDIF # "$(SYSBASE)"!="" +.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" +xmlsec_CPPFLAGS+=$(EXTRA_CDEFS) +.ENDIF .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' @@ -130,8 +154,8 @@ LDFLAGS:=$(xmlsec_LDFLAGS) .ENDIF CONFIGURE_DIR= -CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" -CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB) +CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" +CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" # system-mozilla needs pkgconfig to get the information about nss # FIXME: This also will enable pkg-config usage for libxml2. It *seems* # that the internal headers still are used when they are there but.... @@ -154,7 +178,7 @@ OUTDIR2INC=include$/xmlsec .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=src$/.libs$/libxmlsec1.dll.a src$/nss$/.libs$/libxmlsec1-nss.dll.a src$/mscrypto$/.libs$/libxmlsec1-mscrypto.dll.a -OUT2BIN+=src$/.libs$/libxmlsec1-1.dll src$/nss$/.libs$/libxmlsec1-nss-1.dll src$/mscrypto$/.libs$/libxmlsec1-mscrypto-1.dll +OUT2BIN+=src$/.libs$/libxmlsec1.dll src$/nss$/.libs$/libxmlsec1-nss.dll src$/mscrypto$/.libs$/libxmlsec1-mscrypto.dll .ELSE OUT2LIB+=win32$/binaries$/*.lib OUT2BIN+=win32$/binaries$/*.dll |