svn commit: r364382 - in head/devel/avr-gcc: . files

Joerg Wunsch joerg at FreeBSD.org
Fri Aug 8 20:47:01 UTC 2014 

Author: joerg
Date: Fri Aug  8 20:46:59 2014
New Revision: 364382
URL: http://svnweb.freebsd.org/changeset/ports/364382
QAT: https://qat.redports.org/buildarchive/r364382/

Log:
  Add staging support.
  
  Upgrade to a recent GCC version (4.8.3).
  
  Drop most of our local hacks.
  
  PR:		192399
  Submitted by:	pi

Added:
  head/devel/avr-gcc/files/patch-Makefile.in   (contents, props changed)
Deleted:
  head/devel/avr-gcc/files/patch-200-gcc-4.5.1-libiberty-Makefile.in
  head/devel/avr-gcc/files/patch-300-gcc-4.5.1-fixedpoint-3-4-2010
  head/devel/avr-gcc/files/patch-301-gcc-4.5.1-xmega-v14
  head/devel/avr-gcc/files/patch-302-gcc-4.5.1-avrtiny10
  head/devel/avr-gcc/files/patch-303-gcc-4.5.1-osmain
  head/devel/avr-gcc/files/patch-304-gcc-4.5.1-builtins-v6
  head/devel/avr-gcc/files/patch-305-gcc-4.5.1-avrtiny10-non-fixedpoint
  head/devel/avr-gcc/files/patch-306-gcc-4.5.1-option-list-devices
  head/devel/avr-gcc/files/patch-400-gcc-4.5.1-new-devices
  head/devel/avr-gcc/files/patch-401-gcc-4.5.1-atmega32_5_50_90_pa
  head/devel/avr-gcc/files/patch-402-gcc-4.5.1-attiny1634
  head/devel/avr-gcc/files/patch-403-gcc-4.5.1-atmega48pa
  head/devel/avr-gcc/files/patch-500-gcc-4.5.1-bug13473
  head/devel/avr-gcc/files/patch-501-gcc-4.5.1-bug13579
  head/devel/avr-gcc/files/patch-502-gcc-4.5.1-bug-18145-v4
  head/devel/avr-gcc/files/patch-503-gcc-4.5.1-avrtiny10-bug-12510
  head/devel/avr-gcc/files/patch-504-gcc-4.5.1-bug12915
  head/devel/avr-gcc/files/patch-505-gcc-4.5.1-bug13932
  head/devel/avr-gcc/files/patch-506-gcc-4.5.1-bug13789
  head/devel/avr-gcc/files/patch-599-gcc-4.5.1-bug46779
  head/devel/avr-gcc/files/patch-gcc-config-avr-driver-avr.c
  head/devel/avr-gcc/files/patch-plugins
Modified:
  head/devel/avr-gcc/Makefile
  head/devel/avr-gcc/distinfo
  head/devel/avr-gcc/pkg-descr

Modified: head/devel/avr-gcc/Makefile
==============================================================================
--- head/devel/avr-gcc/Makefile	Fri Aug  8 20:43:19 2014	(r364381)
+++ head/devel/avr-gcc/Makefile	Fri Aug  8 20:46:59 2014	(r364382)
@@ -1,24 +1,18 @@
-# Created by: Joerg Wunsch <joerg at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.5.1
-PORTREVISION=	2
+PORTVERSION=	4.8.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GCC}
-MASTER_SITES+=	http://people.freebsd.org/~joerg/:local
-MASTER_SITE_SUBDIR=	releases/${DISTNAME}
+MASTER_SITE_SUBDIR=	releases/gcc-${DISTVERSION}
 PKGNAMEPREFIX=	avr-
-DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-g++-${PORTVERSION}${EXTRACT_SUFX}
-EXTRACT_ONLY=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-g++-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	ports at FreeBSD.org
+# DISTNAME=	gcc-${DISTVERSION}
 
+MAINTAINER=	joerg at FreeBSD.org
 COMMENT=	FSF GCC 4.x for Atmel AVR 8-bit RISC cross-development
 
-BROKEN=		Fails to build with avr-binutils 2.24
+LICENSE=	GPLv3 GPLv3RLE
+LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils
@@ -28,38 +22,37 @@ LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math
 RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
 		avr-ld:${PORTSDIR}/devel/avr-binutils
 
-# GCC 4.x doesn't want to be built in its own source directory.
-WRKSRC=			${WRKDIR}/gcc-${PORTVERSION}
-BUILD_WRKSRC=		${WRKDIR}/build
-CONFIGURE_WRKSRC=	${BUILD_WRKSRC}
-INSTALL_WRKSRC=		${BUILD_WRKSRC}
-CONFIGURE_SCRIPT=	../gcc-${PORTVERSION}/configure
+# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
+# of executables and directories once installed.  A PORTVERSION of
+# 4.Y.2.s20130808 results in values of 4.Y-20130808, 4.Y.2, and 4Y
+# for these three.
+DISTVERSION=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.s([0-9]+)/\1-\2/}
+GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
+SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 
+USES=		bison gettext gmake perl5 tar:bzip2 libtool
 USE_PERL5=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
