svn commit: r386418 - in head/devel: msp430-gcc msp430-gcc/files msp430-gdb msp430-gdb/files

Fri May 15 15:38:03 UTC 2015

Author: lev
Date: Fri May 15 15:38:01 2015
New Revision: 386418
URL: https://svnweb.freebsd.org/changeset/ports/386418

Log:
    Fix building on modern systems.

Added:
  head/devel/msp430-gcc/files/patch-texinfo   (contents, props changed)
  head/devel/msp430-gdb/files/patch-bfd--bfdio.c   (contents, props changed)
  head/devel/msp430-gdb/files/patch-bfd--doc--bfd.texinfo   (contents, props changed)
Modified:
  head/devel/msp430-gcc/Makefile
  head/devel/msp430-gcc/pkg-plist
  head/devel/msp430-gdb/Makefile
  head/devel/msp430-gdb/distinfo

Modified: head/devel/msp430-gcc/Makefile
==============================================================================

--- head/devel/msp430-gcc/Makefile	Fri May 15 15:33:56 2015	(r386417)
+++ head/devel/msp430-gcc/Makefile	Fri May 15 15:38:01 2015	(r386418)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	${GCCVERSION}.${LTSVERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	SOURCEWARE/${PORTNAME}/releases/${PORTNAME}-${GCCVERSION} \
@@ -85,6 +85,7 @@ post-configure:
 	@${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=).+$$,\1,' ${WRKSRC}/Makefile
 
 post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/gcc/${PKGNAMEPREFIX:S/-$//}/${GCCVERSION}/liblto_plugin.so.0.0.0
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin
 .for F in ${BINARIES}
 	@${LN} -f ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}$F \

Added: head/devel/msp430-gcc/files/patch-texinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/msp430-gcc/files/patch-texinfo	Fri May 15 15:38:01 2015	(r386418)
@@ -0,0 +1,110 @@
+diff --git gcc/doc/cppopts.texi.orig gcc/doc/cppopts.texi
+--- gcc/doc/cppopts.texi
++++ gcc/doc/cppopts.texi
+@@ -769,7 +769,7 @@
+ Enable special code to work around file systems which only permit very
+ short file names, such as MS-DOS at .
+ 
+- at itemx --help
++ at item --help
+ @itemx --target-help
+ @opindex help
+ @opindex target-help
+diff --git gcc/doc/generic.texi.orig gcc/doc/generic.texi
+--- gcc/doc/generic.texi
++++ gcc/doc/generic.texi
+@@ -1415,13 +1415,13 @@
+ not matter.  The type of the operands and that of the result are
+ always of @code{BOOLEAN_TYPE} or @code{INTEGER_TYPE}.
+ 
+- at itemx POINTER_PLUS_EXPR
++ at item POINTER_PLUS_EXPR
+ This node represents pointer arithmetic.  The first operand is always
+ a pointer/reference type.  The second operand is always an unsigned
+ integer type compatible with sizetype.  This is the only binary
+ arithmetic operand that can operate on pointer types.
+ 
+- at itemx PLUS_EXPR
++ at item PLUS_EXPR
+ @itemx MINUS_EXPR
+ @itemx MULT_EXPR
+ These nodes represent various binary arithmetic operations.
+diff --git gcc/doc/invoke.texi.orig gcc/doc/invoke.texi
+--- gcc/doc/invoke.texi
++++ gcc/doc/invoke.texi
+@@ -165,7 +165,7 @@
+ -pipe  -pass-exit-codes  @gol
+ -x @var{language}  -v  -###  --help at r{[}=@var{class}@r{[}, at dots{}@r{]]}  --target-help  @gol
+ --version -wrapper @@@var{file} -fplugin=@var{file} -fplugin-arg- at var{name}=@var{arg}  @gol
+--fdump-ada-spec at r{[}-slim at r{]}} -fdump-go-spec=@var{file}
++-fdump-ada-spec at r{[}-slim at r{]} -fdump-go-spec=@var{file}}
+ 
+ @item C Language Options
+ @xref{C Dialect Options,,Options Controlling C Dialect}.
+@@ -5085,11 +5085,11 @@
+ @option{-fdump-rtl-ce3} enable dumping after the three
+ if conversion passes.
+ 
+- at itemx -fdump-rtl-cprop_hardreg
++ at item -fdump-rtl-cprop_hardreg
+ @opindex fdump-rtl-cprop_hardreg
+ Dump after hard register copy propagation.
+ 
+- at itemx -fdump-rtl-csa
++ at item -fdump-rtl-csa
+ @opindex fdump-rtl-csa
+ Dump after combining stack adjustments.
+ 
+@@ -5100,11 +5100,11 @@
+ @option{-fdump-rtl-cse1} and @option{-fdump-rtl-cse2} enable dumping after
+ the two common sub-expression elimination passes.
+ 
+- at itemx -fdump-rtl-dce
++ at item -fdump-rtl-dce
+ @opindex fdump-rtl-dce
+ Dump after the standalone dead code elimination passes.
+ 
+- at itemx -fdump-rtl-dbr
++ at item -fdump-rtl-dbr
+ @opindex fdump-rtl-dbr
+ Dump after delayed branch scheduling.
+ 
+@@ -5149,7 +5149,7 @@
+ @opindex fdump-rtl-initvals
+ Dump after the computation of the initial value sets.
+ 
+- at itemx -fdump-rtl-into_cfglayout
++ at item -fdump-rtl-into_cfglayout
+ @opindex fdump-rtl-into_cfglayout
+ Dump after converting to cfglayout mode.
+ 
+@@ -5179,7 +5179,7 @@
+ @opindex fdump-rtl-rnreg
+ Dump after register renumbering.
+ 
+- at itemx -fdump-rtl-outof_cfglayout
++ at item -fdump-rtl-outof_cfglayout
+ @opindex fdump-rtl-outof_cfglayout
+ Dump after converting from cfglayout mode.
+ 
+@@ -5191,7 +5191,7 @@
+ @opindex fdump-rtl-postreload
+ Dump after post-reload optimizations.
+ 
+- at itemx -fdump-rtl-pro_and_epilogue
++ at item -fdump-rtl-pro_and_epilogue
+ @opindex fdump-rtl-pro_and_epilogue
+ Dump after generating the function pro and epilogues.
+ 
+diff --git gcc/doc/sourcebuild.texi.orig gcc/doc/sourcebuild.texi
+--- gcc/doc/sourcebuild.texi
++++ gcc/doc/sourcebuild.texi
+@@ -676,7 +676,7 @@
+ @code{lang_checks}.
+ 
+ @table @code
+- at itemx all.cross
++ at item all.cross
+ @itemx start.encap
+ @itemx rest.encap
+ FIXME: exactly what goes in each of these targets?

