Update of /cvsroot/fink/fink/10.4
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9542/10.4
Modified Files:
ChangeLog apt.info apt.patch libiconv.info
Log Message:
Bootstrap only change, for the moment. Allow bootstrap to work on
latest prerelease.
Force 32 bit compiler.
Allow apt to compile with gcc-4.2.
Adjust path for libiconv.
Index: libiconv.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/libiconv.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- libiconv.info 10 Jun 2007 06:03:27 -0000 1.6
+++ libiconv.info 9 Dec 2008 06:00:19 -0000 1.7
@@ -39,6 +39,12 @@
#! /bin/sh -ex
PATH=/bin:/sbin:/usr/bin:/usr/sbin
export PATH
+
+# Make sure that we get the compiler wrapper on [redacted]
+case `uname -r` in
+10.*) PATH=%p/var/lib/fink/path-prefix-10.6:$PATH ;;
+esac
+
cd %b/../gperf-3.0.2
./configure --prefix=%p
make
Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.4/apt.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apt.patch 15 Aug 2006 11:04:33 -0000 1.3
+++ apt.patch 9 Dec 2008 06:00:19 -0000 1.4
@@ -1199,3 +1199,18 @@
StrToNum(Tar->Size,Itm.Size,sizeof(Tar->Size),8) == false ||
StrToNum(Tar->MTime,Itm.MTime,sizeof(Tar->MTime),8) == false ||
StrToNum(Tar->Major,Itm.Major,sizeof(Tar->Major),8) == false ||
+--- apt-0.5.4/apt-pkg/contrib/system.h~ 1999-12-10 17:40:29.000000000
-0600
++++ apt-0.5.4/apt-pkg/contrib/system.h 2008-12-08 00:45:25.000000000 -0600
+@@ -25,12 +25,6 @@
+ #define MAX(x,y) _max(x,y)
+ #endif
+
+-// GNU C++ has a min/max operator <coolio>
+-#if defined(__GNUG__)
+-#define MIN(A,B) ((A) <? (B))
+-#define MAX(A,B) ((A) >? (B))
+-#endif
+-
+ /* Templates tend to mess up existing code that uses min/max because of the
+ strict matching requirements */
+ #if !defined(MIN)
Index: apt.info
===================================================================
RCS file: /cvsroot/fink/fink/10.4/apt.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- apt.info 10 Jun 2007 06:03:27 -0000 1.6
+++ apt.info 9 Dec 2008 06:00:19 -0000 1.7
@@ -8,7 +8,7 @@
Source-MD5: 274fb64e2e67318b4c9c94599785c37d
SourceDirectory: %n-%v
PatchFile: %n.patch
-PatchFile-MD5: 8b8703dd6ebf6202470e86055cf6f305
+PatchFile-MD5: ff2ae523d9b3ef497cdf7595b6b1dd11
PatchScript: <<
sed -e 's|@PREFIX@|%p|g' -e 's|@DIST@|10.3|g' < %{PatchFile} | patch -p1
sh patch_flush
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/10.4/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog 20 Jan 2008 23:08:25 -0000 1.14
+++ ChangeLog 9 Dec 2008 06:00:19 -0000 1.15
@@ -1,3 +1,8 @@
+2008-12-08 Peter O'Gorman <[EMAIL PROTECTED]>
+
+ * apt.info, apt.patch: g++-4.2 does not have <? and >? operators.
+ * libiconv.info: Use the path-prefix compilers if available.
+
2008-01-20 Dave Morrison <[EMAIL PROTECTED]>
* fink-mirrors.info: sync with stable
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
