fdo#70393: move openldap to a subdir of external

Change-Id: I0225484e976b5317c2ac5d5b50ade153425f22b0
Reviewed-on: https://gerrit.libreoffice.org/6546
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

5 files changed, 0 insertions, 162 deletions

diff --git a/openldap/ExternalProject_openldap.mk b/openldap/ExternalProject_openldap.mk
deleted file mode 100644
index 36c844c0b6d5..000000000000
--- a/openldap/ExternalProject_openldap.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,openldap))
-
-$(eval $(call gb_ExternalProject_use_externals,openldap,nss3))
-
-$(eval $(call gb_ExternalProject_register_targets,openldap,\
-	build \
-))
-
-$(call gb_ExternalProject_get_state_target,openldap,build) :
-	$(call gb_ExternalProject_run,build,\
-		./configure \
-			--disable-slapd \
-			--with-pic \
-			--with-tls=moznss \
-			--without-cyrus-sasl \
-			--disable-shared \
-			--enable-static \
-			$(if $(filter YES,$(CROSS_COMPILING)), \
-				--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
-				--with-yielding_select=yes \
-				ac_cv_func_memcmp_working=yes \
-			) \
-			$(if $(filter YES,$(SYSTEM_NSS)), \
-				CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" \
-				, \
-				CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \
-				CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \
-				LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib $(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl)" \
-			) \
-		&& MAKEFLAGS= && $(MAKE) \
-	)
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/openldap/Makefile b/openldap/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/openldap/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/openldap/Module_openldap.mk b/openldap/Module_openldap.mk
deleted file mode 100644
index cb3f0ce23b5d..000000000000
--- a/openldap/Module_openldap.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Module_Module,openldap))
-
-ifeq ($(SYSTEM_OPENLDAP),NO)
-
-$(eval $(call gb_Module_add_targets,openldap,\
-	ExternalProject_openldap \
-	UnpackedTarball_openldap \
-))
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/openldap/UnpackedTarball_openldap.mk b/openldap/UnpackedTarball_openldap.mk
deleted file mode 100644
index 43e3e2a225ed..000000000000
--- a/openldap/UnpackedTarball_openldap.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,openldap))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap))
-
-$(eval $(call gb_UnpackedTarball_add_patches,openldap,\
-	openldap/openldap-2.4.31.patch \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/openldap/openldap-2.4.31.patch b/openldap/openldap-2.4.31.patch
deleted file mode 100644
index 656a2c9ebd2d..000000000000
--- a/openldap/openldap-2.4.31.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- 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) | \
---- misc/openldap-2.4.31/configure.in	2012-04-22 21:25:08.000000000 +0100
-+++ misc/build/openldap-2.4.31/configure.in	2012-07-16 13:56:24.000000000 +0100
-@@ -1232,7 +1232,8 @@
- 		AC_CHECK_HEADERS([nssutil.h])
- 		if test "$ac_cv_header_nssutil_h" = yes ; then
- 			AC_CHECK_LIB([nss3], [NSS_Initialize],
--						 [ have_moznss=yes ], [ have_moznss=no ])
-+						 [ have_moznss=yes ], [ have_moznss=no ],
-+						 [ -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 ])
- 		fi
- 
- 		if test "$have_moznss" = yes ; then
---- misc/openldap-2.4.31/configure	2012-07-16 14:11:55.000000000 +0100
-+++ misc/build/openldap-2.4.31/configure	2012-07-16 13:56:24.000000000 +0100
-@@ -15718,7 +15718,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnss3  $LIBS"
-+LIBS="-lnss3  -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-