Modified: head/devel/msp430-gcc/pkg-plist
==============================================================================
--- head/devel/msp430-gcc/pkg-plist	Fri May 15 15:33:56 2015	(r386417)
+++ head/devel/msp430-gcc/pkg-plist	Fri May 15 15:38:01 2015	(r386418)
@@ -196,3 +196,5 @@ man/man1/%%GCC_TARG%%-cpp.1.gz
 man/man1/%%GCC_TARG%%-g++.1.gz
 man/man1/%%GCC_TARG%%-gcc.1.gz
 man/man1/%%GCC_TARG%%-gcov.1.gz
+ at dir %%GCC_TARG%%/lib/mcpu-430x/mmpy-16
+ at dir %%GCC_TARG%%/lib/mmpy-16

Modified: head/devel/msp430-gdb/Makefile
==============================================================================
--- head/devel/msp430-gdb/Makefile	Fri May 15 15:33:56 2015	(r386417)
+++ head/devel/msp430-gdb/Makefile	Fri May 15 15:38:01 2015	(r386418)
@@ -3,10 +3,11 @@
 
 PORTNAME=	gdb
 PORTVERSION=	${GDBVERSION}.${PATCHVERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU SF/mspgcc/mspgcc:mspgcc
 PKGNAMEPREFIX=	msp430-
-DISTNAME=	${PORTNAME}-${GDBVERSION}
+DISTNAME=	${PORTNAME}-${GDBVERSION}a
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		mspgcc-${LTSVERSION}${EXTRACT_SUFX}:mspgcc
 
@@ -21,10 +22,13 @@ PATCHVERSION=	20110103
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${GDBVERSION}
 
-USES=		tar:bzip2 gmake
+USES=		tar:bzip2 gmake iconv
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} --disable-werror --disable-nls
+CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
+		--with-libiconv-prefix=${LOCALBASE} \
+		--disable-werror \
+		--disable-nls
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} GDB_TARG=${PKGNAMEPREFIX:S/-$//} \

Modified: head/devel/msp430-gdb/distinfo
==============================================================================
--- head/devel/msp430-gdb/distinfo	Fri May 15 15:33:56 2015	(r386417)
+++ head/devel/msp430-gdb/distinfo	Fri May 15 15:38:01 2015	(r386418)
@@ -1,4 +1,4 @@
-SHA256 (gdb-7.2.tar.bz2) = bf444b88ab845243364c3d410be9e3f43a57f96ff594d65a37842ea03c3410f0
-SIZE (gdb-7.2.tar.bz2) = 18530613
+SHA256 (gdb-7.2a.tar.bz2) = 3c24dde332e33bfe2d5980c726d76224ebf8304278112a07bf701f8d2145d9bc
+SIZE (gdb-7.2a.tar.bz2) = 18943981
 SHA256 (mspgcc-20110716.tar.bz2) = 6e28c2f4976933fc2663751192bc365c68705071908c1c92c03dad2667d74044
 SIZE (mspgcc-20110716.tar.bz2) = 371880

Added: head/devel/msp430-gdb/files/patch-bfd--bfdio.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/msp430-gdb/files/patch-bfd--bfdio.c	Fri May 15 15:38:01 2015	(r386418)
@@ -0,0 +1,25 @@
+diff --git bfd/bfdio.c.orig b/bfd/bfdio.c
+--- bfd/bfdio.c.orig
++++ bfd/bfdio.c
+@@ -1,7 +1,7 @@
+ /* Low-level I/O routines for BFDs.
+ 
+    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
+    Free Software Foundation, Inc.
+ 
+    Written by Cygnus Support.
+@@ -577,7 +577,7 @@ memory_bstat (bfd *abfd, struct stat *statbuf)
+ {
+   struct bfd_in_memory *bim = (struct bfd_in_memory *) abfd->iostream;
+ 
+-  memset (statbuf, 0, sizeof (statbuf));
++  memset (statbuf, 0, sizeof (*statbuf));
+   statbuf->st_size = bim->size;
+ 
+   return 0;
+-- 
+1.7.1
+
+

Added: head/devel/msp430-gdb/files/patch-bfd--doc--bfd.texinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/msp430-gdb/files/patch-bfd--doc--bfd.texinfo	Fri May 15 15:38:01 2015	(r386418)
@@ -0,0 +1,21 @@
+diff --git c/bfd/doc/bfd.texinfo.orig i/bfd/doc/bfd.texinfo
+--- bfd/doc/bfd.texinfo.orig
++++ bfd/doc/bfd.texinfo
+@@ -323,7 +323,7 @@ All of BFD lives in one directory.
+ @printindex cp
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
++% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -334,7 +334,7 @@ All of BFD lives in one directory.
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc at cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+ 
+ @bye
