summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2023-09-21 20:57:31 -0400
committerArmin Kuster <akuster808@gmail.com>2023-09-27 07:40:47 -0400
commit255184c655e4e2c02c8e1a78ea5594ce34dec999 (patch)
treed8cd3b4a92c848df16eb8f5c1816f6e04cc20c06
parent32c529d435c45e60151c714936d451ed9e341466 (diff)
downloadmeta-openembedded-255184c655e4e2c02c8e1a78ea5594ce34dec999.tar.gz
openldap: update to 2.5.16.
2.5.x is an LTS version per the project. Drop patch now included. Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 7a423279cf6afe27cf6abf747f1a2021ee5b6d26) Signed-off-by: Armin Kuster <akuster@mvista.com>
-rw-r--r--meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch32
-rw-r--r--meta-oe/recipes-support/openldap/openldap_2.5.16.bb (renamed from meta-oe/recipes-support/openldap/openldap_2.5.13.bb)3
2 files changed, 1 insertions, 34 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch b/meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch
deleted file mode 100644
index 6e73f8b38..000000000
--- a/meta-oe/recipes-support/openldap/openldap/0001-configure-Pass-pthread_t-to-pthread_detach.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 7577b120acda087bf3f5f613c2c72663b3864ad8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 4 Sep 2022 09:43:06 -0700
4Subject: [PATCH] configure: Pass pthread_t to pthread_detach
5
6This helps compilers when using C2X standard
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 configure.ac | 5 +----
12 1 file changed, 1 insertion(+), 4 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 0978eeb..58d15f8 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -1467,10 +1467,7 @@ pthread_rwlock_t rwlock;
19 dnl save the flags
20 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
21 #include <pthread.h>
22-#ifndef NULL
23-#define NULL (void*)0
24-#endif
25-]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
26+]], [[pthread_detach((pthread_t)-1);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no])
27 ])
28
29 if test $ol_cv_func_pthread_detach = no ; then
30--
312.37.3
32
diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.13.bb b/meta-oe/recipes-support/openldap/openldap_2.5.16.bb
index b117677f9..a56b454dc 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.5.13.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.5.16.bb
@@ -19,10 +19,9 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
19 file://slapd.service \ 19 file://slapd.service \
20 file://remove-user-host-pwd-from-version.patch \ 20 file://remove-user-host-pwd-from-version.patch \
21 file://0001-build-top.mk-unset-STRIP_OPTS.patch \ 21 file://0001-build-top.mk-unset-STRIP_OPTS.patch \
22 file://0001-configure-Pass-pthread_t-to-pthread_detach.patch \
23" 22"
24 23
25SRC_URI[sha256sum] = "ee3c430c4ef7b87c57b622108c7339376d6c27fbbf2767770be3de1df63d008c" 24SRC_URI[sha256sum] = "546ba591822e8bb0e467d40c4d4a30f89d937c3a507fe83a578f582f6a211327"
26 25
27DEPENDS = "util-linux groff-native" 26DEPENDS = "util-linux groff-native"
28 27