[52975] trunk/dports/devel/ice-cpp/Portfile

blair at macports.org blair at macports.org
Fri Jun 26 15:39:42 PDT 2009


Revision: 52975
          http://trac.macports.org/changeset/52975
Author:   blair at macports.org
Date:     2009-06-26 15:39:41 -0700 (Fri, 26 Jun 2009)
Log Message:
-----------
Fix building on 10.4 which fails due to a mismatched iconv() argument.

Instead of having Ice check the libiconv version againgst a specific
version of libiconv, which works if one uses only the
/usr/include/iconv.h, check for a const argument in
/usr/include/iconv.h and if one is found, then have Ice always use a
const cast.  This works because MacPorts has newer versions of iconv
so the Ice iconv version check doesn't work.

Modified Paths:
--------------
    trunk/dports/devel/ice-cpp/Portfile

Modified: trunk/dports/devel/ice-cpp/Portfile
===================================================================
--- trunk/dports/devel/ice-cpp/Portfile	2009-06-26 21:47:44 UTC (rev 52974)
+++ trunk/dports/devel/ice-cpp/Portfile	2009-06-26 22:39:41 UTC (rev 52975)
@@ -90,7 +90,7 @@
 	close $fl
 	foreach line [split $data \n] {
 		if {[string match "extern size_t iconv*const*" $line]} {
-			reinplace "s/_LIBICONV_VERSION < 0x010B/_LIBICONV_VERSION <= 0x010B/" ${workpath}/Ice-${version}/cpp/include/Ice/IconvStringConverter.h
+			reinplace "s/_LIBICONV_VERSION < 0x010B/1/" ${workpath}/Ice-${version}/cpp/include/Ice/IconvStringConverter.h
 			break
 		}
 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090626/94958d9f/attachment.html>


More information about the macports-changes mailing list