-USES=		bison gettext gmake perl5 tar:bzip2
 GNU_CONFIGURE=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "amd64")
 ARCH=		x86_64
 .endif
 
-CONFLICTS=	avr-gcc-3* avr-gcc-42*
-
-CONFIGURE_ARGS=	--target=avr --disable-libssp --with-gmp=${LOCALBASE}
+CONFLICTS=	avr-gcc-devel*
 
-MAKE_FLAGS=	LANGUAGES="c c++"
+CONFIGURE_ARGS=	--target=avr --disable-libssp --with-gmp=${LOCALBASE} --enable-languages="c c++"
 
 WITHOUT_CPU_CFLAGS=This is a cross-compiler.
 
-MAN1=		avr-cpp.1 avr-gcc.1 avr-g++.1 avr-gcov.1
-MAN7=		fsf-funding.7 gfdl.7 gpl.7
 INFO=		cpp gcc gccint cppinternals gccinstall
 
-post-extract:
-	cd ${WRKDIR} && ${MKDIR} build
+post-configure:
+	${MKDIR} ${WRKSRC}/gcc/include
+
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/gcc/avr/${PORTVERSION}/liblto_plugin.so.0
 
 .include <bsd.port.post.mk>

Modified: head/devel/avr-gcc/distinfo
==============================================================================
--- head/devel/avr-gcc/distinfo	Fri Aug  8 20:43:19 2014	(r364381)
+++ head/devel/avr-gcc/distinfo	Fri Aug  8 20:46:59 2014	(r364382)
@@ -1,4 +1,2 @@
-SHA256 (gcc-core-4.5.1.tar.bz2) = b57b37a83840b134572b042f170d7a9429863ba0308b56b403b35de6f0e0526a
-SIZE (gcc-core-4.5.1.tar.bz2) = 27974462
-SHA256 (gcc-g++-4.5.1.tar.bz2) = a5349ea8d531aa0a248484f426513e5d05b12915e5412d332c278f65d272ce48
-SIZE (gcc-g++-4.5.1.tar.bz2) = 6473733
+SHA256 (gcc-4.8.3.tar.bz2) = 6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e
+SIZE (gcc-4.8.3.tar.bz2) = 86126808

Added: head/devel/avr-gcc/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/avr-gcc/files/patch-Makefile.in	Fri Aug  8 20:46:59 2014	(r364382)
@@ -0,0 +1,17 @@
+--- Makefile.in.orig	2014-06-13 16:32:16.000000000 +0200
++++ Makefile.in	2014-08-08 20:04:46.000000000 +0200
+@@ -36809,6 +36773,14 @@
+ TARGET-target-libgcc=all
+ maybe-all-target-libgcc: all-target-libgcc
+ all-target-libgcc: configure-target-libgcc
++	cp ${HOST_SUBDIR}/gcc/libgcc.mvars gcc/
++	cp ${HOST_SUBDIR}/gcc/tconfig.h libgcc/
++	cp ${HOST_SUBDIR}/gcc/auto-host.h libgcc/
++	cp ${HOST_SUBDIR}/gcc/tm.h libgcc/
++	cp ${HOST_SUBDIR}/gcc/options.h libgcc/
++	cp ${HOST_SUBDIR}/gcc/insn-constants.h libgcc/
++	cp ${HOST_SUBDIR}/gcc/insn-modes.h libgcc/
++	cp ${HOST_SUBDIR}/gcc/gcov-iov.h libgcc/
+ 	@r=`${PWD_COMMAND}`; export r; \
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(NORMAL_TARGET_EXPORTS)  \

Modified: head/devel/avr-gcc/pkg-descr
==============================================================================
--- head/devel/avr-gcc/pkg-descr	Fri Aug  8 20:43:19 2014	(r364381)
+++ head/devel/avr-gcc/pkg-descr	Fri Aug  8 20:46:59 2014	(r364382)
@@ -1,23 +1,14 @@
 FSF gcc-4.x for Atmel AVR cross-development
 
 Included is the basic C++ compiler, although this is only of limited
-use without a libstdc++, and it is little tested.
+use without a libstdc++.
 
 Supported debugging formats: -gdwarf-2 [default], -gstabs
-Local patch added: OS_main attribute
 
 Locally added support for the following AVR devices:
 
-  ATmega32C1, ATmega64C1, ATmega32M1, ATmega64M1
-  ATmega16U4, ATmega32U4, ATmega32U6
-  ATmega128RFA1
-  M3000F, M3000S, M3001B
-  AT90SCR100
-  ATtiny13A
-  ATtiny87, ATtiny167, ATtiny327
-  AT90PWM81
-  ATxmega64A1, ATxmega128A1, ATxmega64A3, ATxmega128A3, ATxmega256A3,
-  ATxmega256A3B
+  ATmega64RFR2, ATmega644RFR2, ATmega128RFR2, ATmega1284RFR2,
+  ATmega256RFR2, ATmega2564RFR2
 
 WWW: http://gcc.gnu.org/
 WWW: http://www.nongnu.org/avr-libc/

More information about the svn-ports-head mailing list