cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the build with more standards-compliant compilers such as GCC 4.7. [1]

Browse Source 
On the way replace USE_GMAKE by USES=gmake.

PR:		184566 [1], 182136
Submitted by:	Christoph Moench-Tegeder <cmt@burggraben.net> [1]
Approved by:	maintainer (Jason Bacon <jwbacon@tds.net>) [1]
This commit is contained in:
Gerald Pfeifer 2013-12-13 09:34:40 +00:00
parent 71fe78ed54
commit 2291db64ec
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=336328
4 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
biology/plink/Makefile
View File

@ -15,8 +15,8 @@ LICENSE= GPLv2
LIB_DEPENDS= liblapack.so:${PORTSDIR}/math/lapack
USES= gmake
USE_ZIP= yes
USE_GMAKE= yes
USE_FORTRAN= yes # Make it use the same compiler as lapack
PLIST_FILES= bin/plink

25
biology/plink/files/patch-elf.cpp Normal file
View File

@ -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<int,int>::iterator i = chr_cnt.begin();
- while ( i != chr_cnt.end() )
+ map<int,int>::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;
}
}

19
biology/plink/files/patch-idhelp.cpp Normal file
View File

@ -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<IDField*> & jf = jointField[j];
- set<IDField*>::iterator j = jf.begin();
+ set<IDField*>::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(" }");
}

18
biology/plink/files/patch-sets.cpp Normal file
View File

@ -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<Individual*>::iterator i = PP->sample.begin();
- while ( i != PP->sample.end() )
+ vector<Individual*>::iterator ipp = PP->sample.begin();
+ while ( ipp != PP->sample.end() )
{
- (*i)->missing = (*i)->flag;
- ++i;
+ (*ipp)->missing = (*ipp)->flag;
+ ++ipp;
}
////////////////////////////////////////////////