From nobody@FreeBSD.org  Thu Nov 14 16:35:31 2013
Return-Path: <nobody@FreeBSD.org>
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 ESMTPS id 14351E0F
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Nov 2013 16:35:31 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 036F02948
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Nov 2013 16:35:31 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rAEGZU9i088134
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Nov 2013 16:35:30 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rAEGZUqe088129;
	Thu, 14 Nov 2013 16:35:30 GMT
	(envelope-from nobody)
Message-Id: <201311141635.rAEGZUqe088129@oldred.freebsd.org>
Date: Thu, 14 Nov 2013 16:35:30 GMT
From: Daniel Peyrolon <dpl@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: lang/clang32 update default C++ library to libc++ on FreeBSD 10 and higher
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         183956
>Category:       ports
>Synopsis:       lang/clang32 update default C++ library to libc++ on FreeBSD 10 and higher
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brooks
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 14 16:40:00 UTC 2013
>Closed-Date:    Fri Nov 15 01:35:49 UTC 2013
>Last-Modified:  Fri Nov 15 01:40:01 UTC 2013
>Originator:     Daniel Peyrolon
>Release:        10-BETA3
>Organization:
>Environment:
>Description:
Apply the clang portion of r255321 from base switching the default C++ library to libc++ on 10+.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 333732)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	clang
 DISTVERSION=	3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
Index: files/patch-tools_clang_lib_Driver_ToolChains.cpp
===================================================================
--- files/patch-tools_clang_lib_Driver_ToolChains.cpp	(revision 0)
+++ files/patch-tools_clang_lib_Driver_ToolChains.cpp	(working copy)
@@ -0,0 +1,44 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Driver/ToolChains.cpp.orig
++++ tools/clang/lib/Driver/ToolChains.cpp
+@@ -1950,6 +1950,38 @@
+   }
+ }
+ 
++ToolChain::CXXStdlibType
++FreeBSD::GetCXXStdlibType(const ArgList &Args) const {
++  if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) {
++    StringRef Value = A->getValue();
++    if (Value == "libc++")
++      return ToolChain::CST_Libcxx;
++    if (Value == "libstdc++")
++      return ToolChain::CST_Libstdcxx;
++    getDriver().Diag(diag::err_drv_invalid_stdlib_name)
++      << A->getAsString(Args);
++  }
++
++  return getTriple().getOSMajorVersion() >= 10 ? ToolChain::CST_Libcxx :
++         ToolChain::CST_Libstdcxx;
++}
++
++void FreeBSD::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
++                                          ArgStringList &CC1Args) const {
++  if (DriverArgs.hasArg(options::OPT_nostdlibinc) ||
++      DriverArgs.hasArg(options::OPT_nostdincxx))
++    return;
++
++  if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx)
++    addSystemInclude(DriverArgs, CC1Args,
++                     getDriver().SysRoot + "/usr/include/c++/v1");
++  else
++    addSystemInclude(DriverArgs, CC1Args,
++                     getDriver().SysRoot + "/usr/include/c++/4.2");
++  return;
++
++}
++
+ /// NetBSD - NetBSD tool chain which can call as(1) and ld(1) directly.
+ 
+ NetBSD::NetBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args)

Property changes on: files/patch-tools_clang_lib_Driver_ToolChains.cpp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-tools_clang_lib_Driver_ToolChains.h
===================================================================
--- files/patch-tools_clang_lib_Driver_ToolChains.h	(revision 0)
+++ files/patch-tools_clang_lib_Driver_ToolChains.h	(working copy)
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Driver/ToolChains.h.orig
++++ tools/clang/lib/Driver/ToolChains.h
+@@ -463,9 +463,14 @@
+ public:
+   FreeBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args);
+ 
++  virtual CXXStdlibType GetCXXStdlibType(const ArgList &Args) const;
++
+   virtual bool IsMathErrnoDefault() const { return false; }
+   virtual bool IsObjCNonFragileABIDefault() const { return true; }
+ 
++  virtual void AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
++                                            ArgStringList &CC1Args) const;
++
+   virtual Tool &SelectTool(const Compilation &C, const JobAction &JA,
+                            const ActionList &Inputs) const;
+ };

