diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-16 14:10:11 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-16 14:10:11 +0200 |
commit | 5b09ee6c0b46cd434b1325427a3983892282f66e (patch) | |
tree | 0dd528000621dc13f38d798b361059cde5aaba15 /openldap | |
parent | a42dba8723a191e1677211d3924a318a1d5a9166 (diff) |
openldap module to build for unix only (still unused)
Change-Id: I9a3004634108fb4d1a990eaf528059cc7dfbe27e
Diffstat (limited to 'openldap')
-rw-r--r-- | openldap/makefile.mk | 69 | ||||
-rw-r--r-- | openldap/openldap-2.4.31.patch | 50 | ||||
-rw-r--r-- | openldap/prj/build.lst | 3 | ||||
-rw-r--r-- | openldap/prj/d.lst | 4 | ||||
-rw-r--r-- | openldap/prj/dmake | 0 |
5 files changed, 126 insertions, 0 deletions
diff --git a/openldap/makefile.mk b/openldap/makefile.mk new file mode 100644 index 000000000000..da58c5516814 --- /dev/null +++ b/openldap/makefile.mk @@ -0,0 +1,69 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +PRJ=. + +PRJNAME=openldap +TARGET=so_openldap + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +.IF "$(SYSTEM_OPENLDAP)" == "YES" +all: + @echo "An already available installation of openldap should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." +.ENDIF + +.IF "$(OS)"=="WNT" +all: + @echo "Openldap is not needed on Windows." +.ENDIF + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=openldap-2.4.31 +TARFILE_MD5=804c6cb5698db30b75ad0ff1c25baefd + +PATCH_FILES=\ + $(TARFILE_NAME).patch + +CONFIGURE_DIR= +CONFIGURE_ACTION=.$/configure +CONFIGURE_FLAGS=--disable-slapd --with-pic --with-tls=moznss --disable-shared --enable-static +.IF "$(SYSTEM_NSS)" == "YES" +CONFIGURE_FLAGS+=CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" +.ELSE +CONFIGURE_FLAGS+=CPPFLAGS="-I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nss -I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nspr" +CONFIGURE_FLAGS+=CFLAGS="-I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nss -I $(SOLARVER)$/$(INPATH)$/inc$/mozilla$/nspr" +CONFIGURE_FLASG+=LDFLAGS="-L $(SOLARVER)$/$(INPATH)$/lib" +.ENDIF +BUILD_FLAGS+= -j$(EXTMAXPROCESS) +BUILD_DIR=$(CONFIGURE_DIR) +BUILD_ACTION=$(GNUMAKE) + +OUT2INC+=include$/slapi-plugin.h +OUT2INC+=include$/ldap_utf8.h +OUT2INC+=include$/ldap.h +OUT2INC+=include$/ldap_cdefs.h +OUT2INC+=include$/ldap_features.h +OUT2INC+=include$/ldap_schema.h +OUT2INC+=include$/ldif.h +OUT2INC+=include$/lber_types.h +OUT2INC+=include$/lber.h + +OUT2LIB+=libraries$/libldap$/.libs$/libldap.a +OUT2LIB+=libraries$/liblber$/.libs$/liblber.a + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + diff --git a/openldap/openldap-2.4.31.patch b/openldap/openldap-2.4.31.patch new file mode 100644 index 000000000000..fa4803d36f2c --- /dev/null +++ b/openldap/openldap-2.4.31.patch @@ -0,0 +1,50 @@ +--- misc/openldap-2.4.31/Makefile.in 2012-04-22 22:25:08.000000000 +0200 ++++ misc/build/openldap-2.4.31/Makefile.in 2012-07-16 13:53:47.140541654 +0200 +@@ -13,7 +13,7 @@ + ## top-level directory of the distribution or, alternatively, at + ## <http://www.OpenLDAP.org/license.html>. + +-SUBDIRS= include libraries clients servers tests doc ++SUBDIRS= include libraries + CLEANDIRS= + INSTALLDIRS= + +@@ -32,7 +32,3 @@ + $(RM) config.status libtool stamp-h stamp-h.in + + distclean: veryclean FORCE +- +-check: test +-test: FORCE +- cd tests; make test +--- misc/openldap-2.4.31/libraries/libldap/tls_m.c 2012-04-22 22:25:08.000000000 +0200 ++++ misc/build/openldap-2.4.31/libraries/libldap/tls_m.c 2012-07-16 13:53:47.140541654 +0200 +@@ -49,17 +49,17 @@ + #include <termios.h> /* for echo on/off */ + #endif + +-#include <nspr/nspr.h> +-#include <nspr/private/pprio.h> +-#include <nss/nss.h> +-#include <nss/ssl.h> +-#include <nss/sslerr.h> +-#include <nss/sslproto.h> +-#include <nss/pk11pub.h> +-#include <nss/secerr.h> +-#include <nss/keyhi.h> +-#include <nss/secmod.h> +-#include <nss/cert.h> ++#include <nspr.h> ++#include <private/pprio.h> ++#include <nss.h> ++#include <ssl.h> ++#include <sslerr.h> ++#include <sslproto.h> ++#include <pk11pub.h> ++#include <secerr.h> ++#include <keyhi.h> ++#include <secmod.h> ++#include <cert.h> + + #undef NSS_VERSION_INT + #define NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \ diff --git a/openldap/prj/build.lst b/openldap/prj/build.lst new file mode 100644 index 000000000000..c54f91d7284c --- /dev/null +++ b/openldap/prj/build.lst @@ -0,0 +1,3 @@ +ol openldap : soltools NSS:nss NULL +ol openldap usr1 - u ol_mkout NULL +ol openldap nmake - u ol_openldap NULL diff --git a/openldap/prj/d.lst b/openldap/prj/d.lst new file mode 100644 index 000000000000..4f42f98e09f5 --- /dev/null +++ b/openldap/prj/d.lst @@ -0,0 +1,4 @@ +mkdir: %_DEST%\inc\openldap +..\%__SRC%\inc\*.h %_DEST%\inc\openldap\*.h +..\%__SRC%\lib\libldap.a %_DEST%\lib\libldap.a +..\%__SRC%\lib\liblber.a %_DEST%\lib\liblber.a diff --git a/openldap/prj/dmake b/openldap/prj/dmake new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/openldap/prj/dmake |