Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv24151

Modified Files:
        avr-binutils.info avr-gcc.info avr-libc.info 
Added Files:
        avr-binutils.patch 
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8


Index: avr-binutils.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/devel/avr-binutils.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- avr-binutils.info   24 Jul 2011 17:35:19 -0000      1.3
+++ avr-binutils.info   1 Nov 2011 17:41:09 -0000       1.4
@@ -1,16 +1,18 @@
 Package: avr-binutils
-Version: 2.17
-Revision: 2
-Distribution: 10.4, 10.5
+Version: 2.19
+Revision: 3
+BuildDepends: fink (>= 0.24.12)
 Maintainer: Matthias Ringwald <[email protected]>
 Source: mirror:gnu:binutils/binutils-%v.tar.bz2
-Source-MD5: e26e2e06b6e4bf3acf1dc8688a94c0d1 
+Source-MD5: 17a52219dee5a76c1a9d9b0bfd337d66 
+PatchFile: %n.patch
+PatchFile-MD5: 8c24f8e7d9c7950b66dff0331b6633c4
 
 ConfigureParams: --target=avr --prefix=%p/share/avr --bindir=%p/bin 
--mandir=%p/share/man --infodir=%p/share/info --disable-nls
 
 InstallScript: <<
     make install DESTDIR=%d
-    rm -fr %i/share/avr/lib
+    rm -fr %i/share/avr/lib/
     rm -fr %i/share/info
 <<
 
@@ -21,6 +23,9 @@
 Removed libiberty.a installation of avr-gcc & avr-binutils.
 Avoided using /sw/avr. Its lib & include folders have been moved to 
/sw/share/avr and the binaries are put into /sw/bin.
 Removed xxx.info files to avoid clashes with other potential toolchains.
+
+opcodes/avr-dis.c: uses sprintf without formats (compile error on 10.6), using 
strcpy insteads
+strings.c: uses stat64 which is deprecated in 10.6. stat64 provides 64 bit 
inodes which are not used anyway, use stat.
 TODO: Native Language Support
 <<
 

Index: avr-gcc.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/devel/avr-gcc.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- avr-gcc.info        24 Jul 2011 17:35:19 -0000      1.3
+++ avr-gcc.info        1 Nov 2011 17:41:09 -0000       1.4
@@ -1,26 +1,50 @@
 Package: avr-gcc
-Version: 4.2.0
-Revision: 2
-Distribution: 10.4, 10.5
-Depends: avr-binutils (>= 2.15)
-BuildDepends: gcc4.0
+Version: 4.5.3
+Revision: 1
+Distribution: 10.4, 10.5, 10.6
+Depends: avr-binutils (>= 2.15), gmp-shlibs (>=4.3.2-1), libmpfr1-shlibs (>= 
2.4.2-2), libmpc2-shlibs
+BuildDepends: gcc4.0, gmp (>=4.3.2-1), libmpfr1 (>= 2.4.2-2), libmpc2
 Maintainer: Matthias Ringwald <[email protected]>
 Source: mirror:gnu:gcc/gcc-%v/gcc-%v.tar.bz2
-Source-MD5: 4798c23548dc791ea12a139e18940684
-
+Source-MD5: 8e0b5c12212e185f3e4383106bfa9cc6
 SetCC: gcc-4.0
 SetCXX: g++-4.0
-ConfigureParams: --target=avr --prefix=%p/share/avr --prefix=%p/share/avr 
--bindir=%p/bin --mandir=%p/share/man --infodir=%p/share/info 
--enable-languages=c,c++ --disable-nls --disable-libssp
+ConfigureParams: <<
+    --target=avr \
+    --prefix=%p/share/avr \
+    --bindir=%p/bin \
+    --mandir=%p/share/man \
+    --infodir=%p/share/info \
+    --enable-languages=c,c++ \
+    --disable-nls \
+    --disable-libssp \
+    --with-gmp=%p
+<<
+
+CompileScript: <<
+    #!/bin/bash -ev
+    cd ..
+    mkdir build
+    cd build
+    pwd
+    ../gcc-%v/configure %c
+    make
+<<
 
 InstallScript: <<
+    #!/bin/bash -ev
+    cd ../build
     make install DESTDIR=%d
-    # maybe needed: rm -fr %i/share/avr/include     
+    
+    # empty
+    rm -fr %i/share/avr/include     
     rm -f  %i/share/avr/lib/libiberty.a
-    rm -fr %i/share/man/man7
+    
+    # provided by fink's gcc
+    rm -fr  %i/share/man/man7
     rm -fr %i/share/info
 <<
 
-DocFiles: BUGS bugs.html COPYING FAQ faq.html MAINTAINERS README README.SCO
 Description: GNU GCC for ATMEL AVR micro controllers
 DescPort: <<
 Removed libiberty.a installation of avr-gcc & avr-binutils.

Index: avr-libc.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/devel/avr-libc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- avr-libc.info       11 Jul 2011 04:08:30 -0000      1.1
+++ avr-libc.info       1 Nov 2011 17:41:09 -0000       1.2
@@ -1,27 +1,33 @@
 Package: avr-libc
