CVS commit: pkgsrc/cross/avr-gcc

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Wed Sep 15 12:20:15 UTC 2021

Modified Files:
        pkgsrc/cross/avr-gcc: DESCR Makefile PLIST

Log Message:
cross/avr-gcc: Update to 10.3.0nb1

Deleting the unwanted libcc1 after installation failed on some OS (because
they use non-standard paths for the library directory). The configure option
"--disable-libcc1" is now used instead.
Bump PKGREVISION because this change removes 2 plugins from the PLIST too.

Mention the C++ compiler in DESCR again.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/cross/avr-gcc/DESCR
cvs rdiff -u -r1.47 -r1.48 pkgsrc/cross/avr-gcc/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/cross/avr-gcc/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cross/avr-gcc/DESCR
diff -u pkgsrc/cross/avr-gcc/DESCR:1.3 pkgsrc/cross/avr-gcc/DESCR:1.4
--- pkgsrc/cross/avr-gcc/DESCR:1.3      Wed Sep  8 12:07:06 2021
+++ pkgsrc/cross/avr-gcc/DESCR  Wed Sep 15 12:20:15 2021
@@ -1,4 +1,4 @@
 GCC configured as cross-compiler for Atmel AVR 8-bit RISC
 microcontrollers.
 
-This package includes a C compiler.
+This package includes C and C++ compilers.

Index: pkgsrc/cross/avr-gcc/Makefile
diff -u pkgsrc/cross/avr-gcc/Makefile:1.47 pkgsrc/cross/avr-gcc/Makefile:1.48
--- pkgsrc/cross/avr-gcc/Makefile:1.47  Wed Sep  8 12:07:06 2021
+++ pkgsrc/cross/avr-gcc/Makefile       Wed Sep 15 12:20:15 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2021/09/08 12:07:06 micha Exp $
+# $NetBSD: Makefile,v 1.48 2021/09/15 12:20:15 micha Exp $
 
 DISTNAME=              gcc-10.3.0
+PKGREVISION=           1
 PKGNAME=               ${DISTNAME:C/^/avr-/}
 CATEGORIES=            cross
 MASTER_SITES=          ${MASTER_SITE_GNU:=gcc/${DISTNAME}/}
@@ -32,6 +33,7 @@ CONFIG_SHELL=         ${TOOLS_PATH.bash}
 
 CONFIGURE_ARGS+=       --enable-languages='c c++'
 CONFIGURE_ARGS+=       --enable-multilib
+CONFIGURE_ARGS+=       --disable-libcc1
 CONFIGURE_ARGS+=       --disable-libquadmath-support
 CONFIGURE_ARGS+=       --disable-lto
 CONFIGURE_ARGS+=       --disable-nls
@@ -58,10 +60,9 @@ INSTALLATION_DIRS+=  avr/bin
 pre-configure:
        ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
 
-# Remove libcc1 and some manual pages from generic locations
+# Remove some manual pages from generic locations
 # File paths from this package should not overlap with other GCC packages
 post-install:
-       ${RM} -f ${DESTDIR}${PREFIX}/lib/libcc1.*
        ${RM} -rf ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
 
 BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.3

Index: pkgsrc/cross/avr-gcc/PLIST
diff -u pkgsrc/cross/avr-gcc/PLIST:1.7 pkgsrc/cross/avr-gcc/PLIST:1.8
--- pkgsrc/cross/avr-gcc/PLIST:1.7      Wed Sep  8 12:07:06 2021
+++ pkgsrc/cross/avr-gcc/PLIST  Wed Sep 15 12:20:15 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2021/09/08 12:07:06 micha Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/09/15 12:20:15 micha Exp $
 bin/avr-c++
 bin/avr-cpp
 bin/avr-g++
@@ -877,8 +877,6 @@ lib/gcc/avr/${PKGVERSION}/plugin/include
 lib/gcc/avr/${PKGVERSION}/plugin/include/wide-int.h
 lib/gcc/avr/${PKGVERSION}/plugin/include/xcoff.h
 lib/gcc/avr/${PKGVERSION}/plugin/include/xcoffout.h
-lib/gcc/avr/${PKGVERSION}/plugin/libcc1plugin.la
-lib/gcc/avr/${PKGVERSION}/plugin/libcp1plugin.la
 lib/gcc/avr/${PKGVERSION}/tiny-stack/double64/libgcc.a
 lib/gcc/avr/${PKGVERSION}/tiny-stack/double64/libgcov.a
 lib/gcc/avr/${PKGVERSION}/tiny-stack/libgcc.a