[89852] trunk/dports/cross/avr-gcc
titus at macports.org
titus at macports.org
Mon Feb 13 01:38:35 PST 2012
Revision: 89852
http://trac.macports.org/changeset/89852
Author: titus at macports.org
Date: 2012-02-13 01:38:35 -0800 (Mon, 13 Feb 2012)
Log Message:
-----------
ticket #33107 : update avr-gcc to 4.6.2
Modified Paths:
--------------
trunk/dports/cross/avr-gcc/Portfile
Added Paths:
-----------
trunk/dports/cross/avr-gcc/files/patch-lto-plugin-osx.diff
Removed Paths:
-------------
trunk/dports/cross/avr-gcc/files/gcc-config-avr-avr.c.diff
trunk/dports/cross/avr-gcc/files/gcc-config-avr-avr.h.diff
trunk/dports/cross/avr-gcc/files/gcc-config-avr-t-avr.diff
Modified: trunk/dports/cross/avr-gcc/Portfile
===================================================================
--- trunk/dports/cross/avr-gcc/Portfile 2012-02-13 09:36:04 UTC (rev 89851)
+++ trunk/dports/cross/avr-gcc/Portfile 2012-02-13 09:38:35 UTC (rev 89852)
@@ -1,70 +1,80 @@
# $Id$
-PortSystem 1.0
-name avr-gcc
-version 4.0.2
+PortSystem 1.0
+name avr-gcc
+version 4.6.2
+platforms darwin
+categories cross devel
+maintainers nomaintainer
+license {GPL-3+ Permissive}
+description GNU cross compilers for Atmel AVR
+long_description GNU compilers collection (c and c++) for Atmel AVR 8bit microcontrollers..
+homepage http://gcc.gnu.org/
+master_sites gnu:gcc/gcc-${version}/
+distfiles gcc-${version}.tar.bz2
+use_bzip2 yes
+worksrcdir gcc-${version}
+checksums md5 028115c4fbfb6cfd75d6369f4a90d87e \
+ sha256 60b05463dfe18d40d68fb8a71b25b408a01f86cc6ceaf5e6b22238b6b0f450c2 \
+ rmd160 e7041933b39629f9524848dcf81a1a4c02a225c6
+
# Parameters for this port.
-set crossgcc-target avr
-set default-languages --enable-languages="c,c++"
+set crossgcc-target avr
+set default-languages --enable-languages="c,c++"
-description gcc cross-compilers for avr
-long_description GNU compilers collection (c and c++) for avr.
-homepage http://gcc.gnu.org/
-platforms darwin
-categories cross devel
-maintainers nomaintainer
-master_sites gnu:gcc/gcc-${version}/
-distfiles gcc-${version}.tar.bz2
-worksrcdir gcc-${version}
-checksums md5 a659b8388cac9db2b13e056e574ceeb0 \
- sha1 f1b714c6398393d8f7f4ad5be933b462a95b075d \
- rmd160 70c7e21820da4d29ce6e8e48329d906ee19333aa
-
# All cross ports violate the mtree layout.
-destroot.violate_mtree yes
+destroot.violate_mtree yes
# Download everything to gcc/
-dist_subdir gcc
+dist_subdir gcc
-depends_lib bin:${crossgcc-target}-ar:${crossgcc-target}-binutils \
- bin:${crossgcc-target}-as:${crossgcc-target}-binutils \
- bin:${crossgcc-target}-ld:${crossgcc-target}-binutils \
- bin:${crossgcc-target}-nm:${crossgcc-target}-binutils \
- bin:${crossgcc-target}-ranlib:${crossgcc-target}-binutils
-depends_build bin:msgfmt:gettext
+depends_lib bin:${crossgcc-target}-ar:${crossgcc-target}-binutils \
+ bin:${crossgcc-target}-as:${crossgcc-target}-binutils \
+ bin:${crossgcc-target}-ld:${crossgcc-target}-binutils \
+ bin:${crossgcc-target}-nm:${crossgcc-target}-binutils \
+ bin:${crossgcc-target}-ranlib:${crossgcc-target}-binutils \
+ port:gmp port:mpfr port:libiconv port:libmpc port:ppl
-# gcc is .bz2.
-use_bzip2 yes
+depends_build bin:msgfmt:gettext
+
# Since we don't build gcc and binutils at the same time, gcc's Makefile will try to transform
# program names as gcc's name (add -${version} with ${version} being the version of gcc).
# But it won't work because binutils binaries don't have the ${version} suffix, and even if they
# had, they would actually have the binutils' version suffix (and not gcc's version).
# So let's tell gcc's Makefile not to do that mistake.
-set environment [list AR_FOR_TARGET=${crossgcc-target}-ar \
- AS_FOR_TARGET=${crossgcc-target}-as \
- LD_FOR_TARGET=${crossgcc-target}-ld \
- NM_FOR_TARGET=${crossgcc-target}-nm \
- RANLIB_FOR_TARGET=${crossgcc-target}-ranlib]
+set environment [list AR_FOR_TARGET=${crossgcc-target}-ar \
+ AS_FOR_TARGET=${crossgcc-target}-as \
+ LD_FOR_TARGET=${crossgcc-target}-ld \
+ NM_FOR_TARGET=${crossgcc-target}-nm \
+ RANLIB_FOR_TARGET=${crossgcc-target}-ranlib]
# Build in a different directory, as advised in the README file.
-pre-configure {
- file mkdir "${workpath}/build"
+pre-configure {
+ file mkdir "${workpath}/build"
}
-configure.dir ${workpath}/build
-configure.cmd ${workpath}/gcc-${version}/configure
-configure.cc "cc -no-cpp-precomp"
-configure.env ${environment}
-configure.args --infodir='${prefix}/share/info' \
- --mandir='${prefix}/share/man' \
- --target=${crossgcc-target} \
- --program-prefix=${crossgcc-target}- \
- --with-included-gettext \
- --enable-obsolete \
- --with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${version}/ \
- ${default-languages}
+
+patchfiles-append patch-lto-plugin-osx.diff
+
+configure.dir ${workpath}/build
+configure.cmd ${workpath}/gcc-${version}/configure
+# configure.cc "cc -no-cpp-precomp"
+configure.env ${environment}
+configure.args --infodir='${prefix}/share/info' \
+ --mandir='${prefix}/share/man' \
+ --target=${crossgcc-target} \
+ --program-prefix=${crossgcc-target}- \
+ --with-included-gettext \
+ --enable-obsolete \
+ --disable-nls \
+ --enable-lto \
+ --with-plugin-ld=${crossgcc-target}-ld \
+ --disable-libquadmath \
+ --with-gxx-include-dir=${prefix}/${crossgcc-target}/include/c++/${version}/ \
+ ${default-languages}
+
if {$build_arch != "" && ${os.platform} == "darwin"} {
configure.cc_archflags
configure.cxx_archflags
@@ -73,180 +83,181 @@
--host=${build_arch}-apple-darwin${os.major}
}
-build.dir ${workpath}/build
+build.dir ${workpath}/build
-build.args ${environment}
-destroot.args ${environment}
+build.args ${environment}
+destroot.args ${environment}
-patchfiles gcc-config-avr-avr.c.diff \
- gcc-config-avr-avr.h.diff \
- gcc-config-avr-t-avr.diff
+# left as a reference; this was for gcc-4.0.2
+# don't know if this is still needed for gcc-4.6.2
+#platform darwin 9 {
+# patchfiles-append gcc-config-rs6000-host-darwin.c.diff
+#}
-platform darwin 9 {
- patchfiles-append gcc-config-rs6000-host-darwin.c.diff
-}
-
post-patch {
- namespace eval crossgcc {}
+ namespace eval crossgcc {}
- # Fix the info pages and related stuff.
- #
- # path: path to the doc directory (e.g. gas/doc/)
- # makefile: path to Makefile.in (e.g. gas/doc/Makefile.in)
- # name: name of the info page (e.g. as)
- # suffix: suffix of the souce page (texinfo or texi)
- proc crossgcc::fixinfo { path makefile name suffix } {
- global crossgcc-target worksrcpath
+ # Fix the info pages and related stuff.
+ #
+ # path: path to the doc directory (e.g. gas/doc/)
+ # makefile: path to Makefile.in (e.g. gas/doc/Makefile.in)
+ # name: name of the info page (e.g. as)
+ # suffix: suffix of the souce page (texinfo or texi)
+ proc crossgcc::fixinfo { path makefile name suffix } {
+ global crossgcc-target worksrcpath
- # Fix the source
- reinplace "s|setfilename ${name}.info|setfilename ${crossgcc-target}-${name}.info|g" \
- ${worksrcpath}/${path}/${name}.${suffix}
- reinplace "s|(${name})|(${crossgcc-target}-${name})|g" \
- ${worksrcpath}/${path}/${name}.${suffix}
- reinplace "s|@file{${name}}|@file{${crossgcc-target}-${name}}|g" \
- ${worksrcpath}/${path}/${name}.${suffix}
-
- # Fix the Makefile
- reinplace "s| ${name}.info| ${crossgcc-target}-${name}.info|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|/${name}.info|/${crossgcc-target}-${name}.info|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|^${name}.info|${crossgcc-target}-${name}.info|g" \
- ${worksrcpath}/${makefile}
- reinplace "s| ${name}.pod| ${crossgcc-target}-${name}.pod|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|/${name}.pod|/${crossgcc-target}-${name}.pod|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|^${name}.pod|${crossgcc-target}-${name}.pod|g" \
- ${worksrcpath}/${makefile}
- reinplace "s| ${name}.${suffix}| ${crossgcc-target}-${name}.${suffix}|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|/${name}.${suffix}|/${crossgcc-target}-${name}.${suffix}|g" \
- ${worksrcpath}/${makefile}
- reinplace "s|^${name}.${suffix}|${crossgcc-target}-${name}.${suffix}|g" \
- ${worksrcpath}/${makefile}
-
- # Rename the source
- file rename ${worksrcpath}/${path}/${name}.${suffix} \
- ${worksrcpath}/${path}/${crossgcc-target}-${name}.${suffix}
-
- # Fix install-info's dir.
- # (note: this may be effectless if there was no info dir to be fixed)
- reinplace "s|--info-dir=\$(DESTDIR)\$(infodir)|--dir-file=\$(DESTDIR)\$(infodir)/${crossgcc-target}-gcc-dir|g" \
- "${worksrcpath}/${makefile}"
- }
+ # Fix the source
+ reinplace "s|setfilename ${name}.info|setfilename ${crossgcc-target}-${name}.info|g" \
+ ${worksrcpath}/${path}/${name}.${suffix}
+ reinplace "s|(${name})|(${crossgcc-target}-${name})|g" \
+ ${worksrcpath}/${path}/${name}.${suffix}
+ reinplace "s|@file{${name}}|@file{${crossgcc-target}-${name}}|g" \
+ ${worksrcpath}/${path}/${name}.${suffix}
- # Fix the gettext files and related stuff.
- #
- # module: name of the module (e.g. gas)
- proc crossgcc::fixgettext { module } {
- global crossgcc-target worksrcpath
+ # Fix the Makefile
+ reinplace "s| ${name}.info| ${crossgcc-target}-${name}.info|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|/${name}.info|/${crossgcc-target}-${name}.info|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|^${name}.info|${crossgcc-target}-${name}.info|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s| ${name}.pod| ${crossgcc-target}-${name}.pod|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|/${name}.pod|/${crossgcc-target}-${name}.pod|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|^${name}.pod|${crossgcc-target}-${name}.pod|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s| ${name}.${suffix}| ${crossgcc-target}-${name}.${suffix}|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|/${name}.${suffix}|/${crossgcc-target}-${name}.${suffix}|g" \
+ ${worksrcpath}/${makefile}
+ reinplace "s|^${name}.${suffix}|${crossgcc-target}-${name}.${suffix}|g" \
+ ${worksrcpath}/${makefile}
- if { [ file exists "${worksrcpath}/${module}/Makefile.in" ] } {
- reinplace "s|@PACKAGE@|${crossgcc-target}- at PACKAGE@|g" \
- "${worksrcpath}/${module}/Makefile.in"
- }
- if { [ file exists "${worksrcpath}/${module}/doc/Makefile.in" ] } {
- reinplace "s|@PACKAGE@|${crossgcc-target}- at PACKAGE@|g" \
- "${worksrcpath}/${module}/doc/Makefile.in"
- }
- if { [ file exists "${worksrcpath}/${module}/po/Make-in" ] } {
- reinplace "s|@PACKAGE@|${crossgcc-target}- at PACKAGE@|g" \
- "${worksrcpath}/${module}/po/Make-in"
- }
- }
+ # Rename the source
+ file rename ${worksrcpath}/${path}/${name}.${suffix} \
+ ${worksrcpath}/${path}/${crossgcc-target}-${name}.${suffix}
- # gcc/doc/cpp.texi
- crossgcc::fixinfo gcc/doc/ gcc/Makefile.in cpp texi
+ # Fix install-info's dir.
+ # (note: this may be effectless if there was no info dir to be fixed)
+ reinplace "s|--info-dir=\$(DESTDIR)\$(infodir)|--dir-file=\$(DESTDIR)\$(infodir)/${crossgcc-target}-gcc-dir|g" \
+ "${worksrcpath}/${makefile}"
+ }
- # gcc/doc/cppinternals.texi
- crossgcc::fixinfo gcc/doc/ gcc/Makefile.in cppinternals texi
+ # Fix the gettext files and related stuff.
+ #
+ # module: name of the module (e.g. gas)
+ proc crossgcc::fixgettext { module } {
+ global crossgcc-target worksrcpath
- # gcc/doc/gcc.texi
- crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gcc texi
+ if { [ file exists "${worksrcpath}/${module}/Makefile.in" ] } {
+ reinplace "s|@PACKAGE@|${crossgcc-target}- at PACKAGE@|g" \
+ "${worksrcpath}/${module}/Makefile.in"
+ }
+ if { [ file exists "${worksrcpath}/${module}/doc/Makefile.in" ] } {
+ reinplace "s|@PACKAGE@|${crossgcc-target}- at PACKAGE@|g" \
+ "${worksrcpath}/${module}/doc/Makefile.in"
+ }
+ if { [ file exists "${worksrcpath}/${module}/po/Make-in" ] } {
+ reinplace "s|@PACKAGE@|${crossgcc-target}- at PACKAGE@|g" \
+ "${worksrcpath}/${module}/po/Make-in"
+ }
+ }
- # gcc/doc/gccint.texi
- crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gccint texi
+ # gcc/doc/cpp.texi
+ crossgcc::fixinfo gcc/doc/ gcc/Makefile.in cpp texi
- # gcc/f/g77.texi
- crossgcc::fixinfo gcc/fortran/ gcc/fortran/Make-lang.in gfortran texi
+ # gcc/doc/cppinternals.texi
+ crossgcc::fixinfo gcc/doc/ gcc/Makefile.in cppinternals texi
- # gcc/java/gcj.texi
- crossgcc::fixinfo gcc/java/ gcc/java/Make-lang.in gcj texi
+ # gcc/doc/gcc.texi
+ crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gcc texi
- # fastjar/fastjar.texi
- crossgcc::fixinfo fastjar/ fastjar/Makefile.in fastjar texi
-
- # gcc/doc/gccinstall.info
- crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gccinstall info
+ # gcc/doc/gccint.texi
+ crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gccint texi
- # gettext stuff.
- crossgcc::fixgettext gcc
- crossgcc::fixgettext fastjar
+ # libquadmath/libquadmath.texi
+ crossgcc::fixinfo libquadmath libquadmath/Makefile.in libquadmath texi
+
+ # gcc/f/g77.texi
+ crossgcc::fixinfo gcc/fortran/ gcc/fortran/Make-lang.in gfortran texi
+
+ # gcc/java/gcj.texi
+ crossgcc::fixinfo gcc/java/ gcc/java/Make-lang.in gcj texi
+
+ # fastjar/fastjar.texi
+ #crossgcc::fixinfo fastjar/ fastjar/Makefile.in fastjar texi
+
+ # gcc/doc/gccinstall.info
+ crossgcc::fixinfo gcc/doc/ gcc/Makefile.in gccinstall info
+
+ # gettext stuff.
+ crossgcc::fixgettext gcc
+ crossgcc::fixgettext fastjar
}
pre-destroot {
- # gcc needs the cross directory structure to be present
- # in order to fill it during installation.
- file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
- file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
+ # gcc needs the cross directory structure to be present
+ # in order to fill it during installation.
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/bin"
+ file mkdir "${destroot}${prefix}/${crossgcc-target}/lib"
}
post-destroot {
- namespace eval crossgcc {}
+ namespace eval crossgcc {}
- # Rename a man page if it exists.
- #
- # section: section of the man page (e.g. 1)
- # manpage: name of the man page (e.g. cpp)
- proc crossgcc::rename_man_page { section manpage } {
- global crossgcc-target destroot prefix
+ # Rename a man page if it exists.
+ #
+ # section: section of the man page (e.g. 1)
+ # manpage: name of the man page (e.g. cpp)
+ proc crossgcc::rename_man_page { section manpage } {
+ global crossgcc-target destroot prefix
- set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
- if { [ file exists ${manpage_path} ] } {
- file rename ${manpage_path} \
- "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
- }
- }
+ set manpage_path "${destroot}${prefix}/share/man/man${section}/${manpage}.${section}"
+ if { [ file exists ${manpage_path} ] } {
+ file rename ${manpage_path} \
+ "${destroot}${prefix}/share/man/man${section}/${crossgcc-target}-${manpage}.${section}"
+ }
+ }
- # Stuff I don't want (either because they're in the system
- # or because they would conflict with other FSF ports)
- # (it's easier for maintainability purposes to fix things here)
+ # Stuff I don't want (either because they're in the system
+ # or because they would conflict with other FSF ports)
+ # (it's easier for maintainability purposes to fix things here)
- # aliases for locales (should be on the system)
- file delete "${destroot}${prefix}/share/locale/locale.alias"
-
- # FSF propaganda (should already be there or would conflict)
- file delete -force "${destroot}${prefix}/share/man/man7"
+ # aliases for locales (should be on the system)
+ file delete "${destroot}${prefix}/share/locale/locale.alias"
- # (host) libiberty
- file delete "${destroot}${prefix}/lib/libiberty.a"
+ # FSF propaganda (should already be there or would conflict)
+ file delete -force "${destroot}${prefix}/share/man/man7"
- # aliases for charsets (should already be there)
- file delete "${destroot}${prefix}/lib/charset.alias"
-
- # Remove man pages for tools that are not built as part of cross-gcc
- file delete "${destroot}${prefix}/share/man/man1/rmic.1"
- file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
- file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
- file delete "${destroot}${prefix}/share/man/man1/gij.1"
-
- # For some reason, some man pages are not prefixed while they should have been
- # (to avoid conflicting).
- crossgcc::rename_man_page 1 cpp
- crossgcc::rename_man_page 1 gcjh
- crossgcc::rename_man_page 1 gcov
- crossgcc::rename_man_page 1 jcf-dump
- crossgcc::rename_man_page 1 jv-scan
-
- # There is a bug in gcc/Makefile::install-driver
- # For cross compilers, $(GCC_INSTALL_NAME) is equal to
- # $(target_noncanonical)-gcc-$(version)
- # and hence the driver isn't installed.
- xinstall -c "${workpath}/build/gcc/xgcc" \
- "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
+ # (host) libiberty
+ file delete "${destroot}${prefix}/lib/${build_arch}/libiberty.a"
+
+ # aliases for charsets (should already be there)
+ file delete "${destroot}${prefix}/lib/charset.alias"
+
+ # Remove man pages for tools that are not built as part of cross-gcc
+ file delete "${destroot}${prefix}/share/man/man1/rmic.1"
+ file delete "${destroot}${prefix}/share/man/man1/rmiregistry.1"
+ file delete "${destroot}${prefix}/share/man/man1/jv-convert.1"
+ file delete "${destroot}${prefix}/share/man/man1/gij.1"
+
+ # For some reason, some man pages are not prefixed while they should have been
+ # (to avoid conflicting).
+ crossgcc::rename_man_page 1 cpp
+ crossgcc::rename_man_page 1 gcjh
+ crossgcc::rename_man_page 1 gcov
+ crossgcc::rename_man_page 1 jcf-dump
+ crossgcc::rename_man_page 1 jv-scan
+
+ # There is a bug in gcc/Makefile::install-driver
+ # For cross compilers, $(GCC_INSTALL_NAME) is equal to
+ # $(target_noncanonical)-gcc-$(version)
+ # and hence the driver isn't installed.
+ xinstall -c "${workpath}/build/gcc/xgcc" \
+ "${destroot}${prefix}/bin/${crossgcc-target}-gcc-${version}"
}
-livecheck.type regex
-livecheck.url http://gcc.gnu.org/releases.html
-livecheck.regex {<tr><td><a href="gcc-.*/">GCC (.*)</a></td> <td>.*</td></tr>}
+livecheck.type regex
+livecheck.url http://gcc.gnu.org/releases.html
+livecheck.regex {<tr><td><a href="gcc-.*/">GCC (.*)</a></td> <td>.*</td></tr>}
Deleted: trunk/dports/cross/avr-gcc/files/gcc-config-avr-avr.c.diff
===================================================================
--- trunk/dports/cross/avr-gcc/files/gcc-config-avr-avr.c.diff 2012-02-13 09:36:04 UTC (rev 89851)
+++ trunk/dports/cross/avr-gcc/files/gcc-config-avr-avr.c.diff 2012-02-13 09:38:35 UTC (rev 89852)
@@ -1,54 +0,0 @@
-diff -u gcc/config/avr/avr.c gcc/config/avr/avr.c
---- gcc/config/avr/avr.c 2005-07-27 16:37:11.000000000 -0700
-+++ gcc/config/avr/avr.c 2005-12-04 17:49:38.000000000 -0800
-@@ -175,6 +175,12 @@
- { "at90s8515", 2, "__AVR_AT90S8515__" },
- { "at90c8534", 2, "__AVR_AT90C8534__" },
- { "at90s8535", 2, "__AVR_AT90S8535__" },
-+ /* Classic + MOVW, <= 8K. */
-+ { "attiny13", 2, "__AVR_ATtiny13__" },
-+ { "attiny2313", 2, "__AVR_ATtiny2313__" },
-+ { "attiny25", 2, "__AVR_ATtiny25__" },
-+ { "attiny45", 2, "__AVR_ATtiny45__" },
-+ { "attiny85", 2, "__AVR_ATtiny85__" },
- { "at86rf401", 2, "__AVR_AT86RF401__" },
- /* Classic + MOVW, <= 8K. */
- { "attiny13", 2, "__AVR_ATtiny13__" },
-@@ -193,23 +199,37 @@
- { "atmega88", 4, "__AVR_ATmega88__" },
- { "atmega8515", 4, "__AVR_ATmega8515__" },
- { "atmega8535", 4, "__AVR_ATmega8535__" },
-+ { "at90pwm2", 4, "__AVR_AT90PWM2__" },
-+ { "at90pwm3", 4, "__AVR_AT90PWM3__" },
- /* Enhanced, > 8K. */
- { "avr5", 5, NULL },
- { "atmega16", 5, "__AVR_ATmega16__" },
- { "atmega161", 5, "__AVR_ATmega161__" },
- { "atmega162", 5, "__AVR_ATmega162__" },
- { "atmega163", 5, "__AVR_ATmega163__" },
-+ { "atmega164", 5, "__AVR_ATmega164__" },
- { "atmega165", 5, "__AVR_ATmega165__" },
- { "atmega168", 5, "__AVR_ATmega168__" },
- { "atmega169", 5, "__AVR_ATmega169__" },
- { "atmega32", 5, "__AVR_ATmega32__" },
- { "atmega323", 5, "__AVR_ATmega323__" },
-+ { "atmega324", 5, "__AVR_ATmega324__" },
- { "atmega325", 5, "__AVR_ATmega325__" },
- { "atmega3250", 5, "__AVR_ATmega3250__" },
-+ { "atmega329", 5, "__AVR_ATmega329__" },
-+ { "atmega3290", 5, "__AVR_ATmega3290__" },
-+ { "atmega640", 5, "__AVR_ATmega640__" },
- { "atmega64", 5, "__AVR_ATmega64__" },
-+ { "atmega644", 5, "__AVR_ATmega644__" },
- { "atmega645", 5, "__AVR_ATmega645__" },
-+ { "atmega649", 5, "__AVR_ATmega649__" },
-+ { "atmega6490", 5, "__AVR_ATmega6490__" },
- { "atmega6450", 5, "__AVR_ATmega6450__" },
- { "atmega128", 5, "__AVR_ATmega128__" },
-+ { "atmega1280",5, "__AVR_ATmega1280__" },
-+ { "atmega1281",5, "__AVR_ATmega1281__" },
-+ { "at90can32", 5, "__AVR_AT90CAN32__" },
-+ { "at90can64", 5, "__AVR_AT90CAN64__" },
- { "at90can128", 5, "__AVR_AT90CAN128__" },
- { "at94k", 5, "__AVR_AT94K__" },
- /* Assembler only. */
Deleted: trunk/dports/cross/avr-gcc/files/gcc-config-avr-avr.h.diff
===================================================================
--- trunk/dports/cross/avr-gcc/files/gcc-config-avr-avr.h.diff 2012-02-13 09:36:04 UTC (rev 89851)
+++ trunk/dports/cross/avr-gcc/files/gcc-config-avr-avr.h.diff 2012-02-13 09:38:35 UTC (rev 89852)
@@ -1,66 +0,0 @@
-diff -u gcc/config/avr/avr.h gcc/config/avr/avr.h
---- gcc/config/avr/avr.h 2005-02-17 14:41:35.000000000 -0800
-+++ gcc/config/avr/avr.h 2005-12-04 17:56:29.000000000 -0800
-@@ -812,11 +812,12 @@
-
- #define LINK_SPEC " %{!mmcu*:-m avr2}\
- %{mmcu=at90s1200|mmcu=attiny11|mmcu=attiny12|mmcu=attiny15|mmcu=attiny28:-m avr1} \
--%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401|mmcu=attiny13|mmcu=attiny2313:-m avr2}\
-+%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401|mmcu=attiny13|mmcu=attiny2313|mmcu=attiny25|mmcu=attiny45|mmcu=attiny85:-m avr2}\
- %{mmcu=atmega103|mmcu=atmega603|mmcu=at43*|mmcu=at76*:-m avr3}\
--%{mmcu=atmega8*|mmcu=atmega48:-m avr4}\
--%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64*|mmcu=atmega128|mmcu=at90can128|mmcu=at94k:-m avr5}\
--%{mmcu=atmega325|mmcu=atmega3250|mmcu=atmega48|mmcu=atmega88|mmcu=atmega64|mmcu=atmega645|mmcu=atmega6450|mmcu=atmega128|mmcu=at90can128|mmcu=at90can128|mmcu=atmega162|mmcu=atmega165|mmcu=atmega168|mmcu=atmega169: -Tdata 0x800100} "
-+%{mmcu=atmega8*|mmcu=atmega48|mmcu=at90pwm*:-m avr4}\
-+%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64*|mmcu=atmega128*|mmcu=at90can*|mmcu=at94k:-m avr5}\
-+%{mmcu=atmega324|mmcu=atmega325|mmcu=atmega3250|mmcu=atmega329|mmcu=atmega3290|mmcu=atmega48|mmcu=atmega88|mmcu=atmega64|mmcu=atmega644|mmcu=atmega645|mmcu=atmega6450|mmcu=atmega649|mmcu=atmega6490|mmcu=atmega128|mmcu=at90can*|mmcu=atmega162|mmcu=atmega164|mmcu=atmega165|mmcu=atmega168|mmcu=atmega169|mmcu=at90pwm*: -Tdata 0x800100}\
-+%{mmcu=atmega640|mmcu=atmega1280|mmcu=atmega1281: -Tdata 0x800200} "
-
- #define LIB_SPEC \
- "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lc }}}}}"
-@@ -852,6 +853,9 @@
- %{mmcu=at86rf401:crt86401.o%s} \
- %{mmcu=attiny13:crttn13.o%s} \
- %{mmcu=attiny2313:crttn2313.o%s} \
-+%{mmcu=attiny25:crttn25.o%s} \
-+%{mmcu=attiny45:crttn45.o%s} \
-+%{mmcu=attiny85:crttn85.o%s} \
- %{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
- %{mmcu=atmega603:crtm603.o%s} \
- %{mmcu=at43usb320:crt43320.o%s} \
-@@ -862,21 +866,35 @@
- %{mmcu=atmega88:crtm88.o%s} \
- %{mmcu=atmega8515:crtm8515.o%s} \
- %{mmcu=atmega8535:crtm8535.o%s} \
-+%{mmcu=at90pwm2:crt90pwm2.o%s} \
-+%{mmcu=at90pwm3:crt90pwm3.o%s} \
- %{mmcu=atmega16:crtm16.o%s} \
- %{mmcu=atmega161|mmcu=avr5:crtm161.o%s} \
- %{mmcu=atmega162:crtm162.o%s} \
- %{mmcu=atmega163:crtm163.o%s} \
-+%{mmcu=atmega164:crtm164.o%s} \
- %{mmcu=atmega165:crtm165.o%s} \
- %{mmcu=atmega168:crtm168.o%s} \
- %{mmcu=atmega169:crtm169.o%s} \
- %{mmcu=atmega32:crtm32.o%s} \
- %{mmcu=atmega323:crtm323.o%s} \
-+%{mmcu=atmega324:crtm324.o%s} \
- %{mmcu=atmega325:crtm325.o%s} \
- %{mmcu=atmega3250:crtm3250.o%s} \
-+%{mmcu=atmega329:crtm329.o%s} \
-+%{mmcu=atmega3290:crtm3290.o%s} \
- %{mmcu=atmega64:crtm64.o%s} \
-+%{mmcu=atmega640:crtm640.o%s} \
-+%{mmcu=atmega644:crtm644.o%s} \
- %{mmcu=atmega645:crtm6450.o%s} \
- %{mmcu=atmega6450:crtm6450.o%s} \
-+%{mmcu=atmega649:crtm649.o%s} \
-+%{mmcu=atmega6490:crtm6490.o%s} \
- %{mmcu=atmega128:crtm128.o%s} \
-+%{mmcu=atmega1280:crtm1280.o%s} \
-+%{mmcu=atmega1281:crtm1281.o%s} \
-+%{mmcu=at90can32:crtcan32.o%s} \
-+%{mmcu=at90can64:crtcan64.o%s} \
- %{mmcu=at90can128:crtcan128.o%s} \
- %{mmcu=at94k:crtat94k.o%s}"
-
Deleted: trunk/dports/cross/avr-gcc/files/gcc-config-avr-t-avr.diff
===================================================================
--- trunk/dports/cross/avr-gcc/files/gcc-config-avr-t-avr.diff 2012-02-13 09:36:04 UTC (rev 89851)
+++ trunk/dports/cross/avr-gcc/files/gcc-config-avr-t-avr.diff 2012-02-13 09:38:35 UTC (rev 89852)
@@ -1,36 +0,0 @@
-diff -u gcc/config/avr/t-avr gcc/config/avr/t-avr
---- gcc/config/avr/t-avr 2005-04-24 21:14:24.000000000 -0700
-+++ gcc/config/avr/t-avr 2005-12-04 18:00:40.000000000 -0800
-@@ -48,15 +48,26 @@
- mmcu?avr4=mmcu?atmega8515 mmcu?avr4=mmcu?atmega8535 \
- mmcu?avr4=mmcu?atmega8 mmcu?avr4=mmcu?atmega48 \
- mmcu?avr4=mmcu?atmega88 \
-+ mmcu?avr4=mmcu?at90pwm2 mmcu?avr4=mmcu?at90pwm3 \
- mmcu?avr5=mmcu?atmega161 mmcu?avr5=mmcu?atmega162 \
-- mmcu?avr5=mmcu?atmega163 mmcu?avr5=mmcu?atmega169 \
-- mmcu?avr5=mmcu?atmega16 mmcu?avr5=mmcu?atmega168 \
-+ mmcu?avr5=mmcu?atmega163 mmcu?avr5=mmcu?atmega164 \
- mmcu?avr5=mmcu?atmega165 \
-- mmcu?avr5=mmcu?atmega323 mmcu?avr5=mmcu?atmega32 \
-+ mmcu?avr5=mmcu?atmega168 mmcu?avr5=mmcu?atmega169 \
-+ mmcu?avr5=mmcu?atmega16 \
-+ mmcu?avr5=mmcu?atmega323 mmcu?avr5=mmcu?atmega324 \
- mmcu?avr5=mmcu?atmega325 mmcu?avr5=mmcu?atmega3250 \
-- mmcu?avr5=mmcu?atmega64 mmcu?avr5=mmcu?atmega128 \
-- mmcu?avr5=mmcu?atmega645 mmcu?avr5=mmcu?atmega6450 \
-- mmcu?avr5=mmcu?at94k mmcu?avr5=mmcu?at90can128
-+ mmcu?avr5=mmcu?atmega329 mmcu?avr5=mmcu?atmega3290 \
-+ mmcu?avr5=mmcu?atmega32 \
-+ mmcu?avr5=mmcu?atmega640 \
-+ mmcu?avr5=mmcu?atmega644 mmcu?avr5=mmcu?atmega645 \
-+ mmcu?avr5=mmcu?atmega6450 mmcu?avr5=mmcu?atmega649 \
-+ mmcu?avr5=mmcu?atmega6490 mmcu?avr5=mmcu?atmega64 \
-+ mmcu?avr5=mmcu?atmega128 \
-+ mmcu?avr5=mmcu?atmega1280 mmcu?avr5=mmcu?atmega1281 \
-+ mmcu?avr5=mmcu?at90can32 \
-+ mmcu?avr5=mmcu?at90can64 \
-+ mmcu?avr5=mmcu?at90can128 \
-+ mmcu?avr5=mmcu?at94k
-
- MULTILIB_EXCEPTIONS =
-
Added: trunk/dports/cross/avr-gcc/files/patch-lto-plugin-osx.diff
===================================================================
--- trunk/dports/cross/avr-gcc/files/patch-lto-plugin-osx.diff (rev 0)
+++ trunk/dports/cross/avr-gcc/files/patch-lto-plugin-osx.diff 2012-02-13 09:38:35 UTC (rev 89852)
@@ -0,0 +1,13 @@
+--- lto-plugin/lto-plugin.c 2011-04-05 14:13:27.000000000 +0200
++++ lto-plugin/lto-plugin.c 2011-12-12 13:49:23.000000000 +0100
+@@ -68,6 +68,10 @@
+ # define O_BINARY 0
+ #endif
+
++#ifdef __APPLE__
++char * environ[] = {NULL};
++#endif
++
+ /* Segment name for LTO sections. This is only used for Mach-O.
+ FIXME: This needs to be kept in sync with darwin.c. */
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120213/04637d25/attachment-0001.html>
More information about the macports-changes
mailing list