From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 19 08:20:10 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4787106567B for ; Sun, 19 Jun 2011 08:20:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 691E88FC14 for ; Sun, 19 Jun 2011 08:20:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J8KAFi055458 for ; Sun, 19 Jun 2011 08:20:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5J8KAjv055457; Sun, 19 Jun 2011 08:20:10 GMT (envelope-from gnats) Resent-Date: Sun, 19 Jun 2011 08:20:10 GMT Resent-Message-Id: <201106190820.p5J8KAjv055457@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sergey Skvortsov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3ACE106566C; Sun, 19 Jun 2011 08:19:09 +0000 (UTC) (envelope-from skv@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C47668FC17; Sun, 19 Jun 2011 08:19:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5J8J9sG055050; Sun, 19 Jun 2011 08:19:09 GMT (envelope-from skv@freefall.freebsd.org) Received: (from skv@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5J8J9BZ055049; Sun, 19 Jun 2011 08:19:09 GMT (envelope-from skv) Message-Id: <201106190819.p5J8J9BZ055049@freefall.freebsd.org> Date: Sun, 19 Jun 2011 08:19:09 GMT From: Sergey Skvortsov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: apache@FreeBSD.org Subject: ports/158021: [PATCH] devel/apr1: unbreak build with "threads=off ldap=on" X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2011 08:20:10 -0000 >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: