summaryrefslogtreecommitdiff
path: root/cross/avr-gcc
diff options
context:
space:
mode:
authormicha <micha@pkgsrc.org>2021-09-15 12:20:14 +0000
committermicha <micha@pkgsrc.org>2021-09-15 12:20:14 +0000
commit118b481469c986a68a40b8413bdb7b6a6c2070b5 (patch)
tree235b5602ae4baf10251bbecc9780071a81cb4c49 /cross/avr-gcc
parent3f88b0c5b4044bdeace2f943b40a6810b51d0d0a (diff)
downloadpkgsrc-118b481469c986a68a40b8413bdb7b6a6c2070b5.tar.gz
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.
Diffstat (limited to 'cross/avr-gcc')
-rw-r--r--cross/avr-gcc/DESCR2
-rw-r--r--cross/avr-gcc/Makefile7
-rw-r--r--cross/avr-gcc/PLIST4
3 files changed, 6 insertions, 7 deletions
diff --git a/cross/avr-gcc/DESCR b/cross/avr-gcc/DESCR
index 1be38e54139..03edac1f8bf 100644
--- a/cross/avr-gcc/DESCR
+++ b/cross/avr-gcc/DESCR
@@ -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.
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index 6a3259201fa..a6cd4a7edcc 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -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
diff --git a/cross/avr-gcc/PLIST b/cross/avr-gcc/PLIST
index 4a0d506e307..4e066669076 100644
--- a/cross/avr-gcc/PLIST
+++ b/cross/avr-gcc/PLIST
@@ -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/wide-int-print.h
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