From nobody@FreeBSD.org  Sun Sep 15 12:31:34 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 ESMTP id E7B1A139
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 15 Sep 2013 12:31:34 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
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 D59C32F30
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 15 Sep 2013 12:31:34 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r8FCVYMH010325
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 15 Sep 2013 12:31:34 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r8FCVYeR010324;
	Sun, 15 Sep 2013 12:31:34 GMT
	(envelope-from nobody)
Message-Id: <201309151231.r8FCVYeR010324@oldred.freebsd.org>
Date: Sun, 15 Sep 2013 12:31:34 GMT
From: Florent Peterschmitt <florent@peterschmitt.fr>
To: freebsd-gnats-submit@FreeBSD.org
Subject: databases/mongodb FreeBSD 10.0-ALPHA1 build broken
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         182110
>Category:       ports
>Synopsis:       databases/mongodb FreeBSD 10.0-ALPHA1 build broken
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 15 12:40:00 UTC 2013
>Closed-Date:    Tue Oct 29 15:49:35 UTC 2013
>Last-Modified:  Tue Oct 29 15:50:00 UTC 2013
>Originator:     Florent Peterschmitt
>Release:        FreeBSD 10.0-ALPHA1 #1 r255574
>Organization:
>Environment:
FreeBSD yoda 10.0-ALPHA1 FreeBSD 10.0-ALPHA1 #1 r255574: Sat Sep 14 23:56:14 UTC 2013     root@yoda:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Many things have changed with FreeBSD 10, as CLang is now the default compiler and it uses it's own libc++.

Theses patchs make databases/mongodb building on FreeBSD 10.0-ALPHA1.
>How-To-Repeat:

>Fix:
https://github.com/Leryan/patchs/tree/master/freebsd/ports/databases/mongodb/freebsd10.0a1

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Sep 15 12:40:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182110 
State-Changed-From-To: open->feedback 
State-Changed-By: ale 
State-Changed-When: Mon Oct 14 09:35:55 UTC 2013 
State-Changed-Why:  
Are you able to produce patches that work for both 8.x (gcc 4.2.1) and 10.x (clang) releases? 
Otherwise I'll have to selectively apply them. 

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

From: Alex Dupre <sysadmin@alexdupre.com>
To: bug-followup@FreeBSD.org, florent@peterschmitt.fr
Cc:  
Subject: Re: ports/182110: databases/mongodb FreeBSD 10.0-ALPHA1 build broken
Date: Mon, 28 Oct 2013 16:49:20 +0100

 I'll commit mongodb 2.4.7 soon. Do you have updated patches for clang/gcc?
 
 -- 
 Alex Dupre

From: Florent Peterschmitt <florent@peterschmitt.fr>
To: Alex Dupre <sysadmin@alexdupre.com>, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182110: databases/mongodb FreeBSD 10.0-ALPHA1 build broken
Date: Mon, 28 Oct 2013 16:53:25 +0100

 This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
 --tsXRBV8MhED1XuMgp8gOtftoqp4lOeTMX
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 
 On 10/28/13 16:49, Alex Dupre wrote:
 > I'll commit mongodb 2.4.7 soon. Do you have updated patches for clang/g=
 cc?
 >=20
 Hello,
 
 I'm not in a good position for the moment to do update it (recent moving
 through the France, new job=E2=80=A6), so maybe you could apply patchs wi=
 th a
 "if" in the Makefile?
 
 --=20
 Florent Peterschmitt           | Please:
 florent@peterschmitt.fr        |  * Avoid HTML/RTF in E-mail.
 +33 (0)6 64 33 97 92           |  * Send PDF for documents.
 http://florent.peterschmitt.fr |  * Trim your quotations. Really.
 Proudly powered by Open Source | Thank you :)
 
 
 --tsXRBV8MhED1XuMgp8gOtftoqp4lOeTMX
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
 
 iQIcBAEBAgAGBQJSboh1AAoJEFr01BkajbiBs34P/RMlAelnIaHMLli6IRl7qohK
 gEn87el/WztNN/TCH/LXmTYYq3NEmYTeJkrS2pYml2YqGyezBYpPntyer+7Co3c6
 TKc4OKULpkaM2NgLkKaIhRGAUazaYQsYEHD9aB7Fw1Ri/YJYtdTJlWAqfgjJQlaH
 bPo4DEHcqc56BU+g/p06UIPhUY76Bnqm7BiielDl1C3FqbM4e3j3MNnSytiAhnYh
 FLtp115ESz1N7SVJi1dpR1FgpZzrjV6yPIkn48Bcx41h6WQOHQvYFowAxlViX3ob
 WVaZy9FTxN29pF1nluCPOwcFnLshPm1q+UNDLLG+9iSkM0nfgT/hK1ja0O9cYVux
 MECkvFZxUpjmHmBo5GcURCGmwDW8atnZqu/ms9dkE2B54mnyIjOjb2CefYrioKb2
 UkVFUcru8rLMA2wsHxQ2wXgBuhzmy4SvBwkiqOvDn5QPOURy3/nVqN/WLGgz5znd
 JbCJAMKty583Y5bM92N2v7P70PmN0obHZOux6gBllZGNHM9mUT8GlGhB0i0+dCF0
 YV2lKRB76um+APHdOaRSddOUprY9iy4NQ1id9Dqn4dRvaVKEw7Ax4mZRK026tB1k
 472b/ke9vOB/4w+vQT4HkOemomr7ipjByU26SSrtFTLjpEuJLcfmJbeHOyKs79s6
 +waRrmMFoD3SPLAoujkf
 =TJBW
 -----END PGP SIGNATURE-----
 
 --tsXRBV8MhED1XuMgp8gOtftoqp4lOeTMX--
State-Changed-From-To: feedback->closed 
State-Changed-By: ale 
State-Changed-When: Tue Oct 29 15:49:01 UTC 2013 
State-Changed-Why:  
Committed! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182110: commit references a PR
Date: Tue, 29 Oct 2013 15:48:48 +0000 (UTC)

 Author: ale
 Date: Tue Oct 29 15:48:39 2013
 New Revision: 331962
 URL: http://svnweb.freebsd.org/changeset/ports/331962
 
 Log:
   Update to 2.4.7 release and fix build with clang [1].
   
   PR:		ports/182110 [1]
   Submitted by:	Florent Peterschmitt <florent@peterschmitt.fr>
 
 Added:
   head/databases/mongodb/files/clang-patch-src_mongo_db_fts_stemmer.cpp   (contents, props changed)
   head/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_map.h   (contents, props changed)
   head/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_set.h   (contents, props changed)
   head/databases/mongodb/files/clang-patch-src_third_party_s2_hash.h   (contents, props changed)
 Modified:
   head/databases/mongodb/Makefile
   head/databases/mongodb/distinfo
   head/databases/mongodb/pkg-plist
 
 Modified: head/databases/mongodb/Makefile
 ==============================================================================
 --- head/databases/mongodb/Makefile	Tue Oct 29 15:30:11 2013	(r331961)
 +++ head/databases/mongodb/Makefile	Tue Oct 29 15:48:39 2013	(r331962)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	mongodb
 -PORTVERSION=	2.4.6
 +PORTVERSION=	2.4.7
  CATEGORIES=	databases net
  MASTER_SITES=	http://downloads.mongodb.org/src/
  DISTNAME=	${PORTNAME}-src-r${PORTVERSION}
 @@ -14,11 +14,11 @@ COMMENT=	NOSQL distributed document-orie
  LICENSE=	AGPLv3 AL2
  LICENSE_COMB=	multi
  
 -LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 -		pcre:${PORTSDIR}/devel/pcre \
 -		snappy:${PORTSDIR}/archivers/snappy
 +LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 +		libpcre.so:${PORTSDIR}/devel/pcre \
 +		libsnappy.so:${PORTSDIR}/archivers/snappy
  # boost 1.52 from ports make mongod segfaulting with many tests
 -# LIB_DEPENDS+=	boost_system:${PORTSDIR}/devel/boost-libs
 +# LIB_DEPENDS+=	libboost_system.so:${PORTSDIR}/devel/boost-libs
  # SCONS_ARGS+=	--use-system-boost
  
  ONLY_FOR_ARCHS=	i386 amd64
 @@ -30,7 +30,7 @@ SM_DESC=	Use SpiderMonkey instead of V8 
  TEST_DESC=	Add support for running regression test
  
  USE_SCONS=	yes
 -SCONS_ARGS=	--prefix=${PREFIX} --cc=${CC} --cxx=${CXX} \
 +SCONS_ARGS=	--prefix=${STAGEDIR}${PREFIX} --cc=${CC} --cxx=${CXX} \
  		--use-system-pcre --use-system-snappy \
  		--full --sharedclient
  
 @@ -39,17 +39,14 @@ GROUPS=	mongodb
  
  USE_RC_SUBR=	mongod
  
 -USE_LDCONFIG=	yes
 -
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MSM}
  SCONS_ARGS+=	--usesm --use-system-sm
 -LIB_DEPENDS+=	js:${PORTSDIR}/lang/spidermonkey17
 +LIB_DEPENDS+=	libjs.so:${PORTSDIR}/lang/spidermonkey17
  .else
  SCONS_ARGS+=	--usev8 --use-system-v8
 -LIB_DEPENDS+=	v8:${PORTSDIR}/lang/v8
 +LIB_DEPENDS+=	libv8.so:${PORTSDIR}/lang/v8
  .endif
  
  .if ${PORT_OPTIONS:MSSL}
 @@ -59,7 +56,7 @@ SCONS_ARGS+=	--ssl
  
  .if ${PORT_OPTIONS:MSASL}
  SCONS_ARGS+=	--use-sasl-client
 -LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 +LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
  .endif
  
  .if ${PORT_OPTIONS:MTEST}
 @@ -73,17 +70,19 @@ SMOKE_TESTS+=	smokeSsl
  SCONS_TARGET=	core tools
  .endif
  
 +.include <bsd.port.pre.mk>
 +
 +.if ${OSVERSION} >= 1000024
 +EXTRA_PATCHES=	${PATCHDIR}/clang-patch-src_mongo_db_fts_stemmer.cpp \
 +		${PATCHDIR}/clang-patch-src_mongo_platform_unordered_map.h \
 +		${PATCHDIR}/clang-patch-src_mongo_platform_unordered_set.h \
 +		${PATCHDIR}/clang-patch-src_third_party_s2_hash.h
 +.endif
 +
  post-patch:
  	@${REINPLACE_CMD} 's/\["-O3"\]/"${CFLAGS}"/' \
  		${WRKSRC}/SConstruct
  
 -post-install:
 -	@${LN} -s ${PREFIX}/lib/libmongoclient.so \
 -		${PREFIX}/lib/libmongoclient.so.0
 -	@if [ ! -f ${PREFIX}/etc/mongodb.conf ]; then \
 -		${TOUCH} ${PREFIX}/etc/mongodb.conf ; \
 -	fi
 -
  .if ${PORT_OPTIONS:MTEST}
  test: build-depends build
  	@cd ${BUILD_WRKSRC} && \
 
 Modified: head/databases/mongodb/distinfo
 ==============================================================================
 --- head/databases/mongodb/distinfo	Tue Oct 29 15:30:11 2013	(r331961)
 +++ head/databases/mongodb/distinfo	Tue Oct 29 15:48:39 2013	(r331962)
 @@ -1,2 +1,2 @@
 -SHA256 (mongodb-src-r2.4.6.tar.gz) = b5f397abc92d36d84a85753d15fb5d7dab6545ce9dfd9fb7685c630e6b050acb
 -SIZE (mongodb-src-r2.4.6.tar.gz) = 14141660
 +SHA256 (mongodb-src-r2.4.7.tar.gz) = 69e3cf697225efa2e6e65f5cfdc31742f3e4b2e069c27d84fc713abe0bf67ca7
 +SIZE (mongodb-src-r2.4.7.tar.gz) = 14157198
 
 Added: head/databases/mongodb/files/clang-patch-src_mongo_db_fts_stemmer.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/databases/mongodb/files/clang-patch-src_mongo_db_fts_stemmer.cpp	Tue Oct 29 15:48:39 2013	(r331962)
 @@ -0,0 +1,10 @@
 +--- src/mongo/db/fts/stemmer.cpp.orig	2013-10-14 09:21:23.732674604 +0000
 ++++ src/mongo/db/fts/stemmer.cpp	2013-10-14 09:21:35.339894547 +0000
 +@@ -16,6 +16,7 @@
 + *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 + */
 + 
 ++#include <cstdlib>
 + #include <string>
 + 
 + #include "mongo/db/fts/stemmer.h"
 
 Added: head/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_map.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_map.h	Tue Oct 29 15:48:39 2013	(r331962)
 @@ -0,0 +1,11 @@
 +--- src/mongo/platform/unordered_map.h.orig  2013-08-18 18:24:57.000000000 +0000
 ++++ src/mongo/platform/unordered_map.h       2013-09-15 14:09:09.843821449 +0000
 +@@ -48,7 +48,7 @@
 + 
 + namespace mongo {
 + 
 +-    using std::tr1::unordered_map;
 ++    using std::unordered_map;
 + 
 + }  // namespace mongo
 + 
 
 Added: head/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_set.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_set.h	Tue Oct 29 15:48:39 2013	(r331962)
 @@ -0,0 +1,11 @@
 +--- src/mongo/platform/unordered_set.h.orig   2013-09-15 14:05:01.015524128 +0000
 ++++ src/mongo/platform/unordered_set.h        2013-08-18 18:24:57.000000000 +0000
 +@@ -48,7 +48,7 @@
 + 
 + namespace mongo {
 + 
 +-    using std::tr1::unordered_set;
 ++    using std::unordered_set;
 + 
 + }  // namespace mongo
 + 
 
 Added: head/databases/mongodb/files/clang-patch-src_third_party_s2_hash.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/databases/mongodb/files/clang-patch-src_third_party_s2_hash.h	Tue Oct 29 15:48:39 2013	(r331962)
 @@ -0,0 +1,13 @@
 +--- src/third_party/s2/hash_orig.h	2013-09-15 13:43:35.601932885 +0000
 ++++ src/third_party/s2/hash.h		2013-09-15 13:43:49.767929768 +0000
 +@@ -8,8 +8,8 @@
 + #define hash_set mongo::unordered_set
 + 
 + #if defined OS_LINUX || defined OS_MACOSX || defined __sunos__ || defined __freebsd__
 +-#define HASH_NAMESPACE_START namespace std { namespace tr1 {
 +-#define HASH_NAMESPACE_END }}
 ++#define HASH_NAMESPACE_START namespace std {
 ++#define HASH_NAMESPACE_END }
 + #elif defined OS_WINDOWS
 + #define HASH_NAMESPACE_START namespace std {
 + #define HASH_NAMESPACE_END }
 
 Modified: head/databases/mongodb/pkg-plist
 ==============================================================================
 --- head/databases/mongodb/pkg-plist	Tue Oct 29 15:30:11 2013	(r331961)
 +++ head/databases/mongodb/pkg-plist	Tue Oct 29 15:48:39 2013	(r331962)
 @@ -389,7 +389,6 @@ include/mongo/util/version.h
  include/mongo/util/winutil.h
  lib/libmongoclient.a
  lib/libmongoclient.so
 -lib/libmongoclient.so.0
  @dirrm include/mongo/base
  @dirrm include/mongo/bson/util
  @dirrm include/mongo/bson
 _______________________________________________
 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:
