From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 29 06:00:24 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 25E421065672 for ; Mon, 29 Aug 2011 06:00:24 +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 E8FE58FC14 for ; Mon, 29 Aug 2011 06:00:23 +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 p7T60NAI072472 for ; Mon, 29 Aug 2011 06:00:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p7T60NSu072463; Mon, 29 Aug 2011 06:00:23 GMT (envelope-from gnats) Resent-Date: Mon, 29 Aug 2011 06:00:23 GMT Resent-Message-Id: <201108290600.p7T60NSu072463@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, Stephon Chen Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 786F9106566B; Mon, 29 Aug 2011 05:50:19 +0000 (UTC) (envelope-from stephon@empty-1-25.pixnet.net) Received: from epaper.pixnet.net (srvnat.pixnet.tw [60.199.247.250]) by mx1.freebsd.org (Postfix) with ESMTP id 4D82D8FC13; Mon, 29 Aug 2011 05:50:18 +0000 (UTC) Message-Id: <201108290550.p7T5oH1S058486@empty-1-25> Date: Mon, 29 Aug 2011 13:50:17 +0800 (CST) From: Stephon Chen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: skv@FreeBSD.org Subject: ports/160271: [PATCH] devel/thrift: fix compile error with fb303, patch included 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: Mon, 29 Aug 2011 06:00:24 -0000 >Number: 160271 >Category: ports >Synopsis: [PATCH] devel/thrift: fix compile error with fb303, patch included >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Aug 29 06:00:23 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Stephon Chen >Release: FreeBSD 8.2-RELEASE amd64 >Organization: PIXNET >Environment: System: FreeBSD 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011 >Description: Add t_cpp_generator.cpp patch Added file(s): - files/patch-t-cpp-generator.ac Port maintainer (skv@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- thrift-0.6.1,3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/thrift/Makefile /net/account/admin/stephon/ports/devel/thrift/Makefile --- /usr/ports/devel/thrift/Makefile 2011-08-29 13:19:34.000000000 +0800 +++ /net/account/admin/stephon/ports/devel/thrift/Makefile 2011-08-29 13:45:50.251012000 +0800 @@ -7,7 +7,7 @@ PORTNAME= thrift PORTVERSION= 0.6.1 -PORTEPOCH= 2 +PORTEPOCH= 3 CATEGORIES= devel MASTER_SITES= APACHE MASTER_SITE_SUBDIR= /thrift/${PORTVERSION} diff -ruN --exclude=CVS /usr/ports/devel/thrift/files/patch-t-cpp-generator.ac /net/account/admin/stephon/ports/devel/thrift/files/patch-t-cpp-generator.ac --- /usr/ports/devel/thrift/files/patch-t-cpp-generator.ac 1970-01-01 08:00:00.000000000 +0800 +++ /net/account/admin/stephon/ports/devel/thrift/files/patch-t-cpp-generator.ac 2011-08-29 13:44:49.762773000 +0800 @@ -0,0 +1,16 @@ +--- compiler/cpp/src/generate/t_cpp_generator.cc ++++ compiler/cpp/src/generate/t_cpp_generator.cc +@@ -506,7 +506,11 @@ void t_cpp_generator::generate_enum(t_enum* tenum) { + /** + Generate a character array of enum names for debugging purposes. + */ +- std::string prefix = tenum->get_name() + "::"; ++ std::string prefix = ""; ++ if (!gen_pure_enums_) { ++ prefix = tenum->get_name() + "::"; ++ } ++ + f_types_impl_ << + indent() << "int _k" << tenum->get_name() << "Values[] ="; + generate_enum_constant_list(f_types_impl_, constants, prefix.c_str(), "", false); + --- thrift-0.6.1,3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: