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

fix openbsd lib detection, don't break out of the loop (I'm stupid).

Browse Source 
let cmake detect most recent library, as it should
This commit is contained in:
espie 2007-03-23 16:30:35 +00:00
parent 9634d7d235
commit 665a689517
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/cmake/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2007/02/17 19:04:24 espie Exp $
# $OpenBSD: Makefile,v 1.5 2007/03/23 16:30:35 espie Exp $
HOMEPAGE= http://www.cmake.org/
CATEGORIES= devel
COMMENT= portable build system
DISTNAME= cmake-2.4.6
PKGNAME= ${DISTNAME}p0
MASTER_SITES= ${HOMEPAGE}files/v2.4/
MAINTAINER= Marc Espie <espie@openbsd.org>

9
devel/cmake/patches/patch-Source_cmFindLibraryCommand_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmFindLibraryCommand_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
$OpenBSD: patch-Source_cmFindLibraryCommand_cxx,v 1.4 2007/03/23 16:30:35 espie Exp $
--- Source/cmFindLibraryCommand.cxx.orig Wed Jan 10 18:59:12 2007
+++ Source/cmFindLibraryCommand.cxx Sun Mar 18 13:52:02 2007
@@ -139,11 +139,53 @@ void cmFindLibraryCommand::AddLib64Paths()
+++ Source/cmFindLibraryCommand.cxx Fri Mar 23 17:07:55 2007
@@ -139,11 +139,52 @@ void cmFindLibraryCommand::AddLib64Paths()
}
}
@ -36,7 +36,6 @@ $OpenBSD: patch-Source_cmFindLibraryCommand_cxx,v 1.3 2007/03/20 11:23:10 espie
+ bestmajor = major;
+ bestminor = minor;
+ best = path + "/" + *it;
+ break;
+ }
+ return best;
+}
@ -55,7 +54,7 @@ $OpenBSD: patch-Source_cmFindLibraryCommand_cxx,v 1.3 2007/03/20 11:23:10 espie
if(ff == "FIRST" || ff == "LAST")
{
supportFrameworks = true;
@@ -194,6 +236,16 @@ std::string cmFindLibraryCommand::FindLibrary(const ch
@@ -194,6 +235,16 @@ std::string cmFindLibraryCommand::FindLibrary(const ch
tryPath += *prefix;
tryPath += name;
tryPath += *suffix;