From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 29 14:30:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 23F2C37D for ; Tue, 29 Oct 2013 14:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 030AA2AA6 for ; Tue, 29 Oct 2013 14:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r9TEU0Ks066440 for ; Tue, 29 Oct 2013 14:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r9TEU0qZ066439; Tue, 29 Oct 2013 14:30:00 GMT (envelope-from gnats) Resent-Date: Tue, 29 Oct 2013 14:30:00 GMT Resent-Message-Id: <201310291430.r9TEU0qZ066439@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, Oliver Fromme Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6B236E70 for ; Tue, 29 Oct 2013 14:24:04 +0000 (UTC) (envelope-from olli@grabthar.secnetix.de) Received: from grabthar.secnetix.de (grabthar.secnetix.de [IPv6:2a01:170:102f::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D13E92A3D for ; Tue, 29 Oct 2013 14:24:03 +0000 (UTC) Received: from grabthar.secnetix.de (localhost [127.0.0.1]) by grabthar.secnetix.de (8.14.7/8.14.7) with ESMTP id r9TEO06r038428; Tue, 29 Oct 2013 15:24:00 +0100 (CET) (envelope-from oliver.fromme@secnetix.de) Received: (from olli@localhost) by grabthar.secnetix.de (8.14.7/8.14.7/Submit) id r9TEO0iE038418; Tue, 29 Oct 2013 15:24:00 +0100 (CET) (envelope-from olli) Message-Id: <201310291424.r9TEO0iE038418@grabthar.secnetix.de> Date: Tue, 29 Oct 2013 15:24:00 +0100 (CET) From: Oliver Fromme To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/183442: [patch] devel/cssc: fix build with clang on HEAD and 10 Cc: Oliver Fromme X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Oliver Fromme List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Oct 2013 14:30:01 -0000 >Number: 183442 >Category: ports >Synopsis: [patch] devel/cssc: fix build with clang on HEAD and 10 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Oct 29 14:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Oliver Fromme >Release: n/a >Organization: secnetix GmbH & Co. KG http://www.secnetix.de/bsd >Environment: >Description: Currently the devel/cssc port does not build with clang on HEAD / FreeBSD 10 (it breaks in the unit tests). The patch below fixes it. >How-To-Repeat: Try to build devel/cssc on FreeBSD 10. >Fix: --- unit-tests/googletest/include/gtest/internal/gtest-port.h.orig 2010-05-16 00:30:14.000000000 +0200 +++ unit-tests/googletest/include/gtest/internal/gtest-port.h 2013-10-29 15:07:00.000000000 +0100 @@ -80,6 +80,7 @@ // the given platform; otherwise undefined): // GTEST_OS_AIX - IBM AIX // GTEST_OS_CYGWIN - Cygwin +// GTEST_OS_FREEBSD - FreeBSD // GTEST_OS_LINUX - Linux // GTEST_OS_MAC - Mac OS X // GTEST_OS_SOLARIS - Sun Solaris @@ -219,10 +220,13 @@ #define GTEST_OS_SOLARIS 1 #elif defined(_AIX) #define GTEST_OS_AIX 1 +#elif defined(__FreeBSD__) +#define GTEST_OS_FREEBSD 1 +#define GTEST_USE_OWN_TR1_TUPLE 1 #endif // __CYGWIN__ #if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \ - GTEST_OS_SOLARIS || GTEST_OS_AIX + GTEST_OS_SOLARIS || GTEST_OS_AIX || GTEST_OS_FREEBSD // On some platforms, needs someone to define size_t, and // won't compile otherwise. We can #include it here as we already @@ -254,7 +258,8 @@ #define GTEST_USES_SIMPLE_RE 1 #endif // GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || - // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS || GTEST_OS_AIX + // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS || GTEST_OS_AIX || + // GTEST_OS_FREEBSD #ifndef GTEST_HAS_EXCEPTIONS // The user didn't tell us whether exceptions are enabled, so we need @@ -376,7 +381,7 @@ // // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0 // to your compiler flags. -#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC) +#define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_FREEBSD) #endif // GTEST_HAS_PTHREAD // Determines whether Google Test can use tr1/tuple. You can define @@ -483,6 +488,7 @@ // abort() in a VC 7.1 application compiled as GUI in debug config // pops up a dialog window that cannot be suppressed programmatically. #if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ + GTEST_OS_FREEBSD || \ (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX) #define GTEST_HAS_DEATH_TEST 1 >Release-Note: >Audit-Trail: >Unformatted: