Date: Sun, 19 Jun 2011 08:19:09 GMT From: Sergey Skvortsov <skv@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: apache@FreeBSD.org Subject: ports/158021: [PATCH] devel/apr1: unbreak build with "threads=off ldap=on" Message-ID: <201106190819.p5J8J9BZ055049@freefall.freebsd.org> Resent-Message-ID: <201106190820.p5J8KAjv055457@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158021
>Category: ports
>Synopsis: [PATCH] devel/apr1: unbreak build with "threads=off ldap=on"
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 19 08:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Sergey Skvortsov
>Release: FreeBSD 8.2-PRERELEASE-20101227 amd64
>Organization:
>Environment:
>Description:
Added file(s):
- files/patch-apr_ldap_rebind.c
Unbreak build for combination of port options:
LDAP=on
THREADS=off
>How-To-Repeat:
>Fix:
--- apr-nothr-devrandom-1.4.5.1.3.12.patch begins here ---
Index: files/patch-apr_ldap_rebind.c
===================================================================
RCS file: files/patch-apr_ldap_rebind.c
diff -N files/patch-apr_ldap_rebind.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-apr_ldap_rebind.c 19 Jun 2011 08:14:32 -0000
@@ -0,0 +1,15 @@
+--- apr-util-1.3.12/ldap/apr_ldap_rebind.c.orig 2011-06-18 14:42:15.000000000 +0000
++++ apr-util-1.3.12/ldap/apr_ldap_rebind.c 2011-06-18 14:42:28.000000000 +0000
+@@ -81,11 +81,11 @@
+ get_apd
+ #endif
+
++#if APR_HAS_THREADS
+ /* run after apr_thread_mutex_create cleanup */
+ apr_pool_cleanup_register(pool, &apr_ldap_xref_lock, apr_ldap_pool_cleanup_set_null,
+ apr_pool_cleanup_null);
+
+-#if APR_HAS_THREADS
+ if (apr_ldap_xref_lock == NULL) {
+ retcode = apr_thread_mutex_create(&apr_ldap_xref_lock, APR_THREAD_MUTEX_DEFAULT, pool);
+ }
--- apr-nothr-devrandom-1.4.5.1.3.12.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106190819.p5J8J9BZ055049>