Include the C++ compiler. Certainly of limited use for a

microcontroller, but i got interested to get a complex FFT working.

No stdlibc++ support at this time.

10 files changed, 52 insertions, 6 deletions

diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 163eefd6ee5a..8254ab37258a 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -11,7 +11,8 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	avr-
-DISTNAME=	gcc-core-${PORTVERSION}
+DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g++-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	joerg@freebsd.org
 
@@ -32,7 +33,7 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--target=avr
 
-MAKE_FLAGS=	LANGUAGES="c"
+MAKE_FLAGS=	LANGUAGES="c c++"
 
 MAN1=		cpp.1 avr-gcc.1 gcov.1
 
diff --git a/devel/avr-gcc-3/distinfo b/devel/avr-gcc-3/distinfo
index 9627930e7ad3..7d5d930d80bf 100644
--- a/devel/avr-gcc-3/distinfo
+++ b/devel/avr-gcc-3/distinfo
@@ -1 +1,2 @@
 MD5 (gcc-core-3.0.tar.gz) = 7c92ef3beeac09fd00ccd56c17ba12c9
+MD5 (gcc-g++-3.0.tar.gz) = 2403fe480fbbf894b36b53f693b34f77
diff --git a/devel/avr-gcc-3/files/patch-ac b/devel/avr-gcc-3/files/patch-ac
new file mode 100644
index 000000000000..0dcd72c3a9e4
--- /dev/null
+++ b/devel/avr-gcc-3/files/patch-ac
@@ -0,0 +1,12 @@
+--- configure.in.orig	Sun Aug 12 18:18:37 2001
++++ configure.in	Sun Aug 12 18:18:13 2001
+@@ -665,6 +665,9 @@
+ 	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+     fi
+     ;;
++  avr-*-*)
++    noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libglosstarget-libiberty"
++    ;;
+   arm-*-oabi*)
+     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+     ;;
diff --git a/devel/avr-gcc-3/pkg-descr b/devel/avr-gcc-3/pkg-descr
index d98e521c85ed..695f85290e59 100644
--- a/devel/avr-gcc-3/pkg-descr
+++ b/devel/avr-gcc-3/pkg-descr
@@ -1,4 +1,7 @@
-FSF gcc-2.95.2 for Atmel AVR cross-development
+FSF gcc-3.0 for Atmel AVR cross-development
 
 This brings the gcc compiler to the Atmel AVR 8-bit RISC family of
 microcontrollers.
+
+Now including the basic C++ compiler, although this is only of limited
+use without a libstdc++, and it is little tested.
diff --git a/devel/avr-gcc-3/pkg-plist b/devel/avr-gcc-3/pkg-plist
index 051b510ede1a..7bbbea393a06 100644
--- a/devel/avr-gcc-3/pkg-plist
+++ b/devel/avr-gcc-3/pkg-plist
@@ -1,12 +1,18 @@
 avr/bin/gcc
+avr/bin/g++
+avr/bin/c++
 bin/avr-gcc
 bin/avr-cpp
+bin/avr-g++
+bin/avr-c++
+bin/avr-c++filt
 bin/gccbug
 lib/gcc-lib/avr/3.0/cc1
 lib/gcc-lib/avr/3.0/collect2
 lib/gcc-lib/avr/3.0/specs
 lib/gcc-lib/avr/3.0/cpp0
 lib/gcc-lib/avr/3.0/tradcpp0
+lib/gcc-lib/avr/3.0/cc1plus
 lib/gcc-lib/avr/3.0/libgcc.a
 lib/gcc-lib/avr/3.0/avr3/libgcc.a
 lib/gcc-lib/avr/3.0/avr4/libgcc.a
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 163eefd6ee5a..8254ab37258a 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -11,7 +11,8 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	avr-
-DISTNAME=	gcc-core-${PORTVERSION}
+DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g++-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	joerg@freebsd.org
 
@@ -32,7 +33,7 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--target=avr
 
-MAKE_FLAGS=	LANGUAGES="c"
+MAKE_FLAGS=	LANGUAGES="c c++"
 
 MAN1=		cpp.1 avr-gcc.1 gcov.1
 
diff --git a/devel/avr-gcc/distinfo b/devel/avr-gcc/distinfo
index 9627930e7ad3..7d5d930d80bf 100644
--- a/devel/avr-gcc/distinfo
+++ b/devel/avr-gcc/distinfo
@@ -1 +1,2 @@
 MD5 (gcc-core-3.0.tar.gz) = 7c92ef3beeac09fd00ccd56c17ba12c9
+MD5 (gcc-g++-3.0.tar.gz) = 2403fe480fbbf894b36b53f693b34f77
diff --git a/devel/avr-gcc/files/patch-ac b/devel/avr-gcc/files/patch-ac
new file mode 100644
index 000000000000..0dcd72c3a9e4
--- /dev/null
+++ b/devel/avr-gcc/files/patch-ac
@@ -0,0 +1,12 @@
+--- configure.in.orig	Sun Aug 12 18:18:37 2001
++++ configure.in	Sun Aug 12 18:18:13 2001
+@@ -665,6 +665,9 @@
+ 	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+     fi
+     ;;
++  avr-*-*)
++    noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libglosstarget-libiberty"
++    ;;
+   arm-*-oabi*)
+     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+     ;;
diff --git a/devel/avr-gcc/pkg-descr b/devel/avr-gcc/pkg-descr
index d98e521c85ed..695f85290e59 100644
--- a/devel/avr-gcc/pkg-descr
+++ b/devel/avr-gcc/pkg-descr
@@ -1,4 +1,7 @@
-FSF gcc-2.95.2 for Atmel AVR cross-development
+FSF gcc-3.0 for Atmel AVR cross-development
 
 This brings the gcc compiler to the Atmel AVR 8-bit RISC family of
 microcontrollers.
+
+Now including the basic C++ compiler, although this is only of limited
+use without a libstdc++, and it is little tested.
diff --git a/devel/avr-gcc/pkg-plist b/devel/avr-gcc/pkg-plist
index 051b510ede1a..7bbbea393a06 100644
--- a/devel/avr-gcc/pkg-plist
+++ b/devel/avr-gcc/pkg-plist
@@ -1,12 +1,18 @@
 avr/bin/gcc
+avr/bin/g++
+avr/bin/c++
 bin/avr-gcc
 bin/avr-cpp
+bin/avr-g++
+bin/avr-c++
+bin/avr-c++filt
 bin/gccbug
 lib/gcc-lib/avr/3.0/cc1
 lib/gcc-lib/avr/3.0/collect2
 lib/gcc-lib/avr/3.0/specs
 lib/gcc-lib/avr/3.0/cpp0
 lib/gcc-lib/avr/3.0/tradcpp0
+lib/gcc-lib/avr/3.0/cc1plus
 lib/gcc-lib/avr/3.0/libgcc.a
 lib/gcc-lib/avr/3.0/avr3/libgcc.a
 lib/gcc-lib/avr/3.0/avr4/libgcc.a