From owner-svn-ports-all@FreeBSD.ORG Sun May 18 19:11:54 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFC68B06; Sun, 18 May 2014 19:11:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BA814236C; Sun, 18 May 2014 19:11:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IJBsCq026118; Sun, 18 May 2014 19:11:54 GMT (envelope-from lev@svn.freebsd.org) Received: (from lev@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4IJBp8n026101; Sun, 18 May 2014 19:11:51 GMT (envelope-from lev@svn.freebsd.org) Message-Id: <201405181911.s4IJBp8n026101@svn.freebsd.org> From: "Lev A. Serebryakov" Date: Sun, 18 May 2014 19:11:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354450 - in head/devel: msp430-binutils msp430-binutils/files msp430-gcc msp430-gdb msp430-gdb/files msp430-libc msp430-libc/files msp430mcu X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 19:11:54 -0000 Author: lev Date: Sun May 18 19:11:51 2014 New Revision: 354450 URL: http://svnweb.freebsd.org/changeset/ports/354450 QAT: https://qat.redports.org/buildarchive/r354450/ Log: STAGEfy msp430 toolchain ports, un-break msp430-gdb with clang. Added: head/devel/msp430-binutils/files/patch-libiberty--strerror.c - copied unchanged from r354448, head/devel/msp430-binutils/files/patch-libiberty::strerror.c head/devel/msp430-binutils/files/patch-libiberty--strsignal.c - copied unchanged from r354426, head/devel/msp430-binutils/files/patch-libiberty::strsignal.c head/devel/msp430-gdb/files/ head/devel/msp430-gdb/files/patch-sim--msp430--interp.c (contents, props changed) head/devel/msp430-libc/files/ head/devel/msp430-libc/files/patch-src--Makefile.in (contents, props changed) Deleted: head/devel/msp430-binutils/files/patch-libiberty::strerror.c head/devel/msp430-binutils/files/patch-libiberty::strsignal.c Modified: head/devel/msp430-binutils/Makefile head/devel/msp430-binutils/pkg-plist head/devel/msp430-gcc/Makefile head/devel/msp430-gcc/pkg-plist head/devel/msp430-gdb/Makefile head/devel/msp430-gdb/pkg-plist head/devel/msp430-libc/Makefile head/devel/msp430-libc/pkg-descr head/devel/msp430-libc/pkg-plist head/devel/msp430mcu/Makefile Modified: head/devel/msp430-binutils/Makefile ============================================================================== --- head/devel/msp430-binutils/Makefile Sun May 18 19:11:05 2014 (r354449) +++ head/devel/msp430-binutils/Makefile Sun May 18 19:11:51 2014 (r354450) @@ -18,8 +18,6 @@ PATCH_SITE_SUBDIR= mspgcc/Patches/LTS/${ PATCHFILES= ${LTS_PATCHES} PATCH_DIST_STRIP= -p1 -WRKSRC= ${WRKDIR}/${PORTNAME}-${BINUTILVERSION:C/[^0-9.]//g} - MAINTAINER= lev@FreeBSD.org COMMENT= GNU binutils for TI's msp430 MCUs cross-development @@ -33,34 +31,23 @@ BUGS_FIXED= # For future use LTS_PATCHES+= ${PKGNAMEPREFIX}${PORTNAME}-${BINUTILVERSION}-${PATCHVERSION}-sf${BUGID}.patch .endfor -USE_BZIP2= yes -USE_GMAKE= yes +USES= tar:bzip2 gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} \ --with-gcc --with-gnu-ld --with-gnu-as \ --disable-nls --disable-werror -MAN1= ${PKGNAMEPREFIX}addr2line.1 ${PKGNAMEPREFIX}ar.1 \ - ${PKGNAMEPREFIX}as.1 ${PKGNAMEPREFIX}c++filt.1 \ - ${PKGNAMEPREFIX}dlltool.1 ${PKGNAMEPREFIX}elfedit.1 \ - ${PKGNAMEPREFIX}gprof.1 ${PKGNAMEPREFIX}ld.1 \ - ${PKGNAMEPREFIX}nlmconv.1 ${PKGNAMEPREFIX}nm.1 \ - ${PKGNAMEPREFIX}objcopy.1 ${PKGNAMEPREFIX}objdump.1 \ - ${PKGNAMEPREFIX}ranlib.1 ${PKGNAMEPREFIX}readelf.1 \ - ${PKGNAMEPREFIX}size.1 ${PKGNAMEPREFIX}strings.1 \ - ${PKGNAMEPREFIX}strip.1 ${PKGNAMEPREFIX}windmc.1 \ - ${PKGNAMEPREFIX}windres.1 - INFO= as bfd binutils configure gprof ld standards INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info PLIST_SUB+= BINUTILS_TARG=${PKGNAMEPREFIX:S/-$//} +WRKSRC= ${WRKDIR}/${PORTNAME}-${BINUTILVERSION:C/[^0-9.]//g} + BINARIES= addr2line ar as c++filt elfedit gprof ld nm objcopy objdump \ ranlib readelf size strings strip -NO_STAGE= yes pre-patch: @cd ${WRKSRC} && ${PATCH} -s -p1 < ../mspgcc-${LTSVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${BINUTILVERSION}-${PATCHVERSION}.patch @@ -69,12 +56,12 @@ pre-configure: post-install: .for F in ${BINARIES} - @${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \ - ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F + @${LN} -f ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}$F \ + ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F .endfor -add-plist-post: - @${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2> /dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST} +#add-plist-post: +# @${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2> /dev/null || true" >> ${TMPPLIST} +# @${ECHO_CMD} "@unexec rmdir %D/${PKGNAMEPREFIX:S/-$//} 2> /dev/null || true" >> ${TMPPLIST} .include Copied: head/devel/msp430-binutils/files/patch-libiberty--strerror.c (from r354448, head/devel/msp430-binutils/files/patch-libiberty::strerror.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/msp430-binutils/files/patch-libiberty--strerror.c Sun May 18 19:11:51 2014 (r354450, copy of r354448, head/devel/msp430-binutils/files/patch-libiberty::strerror.c) @@ -0,0 +1,11 @@ +--- libiberty/strerror.c.orig Sun Feb 23 15:59:29 2003 ++++ libiberty/strerror.c Sun Feb 23 15:59:53 2003 +@@ -465,7 +465,7 @@ + + #else + +-extern int sys_nerr; ++extern __const int sys_nerr; + extern char *sys_errlist[]; + + #endif Copied: head/devel/msp430-binutils/files/patch-libiberty--strsignal.c (from r354426, head/devel/msp430-binutils/files/patch-libiberty::strsignal.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/msp430-binutils/files/patch-libiberty--strsignal.c Sun May 18 19:11:51 2014 (r354450, copy of r354426, head/devel/msp430-binutils/files/patch-libiberty::strsignal.c) @@ -0,0 +1,11 @@ +--- libiberty/strsignal.c.orig Sun Feb 23 16:01:05 2003 ++++ libiberty/strsignal.c Sun Feb 23 16:01:16 2003 +@@ -247,7 +247,7 @@ + #else + + #ifdef NSIG +-static int sys_nsig = NSIG; ++static __const int sys_nsig = NSIG; + #else + #ifdef _NSIG + static int sys_nsig = _NSIG; Modified: head/devel/msp430-binutils/pkg-plist ============================================================================== --- head/devel/msp430-binutils/pkg-plist Sun May 18 19:11:05 2014 (r354449) +++ head/devel/msp430-binutils/pkg-plist Sun May 18 19:11:51 2014 (r354450) @@ -14,6 +14,25 @@ bin/%%BINUTILS_TARG%%-readelf bin/%%BINUTILS_TARG%%-size bin/%%BINUTILS_TARG%%-strings bin/%%BINUTILS_TARG%%-strip +man/man1/%%BINUTILS_TARG%%-addr2line.1.gz +man/man1/%%BINUTILS_TARG%%-ar.1.gz +man/man1/%%BINUTILS_TARG%%-as.1.gz +man/man1/%%BINUTILS_TARG%%-c++filt.1.gz +man/man1/%%BINUTILS_TARG%%-dlltool.1.gz +man/man1/%%BINUTILS_TARG%%-elfedit.1.gz +man/man1/%%BINUTILS_TARG%%-gprof.1.gz +man/man1/%%BINUTILS_TARG%%-ld.1.gz +man/man1/%%BINUTILS_TARG%%-nlmconv.1.gz +man/man1/%%BINUTILS_TARG%%-nm.1.gz +man/man1/%%BINUTILS_TARG%%-objcopy.1.gz +man/man1/%%BINUTILS_TARG%%-objdump.1.gz +man/man1/%%BINUTILS_TARG%%-ranlib.1.gz +man/man1/%%BINUTILS_TARG%%-readelf.1.gz +man/man1/%%BINUTILS_TARG%%-size.1.gz +man/man1/%%BINUTILS_TARG%%-strings.1.gz +man/man1/%%BINUTILS_TARG%%-strip.1.gz +man/man1/%%BINUTILS_TARG%%-windmc.1.gz +man/man1/%%BINUTILS_TARG%%-windres.1.gz %%BINUTILS_TARG%%/bin/addr2line %%BINUTILS_TARG%%/bin/ar %%BINUTILS_TARG%%/bin/as @@ -38,3 +57,5 @@ bin/%%BINUTILS_TARG%%-strip @dirrm %%BINUTILS_TARG%%/bin @dirrm %%BINUTILS_TARG%%/lib/ldscripts @dirrm %%BINUTILS_TARG%%/lib +@dirrmtry %%BINUTILS_TARG%%/info +@dirrmtry %%BINUTILS_TARG%% Modified: head/devel/msp430-gcc/Makefile ============================================================================== --- head/devel/msp430-gcc/Makefile Sun May 18 19:11:05 2014 (r354449) +++ head/devel/msp430-gcc/Makefile Sun May 18 19:11:51 2014 (r354450) @@ -60,8 +60,6 @@ CONFIGURE_ARGS+=--target=${PKGNAMEPREFIX --with-pkgversion="MSPGCC_${LTSVERSION}" INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info MAKE_ENV= PATH=${PREFIX}/bin:${PATH} -MAN1= ${PKGNAMEPREFIX}gcc.1 ${PKGNAMEPREFIX}g++.1 \ - ${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1 PLIST_SUB+= PORTVERSION=${PORTVERSION} GCC_TARG=${PKGNAMEPREFIX:S/-$//} \ GCC_REV=${GCCVERSION} @@ -71,7 +69,6 @@ INFO_PATH= ${PKGNAMEPREFIX:S/-$//}/info BINARIES= gcc gcc-${GCCVERSION} c++ g++ gcov cpp -NO_STAGE= yes .include .if ${ARCH} == "amd64" @@ -91,9 +88,10 @@ post-configure: @${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=).+$$,\1,' ${WRKSRC}/Makefile post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin .for F in ${BINARIES} - @${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \ - ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F + @${LN} -f ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}$F \ + ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F .endfor .include Modified: head/devel/msp430-gcc/pkg-plist ============================================================================== --- head/devel/msp430-gcc/pkg-plist Sun May 18 19:11:05 2014 (r354449) +++ head/devel/msp430-gcc/pkg-plist Sun May 18 19:11:51 2014 (r354450) @@ -192,6 +192,10 @@ libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/ins libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/fixinc.sh libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/fixincl libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkinstalldirs +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 @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/include-fixed @dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/include @@ -212,8 +216,6 @@ libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/ins @dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%% @dirrmtry libexec/gcc/%%GCC_TARG%% @dirrmtry libexec/gcc -@dirrmtry %%GCC_TARG%%/bin -@dirrmtry %%GCC_TARG%%/info @dirrmtry %%GCC_TARG%%/lib/mcpu-430x/mmpy-16 @dirrmtry %%GCC_TARG%%/lib/mcpu-430x @dirrmtry %%GCC_TARG%%/lib/mmpy-16 Modified: head/devel/msp430-gdb/Makefile ============================================================================== --- head/devel/msp430-gdb/Makefile Sun May 18 19:11:05 2014 (r354449) +++ head/devel/msp430-gdb/Makefile Sun May 18 19:11:51 2014 (r354450) @@ -23,12 +23,11 @@ PATCHVERSION= 20110103 WRKSRC= ${WRKDIR}/${PORTNAME}-${GDBVERSION} -USE_BZIP2= yes -USE_GMAKE= yes +USES= tar:bzip2 gmake + GNU_CONFIGURE= yes CONFIGURE_ARGS= --target=${PKGNAMEPREFIX:S/-$//} --disable-werror --disable-nls MAKE_ENV= PATH=${PREFIX}/bin:${PATH} -MAN1= ${PKGNAMEPREFIX}gdb.1 ${PKGNAMEPREFIX}run.1 PLIST_SUB+= PORTVERSION=${PORTVERSION} GDB_TARG=${PKGNAMEPREFIX:S/-$//} \ GDB_REV=${GDBVERSION} @@ -36,22 +35,21 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} G BINARIES= gdb:gdb run:sim/msp430 MANPAGES= gdb.1:gdb run.1:sim/common -NO_STAGE= yes .include pre-patch: @cd ${WRKSRC} && ${PATCH} -s -p1 < ../mspgcc-${LTSVERSION}/${PKGNAMEPREFIX}${PORTNAME}-${GDBVERSION}-${PATCHVERSION}.patch do-install: - @${MKDIR} ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin + @${MKDIR} ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin .for F in ${BINARIES} - ${INSTALL_PROGRAM} ${WRKSRC}/${F:C/^.+://}/${F:C/:.+$//} ${PREFIX}/bin/${PKGNAMEPREFIX}${F:C/:.+$//} - @${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}${F:C/:.+$//} \ - ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/${F:C/:.+$//} + ${INSTALL_PROGRAM} ${WRKSRC}/${F:C/^.+://}/${F:C/:.+$//} ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${F:C/:.+$//} + @${LN} -f ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${F:C/:.+$//} \ + ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/${F:C/:.+$//} .endfor .for F in ${MANPAGES} - ${INSTALL_MAN} ${WRKSRC}/${F:C/^.+://}/${F:C/:.+$//} ${PREFIX}/man/man${F:C/^.+\.([0-9]).+$/\1/}/${PKGNAMEPREFIX}${F:C/:.+$//} + ${INSTALL_MAN} ${WRKSRC}/${F:C/^.+://}/${F:C/:.+$//} ${STAGEDIR}${PREFIX}/man/man${F:C/^.+\.([0-9]).+$/\1/}/${PKGNAMEPREFIX}${F:C/:.+$//} .endfor - ${INSTALL_DATA} ${WRKSRC}/sim/msp430/libsim.a ${PREFIX}/lib/libmsp430-sim.a + ${INSTALL_DATA} ${WRKSRC}/sim/msp430/libsim.a ${STAGEDIR}${PREFIX}/lib/libmsp430-sim.a .include Added: head/devel/msp430-gdb/files/patch-sim--msp430--interp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/msp430-gdb/files/patch-sim--msp430--interp.c Sun May 18 19:11:51 2014 (r354450) @@ -0,0 +1,24 @@ +--- sim/msp430/interp.c.orig 2014-05-18 22:55:26.000000000 +0400 ++++ sim/msp430/interp.c 2014-05-18 22:58:22.000000000 +0400 +@@ -1880,18 +1880,18 @@ + storage_needed = bfd_get_symtab_upper_bound (abfd); + + if (storage_needed < 0) +- return; ++ return 0; + + if (storage_needed == 0) + { +- return; ++ return 0; + } + + symbol_table = (asymbol **) xmalloc (storage_needed); + number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); + + if (number_of_symbols < 0) +- return; ++ return 0; + + for (i = 0; i < number_of_symbols; i++) + { Modified: head/devel/msp430-gdb/pkg-plist ============================================================================== --- head/devel/msp430-gdb/pkg-plist Sun May 18 19:11:05 2014 (r354449) +++ head/devel/msp430-gdb/pkg-plist Sun May 18 19:11:51 2014 (r354450) @@ -3,5 +3,7 @@ bin/%%GDB_TARG%%-run %%GDB_TARG%%/bin/gdb %%GDB_TARG%%/bin/run lib/lib%%GDB_TARG%%-sim.a +man/man1/%%GDB_TARG%%-gdb.1.gz +man/man1/%%GDB_TARG%%-run.1.gz @dirrmtry %%GDB_TARG%%/bin @dirrmtry %%GDB_TARG%% Modified: head/devel/msp430-libc/Makefile ============================================================================== --- head/devel/msp430-libc/Makefile Sun May 18 19:11:05 2014 (r354449) +++ head/devel/msp430-libc/Makefile Sun May 18 19:11:51 2014 (r354450) @@ -3,11 +3,10 @@ PORTNAME= libc PORTVERSION= 1.0.${LIBCVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= SF/mspgcc/${PKGNAMEPREFIX}${PORTNAME} PKGNAMEPREFIX= ${LIBCTARGET}- -PKGNAMESUFFIX= -gcc${NEEDGCCVERSION} DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${LIBCVERSION} PATCH_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -18,19 +17,15 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= lev@FreeBSD.org COMMENT= Libc for TI's msp430 MCUs cross-development +LICENSE= BSD2CLAUSE BSD3CLAUSE BSD4CLAUSE +LICENSE_COMB= multi + BUILD_DEPENDS= ${LOCALBASE}/${LIBCTARGET}/include/${LIBCTARGET}.h:${PORTSDIR}/devel/${LIBCTARGET}mcu \ - ${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc${PORTGCCVERSION} + ${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc RUN_DEPENDS= ${LOCALBASE}/${LIBCTARGET}/include/${LIBCTARGET}.h:${PORTSDIR}/devel/${LIBCTARGET}mcu \ - ${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc${PORTGCCVERSION} - -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-gcc${OTHERGCCVERSION}-[0-9]* + ${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc -OPTIONS_SINGLE= SG1 -OPTIONS_SINGLE_SG1= GCC4 GCC3 -GCC4_DESC= Use new msp430-gcc4 compiler -GCC3_DESC= Use old msp430-gcc3 compiler - -OPTIONS_DEFAULT= GCC4 +CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-gcc3-[0-9]* LIBCTARGET= msp430 LIBCVERSION= 20120224 @@ -38,36 +33,14 @@ LTSVERSION= 20120406 BUGS_FIXED= 3522752 LTS_PATCHES!= for bugid in ${BUGS_FIXED} ; do echo ${PKGNAMEPREFIX}${PORTNAME}-${LIBCVERSION}-sf$${bugid}.patch ; done -USE_BZIP2= yes -USE_GMAKE= yes -MAKE_ENV= PATH=${PREFIX}/bin:${PATH} PREFIX=${PREFIX} -WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}libc-${LIBCVERSION}/src -PATCH_WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}libc-${LIBCVERSION} +USES= tar:bzip2 gmake -NO_STAGE= yes -.include +HAS_CONFIGURE= yes +CONFIGURE_WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}libc-${LIBCVERSION} +CONFIGURE_ARGS= --prefix=${STAGEDIR}${PREFIX} -.if ${PORT_OPTIONS:MGCC4} -BUILD_DEPENDS+= ${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc -PLIST_SUB+= GCC3="@comment " GCC4="" -NEEDGCCVERSION= 4 -PORTGCCVERSION= -OTHEGCCVERSION= 3 -.elif ${PORT_OPTIONS:MGCC3} -PLIST_SUB+= GCC3="" GCC4="@comment " -NEEDGCCVERSION= 3 -PORTGCCVERSION= ${NEEDGCCVERSION} -OTHEGCCVERSION= 4 -.endif - -pre-configure: - @HAVEGCCVERSION=`${PKGNAMEPREFIX}gcc -v 2>&1 | ${GREP} "gcc version " | ${CUT} -d" " -f 3 | ${CUT} -d. -f 1` ; \ - if [ "$${HAVEGCCVERSION}" = "" ] ; then \ - ${ECHO_MSG} "ERROR: Can not find any version of msp430-gcc" ; \ - ${FALSE} ; \ - elif [ "$${HAVEGCCVERSION}" != "${NEEDGCCVERSION}" ] ; then \ - ${ECHO_MSG} "ERROR: Need msp430-gcc-${NEEDGCCVERSION} but found msp430-gcc-$${HAVEGCCVERSION}" ; \ - ${FALSE} ; \ - fi +MAKE_ENV+= PATH=${PREFIX}/bin:${PATH} +WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}libc-${LIBCVERSION}/src +PATCH_WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}libc-${LIBCVERSION} .include Added: head/devel/msp430-libc/files/patch-src--Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/msp430-libc/files/patch-src--Makefile.in Sun May 18 19:11:51 2014 (r354450) @@ -0,0 +1,12 @@ +--- src/Makefile.in.orig 2012-02-24 14:45:27.000000000 +0400 ++++ src/Makefile.in 2014-05-18 22:49:46.000000000 +0400 +@@ -4,9 +4,7 @@ + VERSION = @MSP430LIBC_VERSION@ + + # installation prefix (set this if you don't install by hand) +-ifndef PREFIX + PREFIX = @MSP430LIBC_PREFIX@ +-endif + + # name of target architecture (used for conform naming) + Modified: head/devel/msp430-libc/pkg-descr ============================================================================== --- head/devel/msp430-libc/pkg-descr Sun May 18 19:11:05 2014 (r354449) +++ head/devel/msp430-libc/pkg-descr Sun May 18 19:11:51 2014 (r354450) @@ -1,6 +1,6 @@ libc for TI's msp430 MCUs cross-development - This port installs msp530mcu and msp430libc. + This port installs msp430libc. GCC site: http://gcc.gnu.org/ MSP430 site: http://www.ti.com/msp430/ Modified: head/devel/msp430-libc/pkg-plist ============================================================================== --- head/devel/msp430-libc/pkg-plist Sun May 18 19:11:05 2014 (r354449) +++ head/devel/msp430-libc/pkg-plist Sun May 18 19:11:51 2014 (r354450) @@ -29,25 +29,14 @@ msp430/include/sys/types.h msp430/lib/libc.a msp430/lib/libfp.a msp430/lib/libm.a -%%GCC3%%msp430/lib/msp1/libc.a -%%GCC3%%msp430/lib/msp1/libfp.a -%%GCC3%%msp430/lib/msp1/libm.a -%%GCC3%%msp430/lib/msp2/libc.a -%%GCC3%%msp430/lib/msp2/libfp.a -%%GCC3%%msp430/lib/msp2/libm.a -%%GCC4%%msp430/lib/mcpu-430x/libc.a -%%GCC4%%msp430/lib/mcpu-430x/libfp.a -%%GCC4%%msp430/lib/mcpu-430x/libm.a -%%GCC4%%msp430/lib/mcpu-430x/mmpy-16/libc.a -%%GCC4%%msp430/lib/mcpu-430x/mmpy-16/libfp.a -%%GCC4%%msp430/lib/mcpu-430x/mmpy-16/libm.a -%%GCC4%%msp430/lib/mmpy-16/libc.a -%%GCC4%%msp430/lib/mmpy-16/libfp.a -%%GCC4%%msp430/lib/mmpy-16/libm.a +msp430/lib/mcpu-430x/libc.a +msp430/lib/mcpu-430x/libfp.a +msp430/lib/mcpu-430x/libm.a +msp430/lib/mcpu-430x/mmpy-16/libc.a +msp430/lib/mcpu-430x/mmpy-16/libfp.a +msp430/lib/mcpu-430x/mmpy-16/libm.a +msp430/lib/mmpy-16/libc.a +msp430/lib/mmpy-16/libfp.a +msp430/lib/mmpy-16/libm.a @dirrm msp430/include/bits @dirrm msp430/include/sys -%%GCC3%%@dirrm msp430/lib/msp1 -%%GCC3%%@dirrm msp430/lib/msp2 -%%GCC4%%@dirrm msp430/lib/mcpu-430x/mmpy-16 -%%GCC4%%@dirrm msp430/lib/mcpu-430x -%%GCC4%%@dirrm msp430/lib/mmpy-16 Modified: head/devel/msp430mcu/Makefile ============================================================================== --- head/devel/msp430mcu/Makefile Sun May 18 19:11:05 2014 (r354449) +++ head/devel/msp430mcu/Makefile Sun May 18 19:11:51 2014 (r354450) @@ -16,6 +16,8 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= lev@FreeBSD.org COMMENT= Header files for TI's msp430 MCUs cross-development +LICENSE= BSD3CLAUSE + LTSVERSION= 20120406 MCUVERSION= 20120406 MCUTARGET= msp430