-Version: 1.4.6
-Revision: 1
-Distribution: 10.4, 10.5
-Depends: avr-binutils (>= 2.17), avr-gcc (>= 4.2.0) 
-
+Version: 1.7.1
+Revision: 2
+Depends: avr-gcc (>= 4.5.3) 
 
 Maintainer: Matthias Ringwald <[email protected]>
-Source: http://download.savannah.gnu.org/releases/avr/avr-libc-bin-%v.zip
-Source-MD5: 78fede358c684587622d76d62e622b21
-NoSourceDirectory: true
-
+Source: http://download.savannah.gnu.org/releases/avr-libc/%n-%v.tar.bz2
+Source-MD5: 8608061dcff075d44d5c59cb7b6a6f39
+Source2: 
http://download.savannah.gnu.org/releases/avr-libc/avr-libc-user-manual-%v.tar.bz2
+Source2-MD5: 1d0490f6f83192b8ab4f88ac027978e2
 
-CompileScript: <<
-<<
+# ConfigureScript: <<
+# ./configure --build=`./config.guess` --host=avr --prefix=%p/share/avr
+# <<
 
+ConfigureParams: --build=`./config.guess` --host=avr --prefix=%p/share/avr
 
 InstallScript: <<
-    mkdir -p %i/share/avr
-    cp -R %b/avr %i/share/avr/
-    cp -R %b/bin %i/share/avr/
-    mkdir -p %i/share/doc/avr-libc
-    cp -R %b/share/doc/avr-libc-%v/* %i/share/doc/avr-libc
-    ln -s %p/share/doc/avr-libc/avr-libc-user-manual/index.html 
%i/share/doc/avr-libc/avr-libc-user-manual.html
+    make install DESTDIR=%d
+    rm -rf %i/share/avr/bin
+    mkdir -p %i/share/doc/%n-%v
+    mv %i/share/avr/share/doc/%n-%v/examples %i/share/doc/%n-%v
+    rm -rf %i/share/avr/share
+    cp -R ../avr-libc-user-manual-%v %i/share/doc/%n-%v/avr-libc-user-manual
+
+    # rm -rf %i/share/avr/share
+    # mkdir -p %i/share/avr
+    # cp -R %b/avr %i/share/avr/
+    # cp -R %b/bin %i/share/avr/
+    # cp -R %b/share/doc/avr-libc-%v/* %i/share/doc/avr-libc
 <<
 
 Description: AVR LIBC for GNU GCC & GNU binutils
@@ -33,7 +39,7 @@
 <<
 
 DescPort: <<
-    Gettting avr-libc to compile takes more effort than its worth, since
+    Getting avr-libc to compile takes more effort than its worth, since
     they provide already built versions. This package just installs the 
     prebuilt binaries.
 <<

--- NEW FILE: avr-binutils.patch ---
--- binutils-2.19/opcodes/avr-dis.c     2007-07-05 11:49:00.000000000 +0200
+++ binutils-2.19-patched/opcodes/avr-dis.c     2009-09-12 09:34:15.000000000 
+0200
@@ -109,7 +109,7 @@
            case 0x100e: xyz = "-X"; break;
            default: xyz = "??"; ok = 0;
          }
-       sprintf (buf, xyz);
+       strcpy(buf, xyz);
 
        if (AVR_UNDEF_P (insn))
          sprintf (comment, _("undefined"));
@@ -149,7 +149,7 @@
         value of the address only once, but this would mean recoding
         objdump_print_address() which would affect many targets.  */
       sprintf (buf, "%#lx", (unsigned long) *sym_addr);      
-      sprintf (comment, comment_start);
+      strcpy (comment, comment_start);
       break;
       
     case 'L':
@@ -158,7 +158,7 @@
        sprintf (buf, ".%+-8d", rel_addr);
         *sym = 1;
         *sym_addr = pc + 2 + rel_addr;
-       sprintf (comment, comment_start);
+       strcpy (comment, comment_start);
       }
       break;
 
@@ -169,7 +169,7 @@
        sprintf (buf, ".%+-8d", rel_addr);
         *sym = 1;
         *sym_addr = pc + 2 + rel_addr;
-       sprintf (comment, comment_start);
+       strcpy (comment, comment_start);
       }
       break;
 
--- binutils-2.19/binutils/strings.c    2008-08-25 06:38:13.000000000 +0200
+++ binutils-2.19-patched/binutils/strings.c    2009-09-12 09:59:00.000000000 
+0200
@@ -85,13 +85,9 @@
 typedef off_t file_off;
 #define file_open(s,m) fopen(s, m)
 #endif
-#ifdef HAVE_STAT64
-typedef struct stat64 statbuf;
-#define file_stat(f,s) stat64(f, s)
-#else
+// inode not used - don't try to used 64 bit inodes
 typedef struct stat statbuf;
 #define file_stat(f,s) stat(f, s)
-#endif
 
 /* Radix for printing addresses (must be 8, 10 or 16).  */
 static int address_radix;


------------------------------------------------------------------------------
RSA&reg; Conference 2012
Save &#36;700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to