From owner-svn-ports-all@FreeBSD.ORG Fri Jan 9 16:29:51 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45EBBEEB; Fri, 9 Jan 2015 16:29:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 189AEBDD; Fri, 9 Jan 2015 16:29:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t09GToNQ049097; Fri, 9 Jan 2015 16:29:50 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t09GToBj049096; Fri, 9 Jan 2015 16:29:50 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201501091629.t09GToBj049096@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Fri, 9 Jan 2015 16:29:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376621 - head/devel/mico/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Jan 2015 16:29:51 -0000 Author: tijl Date: Fri Jan 9 16:29:50 2015 New Revision: 376621 URL: https://svnweb.freebsd.org/changeset/ports/376621 QAT: https://qat.redports.org/buildarchive/r376621/ Log: Fix build with ports OpenSSL PR: 195796 Modified: head/devel/mico/files/patch-configure.in Modified: head/devel/mico/files/patch-configure.in ============================================================================== --- head/devel/mico/files/patch-configure.in Fri Jan 9 15:45:52 2015 (r376620) +++ head/devel/mico/files/patch-configure.in Fri Jan 9 16:29:50 2015 (r376621) @@ -1,6 +1,6 @@ ---- configure.in.orig 2006-01-21 16:12:08.000000000 +0100 -+++ configure.in 2013-04-17 11:45:36.000000000 +0200 -@@ -605,7 +605,7 @@ +--- configure.in.orig 2008-07-25 13:41:39 UTC ++++ configure.in +@@ -635,7 +635,7 @@ AC_SUBST(SHLIBS) # System dependencies. # @@ -9,7 +9,7 @@ CONF_DEBUG_FLAGS=-g CONF_LIBNSL=yes CONF_EXCEPT_FLAGS= -@@ -630,7 +630,7 @@ +@@ -660,7 +660,7 @@ if test X"$GXX" = Xyes; then CFLAGS="-Wall $CFLAGS" if test X"$use_speed_tune" = Xyes; then @@ -18,7 +18,7 @@ fi CONF_SHARED_CC="$CXX -shared" -@@ -1082,7 +1082,7 @@ +@@ -1144,7 +1144,7 @@ if test X"$TCLDIR" != X; then AC_GET_DEFINE(TCL_VERSION, TCL_VERSION, tcl.h) if test X"$TCL_VERSION" != X; then dnl # remove quotes if any @@ -27,3 +27,20 @@ TCL_LIBS=-ltcl$TCL_VERSION HAVE_TCL=yes AC_MSG_RESULT($TCL_VERSION) +@@ -2097,13 +2097,13 @@ SSLMTRUN="" + if test X"$ac_cv_lib_ssl_open" = Xyes -a X"$ac_cv_lib_crypto_open" = Xyes -a X"$ac_cv_header_openssl_ssl_h" = Xyes -a X"$use_threads" = Xyes; then + AC_MSG_CHECKING(for thread-safe openssl) + AC_TRY_RUN([ +-int +-main() +-{ + #define OPENSSL_THREAD_DEFINES + #undef THREADS + #undef OPENSSL_THREADS + #include ++int ++main() ++{ + #if !defined(THREADS) && !defined(OPENSSL_THREADS) + //error You are trying to build multi-threaded MICO with single-threaded OpenSSL! + return 1;