pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
avr-gcc: Restore buildlink3.mk, do not install some files
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Wed Aug 18 15:43:23 2021 +0200
Changeset: 23cb2484eb04978bcded76073103e666b2b2088a
Modified Files:
avr-gcc/Makefile
avr-gcc/PLIST
Added Files:
avr-gcc/buildlink3.mk
Log Message:
avr-gcc: Restore buildlink3.mk, do not install some files
Any file that is directly installed into $PREFIX may collide with
other GCC packages.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=23cb2484eb04978bcded76073103e666b2b2088a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
avr-gcc/Makefile | 9 +++++++--
avr-gcc/PLIST | 9 +--------
avr-gcc/buildlink3.mk | 12 ++++++++++++
3 files changed, 20 insertions(+), 10 deletions(-)
diffs:
diff --git a/avr-gcc/Makefile b/avr-gcc/Makefile
index 0e1146cc8b..de43cfcf8e 100644
--- a/avr-gcc/Makefile
+++ b/avr-gcc/Makefile
@@ -14,9 +14,8 @@ DEPENDS+= avr-binutils-[0-9]*:../../cross/avr-binutils
.include "../../mk/bsd.prefs.mk"
-#MAKE_JOBS_SAFE= no
-
USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
USE_TOOLS+= bash gmake gsed:run gtar
GNU_CONFIGURE= yes
GNU_CONFIGURE_STRICT= no
@@ -58,6 +57,12 @@ post-extract:
pre-configure:
${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
+# Remove libcc1 and some manual pages from generic locations
+# All files of this package should not overlap with other GCC packages
+post-install:
+ ${RM} -f ${DESTDIR}${PREFIX}/lib/libcc1.a
+ ${RM} -rf ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7
+
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/avr-gcc/PLIST b/avr-gcc/PLIST
index 9300da27cc..18478aa43f 100644
--- a/avr-gcc/PLIST
+++ b/avr-gcc/PLIST
@@ -1,7 +1,7 @@
@comment $NetBSD$
bin/avr-cpp
bin/avr-gcc
-bin/${PKGNAME}
+bin/avr-gcc-${PKGVERSION}
bin/avr-gcc-ar
bin/avr-gcc-nm
bin/avr-gcc-ranlib
@@ -878,7 +878,6 @@ lib/gcc/avr/${PKGVERSION}/tiny-stack/libgcc.a
lib/gcc/avr/${PKGVERSION}/tiny-stack/libgcov.a
lib/gcc/avr/${PKGVERSION}/tiny-stack/long-double32/libgcc.a
lib/gcc/avr/${PKGVERSION}/tiny-stack/long-double32/libgcov.a
-lib/libcc1.la
libexec/gcc/avr/${PKGVERSION}/cc1
libexec/gcc/avr/${PKGVERSION}/collect2
libexec/gcc/avr/${PKGVERSION}/install-tools/fixinc.sh
@@ -892,9 +891,3 @@ man/man1/avr-gcc.1
man/man1/avr-gcov-dump.1
man/man1/avr-gcov-tool.1
man/man1/avr-gcov.1
-man/man7/fsf-funding.7
-man/man7/gfdl.7
-man/man7/gpl.7
-@pkgdir share/info
-@pkgdir include
-@pkgdir avr/bin
diff --git a/avr-gcc/buildlink3.mk b/avr-gcc/buildlink3.mk
new file mode 100644
index 0000000000..fe2d540908
--- /dev/null
+++ b/avr-gcc/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD$
+
+BUILDLINK_TREE+= avr-gcc
+
+.if !defined(AVR_GCC_BUILDLINK3_MK)
+AVR_GCC_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.avr-gcc+= avr-gcc>=10.3.0
+BUILDLINK_PKGSRCDIR.avr-gcc?= ../../wip/avr-gcc
+.endif # AVR_GCC_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -avr-gcc
Home |
Main Index |
Thread Index |
Old Index