Property changes on: files/patch-tools_clang_lib_Driver_ToolChains.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->brooks 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Nov 14 16:40:07 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183956 
State-Changed-From-To: open->closed 
State-Changed-By: brooks 
State-Changed-When: Fri Nov 15 01:35:29 UTC 2013 
State-Changed-Why:  
Committed.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183956 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183956: commit references a PR
Date: Fri, 15 Nov 2013 01:35:25 +0000 (UTC)

 Author: brooks
 Date: Fri Nov 15 01:35:17 2013
 New Revision: 333812
 URL: http://svnweb.freebsd.org/changeset/ports/333812
 
 Log:
   Apply the clang portion of r255321 from base switching the default C++
   library to libc++ on 10+.
   
   PR:		ports/183956
   Submitted by:	dpl
 
 Added:
   head/lang/clang32/files/patch-tools_clang_lib_Driver_ToolChains.cpp   (contents, props changed)
   head/lang/clang32/files/patch-tools_clang_lib_Driver_ToolChains.h   (contents, props changed)
 Modified:
   head/lang/clang32/Makefile
 
 Modified: head/lang/clang32/Makefile
 ==============================================================================
 --- head/lang/clang32/Makefile	Fri Nov 15 01:30:05 2013	(r333811)
 +++ head/lang/clang32/Makefile	Fri Nov 15 01:35:17 2013	(r333812)
 @@ -2,7 +2,7 @@
  
  PORTNAME=	clang
  DISTVERSION=	3.2
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	lang devel
  MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
  PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
 Added: head/lang/clang32/files/patch-tools_clang_lib_Driver_ToolChains.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/lang/clang32/files/patch-tools_clang_lib_Driver_ToolChains.cpp	Fri Nov 15 01:35:17 2013	(r333812)
 @@ -0,0 +1,44 @@
 +
 +$FreeBSD$
 +
 +--- tools/clang/lib/Driver/ToolChains.cpp.orig
 ++++ tools/clang/lib/Driver/ToolChains.cpp
 +@@ -1950,6 +1950,38 @@
 +   }
 + }
 + 
 ++ToolChain::CXXStdlibType
 ++FreeBSD::GetCXXStdlibType(const ArgList &Args) const {
 ++  if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) {
 ++    StringRef Value = A->getValue();
 ++    if (Value == "libc++")
 ++      return ToolChain::CST_Libcxx;
 ++    if (Value == "libstdc++")
 ++      return ToolChain::CST_Libstdcxx;
 ++    getDriver().Diag(diag::err_drv_invalid_stdlib_name)
 ++      << A->getAsString(Args);
 ++  }
 ++
 ++  return getTriple().getOSMajorVersion() >= 10 ? ToolChain::CST_Libcxx :
 ++         ToolChain::CST_Libstdcxx;
 ++}
 ++
 ++void FreeBSD::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
 ++                                          ArgStringList &CC1Args) const {
 ++  if (DriverArgs.hasArg(options::OPT_nostdlibinc) ||
 ++      DriverArgs.hasArg(options::OPT_nostdincxx))
 ++    return;
 ++
 ++  if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx)
 ++    addSystemInclude(DriverArgs, CC1Args,
 ++                     getDriver().SysRoot + "/usr/include/c++/v1");
 ++  else
 ++    addSystemInclude(DriverArgs, CC1Args,
 ++                     getDriver().SysRoot + "/usr/include/c++/4.2");
 ++  return;
 ++
 ++}
 ++
 + /// NetBSD - NetBSD tool chain which can call as(1) and ld(1) directly.
 + 
 + NetBSD::NetBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args)
 
 Added: head/lang/clang32/files/patch-tools_clang_lib_Driver_ToolChains.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/lang/clang32/files/patch-tools_clang_lib_Driver_ToolChains.h	Fri Nov 15 01:35:17 2013	(r333812)
 @@ -0,0 +1,20 @@
 +
 +$FreeBSD$
 +
 +--- tools/clang/lib/Driver/ToolChains.h.orig
 ++++ tools/clang/lib/Driver/ToolChains.h
 +@@ -463,9 +463,14 @@
 + public:
 +   FreeBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args);
 + 
 ++  virtual CXXStdlibType GetCXXStdlibType(const ArgList &Args) const;
 ++
 +   virtual bool IsMathErrnoDefault() const { return false; }
 +   virtual bool IsObjCNonFragileABIDefault() const { return true; }
 + 
 ++  virtual void AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
 ++                                            ArgStringList &CC1Args) const;
 ++
 +   virtual Tool &SelectTool(const Compilation &C, const JobAction &JA,
 +                            const ActionList &Inputs) const;
 + };
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
