From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 7 16:50: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 ESMTPS id 933D1428 for ; Sat, 7 Dec 2013 16:50:01 +0000 (UTC) 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 669491869 for ; Sat, 7 Dec 2013 16:50: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 rB7Go1ar028424 for ; Sat, 7 Dec 2013 16:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rB7Go1Tt028423; Sat, 7 Dec 2013 16:50:01 GMT (envelope-from gnats) Resent-Date: Sat, 7 Dec 2013 16:50:01 GMT Resent-Message-Id: <201312071650.rB7Go1Tt028423@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, Christoph Moench-Tegeder 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 ESMTPS id E2B2C3C0 for ; Sat, 7 Dec 2013 16:43:17 +0000 (UTC) Received: from smtp.burggraben.net (base.exwg.net [IPv6:2a01:4f8:140:50a2::2]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 73E841831 for ; Sat, 7 Dec 2013 16:43:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp.burggraben.net (Postfix) with ESMTP id 76D2060008B for ; Sat, 7 Dec 2013 17:43:15 +0100 (CET) Received: from smtp.burggraben.net ([127.0.0.1]) by localhost (ns.burggraben.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TiWAfk9L+jnK for ; Sat, 7 Dec 2013 17:43:14 +0100 (CET) Received: from elch.exwg.net (elch.exwg.net [IPv6:2001:470:7b43:1:6a05:caff:fe01:aae9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "elch.exwg.net", Issuer "Christoph Moench-Tegeder" (verified OK)) by smtp.burggraben.net (Postfix) with ESMTPS for ; Sat, 7 Dec 2013 17:43:14 +0100 (CET) Received: by elch.exwg.net (Postfix, from userid 1000) id 6C78931016; Sat, 7 Dec 2013 17:43:12 +0100 (CET) Message-Id: <20131207164312.6C78931016@elch.exwg.net> Date: Sat, 7 Dec 2013 17:43:12 +0100 (CET) From: Christoph Moench-Tegeder To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/184566: biology/plink : fix build with gcc47 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Christoph Moench-Tegeder List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 16:50:01 -0000 >Number: 184566 >Category: ports >Synopsis: biology/plink : fix build with gcc47 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 07 16:50:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Christoph Moench-Tegeder >Release: FreeBSD 9.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD elch.exwg.net 9.2-RELEASE FreeBSD 9.2-RELEASE #11 r255911: Fri Sep 27 17:09:40 CEST 2013 cmt@elch.exwg.net:/usr/obj/usr/src/sys/ELCH amd64 lang/gcc47 gcc47-4.7.4.20131130 biology/plink plink-1.07_1 >Description: Hi, in an effort towards upgrading lang/gcc to gcc 4.7, I'm helping gerald@ in making ports gcc47-safe. Please consider the following patch to your port. If you approve of the patch, gerald@ has offered his help in commiting it. If you're commiting yourself or have someone else commit this (or another patch to the same effect), can you please add an additional reference to ports/183342 in the commit message? In my test environment, the port built successfully with lang/gcc47. >How-To-Repeat: >Fix: This patch fixes some cases of illegal C++ (rejected by gcc47) # fix illegal variable name reuse $ svn status A files/patch-elf.cpp A files/patch-idhelp.cpp A files/patch-sets.cpp Index: files/patch-elf.cpp =================================================================== --- files/patch-elf.cpp (revision 0) +++ files/patch-elf.cpp (working copy) @@ -0,0 +1,25 @@ +--- elf.cpp.orig 2013-11-16 17:09:56.000000000 +0100 ++++ elf.cpp 2013-11-16 17:10:24.000000000 +0100 +@@ -1175,10 +1175,10 @@ + << setw(8) << gcnt << " " + << setw(8) << (double)cnt / (double)gcnt << "\n"; + +- map::iterator i = chr_cnt.begin(); +- while ( i != chr_cnt.end() ) ++ map::iterator ichr = chr_cnt.begin(); ++ while ( ichr != chr_cnt.end() ) + { +- int c = i->first; ++ int c = ichr->first; + int x = chr_cnt.find( c )->second; + int y = chr_gcnt.find( c )->second; + +@@ -1189,7 +1189,7 @@ + << setw(8) << y << " " + << setw(8) << (double)x / (double)y << "\n"; + +- ++i; ++ ++ichr; + } + + } Index: files/patch-idhelp.cpp =================================================================== --- files/patch-idhelp.cpp (revision 0) +++ files/patch-idhelp.cpp (working copy) @@ -0,0 +1,19 @@ +--- idhelp.cpp.orig 2013-11-16 17:11:42.000000000 +0100 ++++ idhelp.cpp 2013-11-16 17:12:53.000000000 +0100 +@@ -772,12 +772,12 @@ + for (int j = 0 ; j < jointField.size(); j++ ) + { + set & jf = jointField[j]; +- set::iterator j = jf.begin(); ++ set::iterator jfit = jf.begin(); + PP->printLOG(" { "); +- while ( j != jf.end() ) ++ while ( jfit != jf.end() ) + { +- PP->printLOG( (*j)->name + " " ); +- ++j; ++ PP->printLOG( (*jfit)->name + " " ); ++ ++jfit; + } + PP->printLOG(" }"); + } Index: files/patch-sets.cpp =================================================================== --- files/patch-sets.cpp (revision 0) +++ files/patch-sets.cpp (working copy) @@ -0,0 +1,18 @@ +--- sets.cpp.orig 2013-11-16 17:06:29.000000000 +0100 ++++ sets.cpp 2013-11-16 17:07:12.000000000 +0100 +@@ -768,11 +768,11 @@ + ////////////////////////////////////////////// + // Reset original missing status + +- vector::iterator i = PP->sample.begin(); +- while ( i != PP->sample.end() ) ++ vector::iterator ipp = PP->sample.begin(); ++ while ( ipp != PP->sample.end() ) + { +- (*i)->missing = (*i)->flag; +- ++i; ++ (*ipp)->missing = (*ipp)->flag; ++ ++ipp; + } + + //////////////////////////////////////////////// Regards, Christoph >Release-Note: >Audit-Trail: >Unformatted: