summaryrefslogtreecommitdiff
path: root/databases/openldap/patches
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-11-18 19:07:04 +0000
committerjlam <jlam@pkgsrc.org>2004-11-18 19:07:04 +0000
commit6b7a749803142189e7cf6f115cd1df4862b28880 (patch)
treed83100c8094a34f50255457136853b54a3ff3bd7 /databases/openldap/patches
parent7cf633273520fd8e09ac531596151067833f1caf (diff)
downloadpkgsrc-6b7a749803142189e7cf6f115cd1df4862b28880.tar.gz
We don't actually want everything to be built with pthreads -- only
libldap_r and slurpd. Patch those Makefiles (patch-aj, patch-ak) to pass $(PTHREAD_CFLAGS) and $(PTHREAD_LDFLAGS) to the build. The configure process correctly adds any necessary libraries, so adding $(PTHREAD_LIBS) isn't needed. Bump the PKGREVISION since the LDAP libraries are no longer linked against libpthread. This fixes PR pkg/28259.
Diffstat (limited to 'databases/openldap/patches')
-rw-r--r--databases/openldap/patches/patch-aj15
-rw-r--r--databases/openldap/patches/patch-ak14
2 files changed, 29 insertions, 0 deletions
diff --git a/databases/openldap/patches/patch-aj b/databases/openldap/patches/patch-aj
new file mode 100644
index 00000000000..a4eb7c083c6
--- /dev/null
+++ b/databases/openldap/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2004/11/18 19:07:04 jlam Exp $
+
+--- libraries/libldap_r/Makefile.in.orig 2004-01-01 13:16:30.000000000 -0500
++++ libraries/libldap_r/Makefile.in
+@@ -56,6 +56,10 @@ XXXLIBS = $(LTHREAD_LIBS)
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+ UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+
++AC_CFLAGS += $(PTHREAD_CFLAGS)
++AC_LDFLAGS += $(PTHREAD_LDFLAGS)
++LINK_LIBS += $(LTHREAD_LIBS)
++
+ .links : Makefile
+ @for i in $(XXSRCS); do \
+ $(RM) $$i ; \
diff --git a/databases/openldap/patches/patch-ak b/databases/openldap/patches/patch-ak
new file mode 100644
index 00000000000..4b208f9f57f
--- /dev/null
+++ b/databases/openldap/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2004/11/18 19:07:04 jlam Exp $
+
+--- servers/slurpd/Makefile.in.orig 2004-01-01 13:16:42.000000000 -0500
++++ servers/slurpd/Makefile.in
+@@ -43,6 +43,9 @@ XLIBS = $(SLURPD_L)
+ XXLIBS = $(SLURPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
+ XXXLIBS = $(LTHREAD_LIBS)
+
++AC_CFLAGS += $(PTHREAD_CFLAGS)
++AC_LDFLAGS += $(PTHREAD_LDFLAGS)
++
+ slurpd: version.o
+ $(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
+