CVS commit: pkgsrc

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Wed Sep 22 02:35:40 UTC 2021

Modified Files:
        pkgsrc/cross/avr-binutils: Makefile PLIST
        pkgsrc/emulators/simulavr: Makefile

Log Message:
(cross/avr-binutls, emulater/simulvar) Fix libiberty issue


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/cross/avr-binutils/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/cross/avr-binutils/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/emulators/simulavr/Makefile

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-binutils/Makefile
diff -u pkgsrc/cross/avr-binutils/Makefile:1.32 pkgsrc/cross/avr-binutils/Makefile:1.33
--- pkgsrc/cross/avr-binutils/Makefile:1.32     Wed Sep  8 12:02:59 2021
+++ pkgsrc/cross/avr-binutils/Makefile  Wed Sep 22 02:35:40 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2021/09/08 12:02:59 micha Exp $
+# $NetBSD: Makefile,v 1.33 2021/09/22 02:35:40 mef Exp $
 
 DISTNAME=              binutils-2.37
 PKGNAME=               ${DISTNAME:S/^/avr-/}
+PKGREVISION=           1
 CATEGORIES=            cross
 MASTER_SITES=          ${MASTER_SITE_GNU:=binutils/}
 EXTRACT_SUFX=          .tar.bz2
@@ -55,6 +56,10 @@ post-install:
          ${DESTDIR}${PREFIX}/avr/lib;                          \
        ${INSTALL_DATA} bfd.h ${DESTDIR}${PREFIX}/avr/include;  \
        )
+       # emulators/simulavr wants libiberty
+       (cd ${WRKSRC}/libiberty ;                               \
+       ${INSTALL_DATA} libiberty.* ${DESTDIR}${PREFIX}/avr/lib/libiberty       \
+       )
        # emulators/simulavr wants following header files
        (cd ${WRKSRC}/include;                                  \
        for f in ansidecl.h symcat.h; do                        \

Index: pkgsrc/cross/avr-binutils/PLIST
diff -u pkgsrc/cross/avr-binutils/PLIST:1.11 pkgsrc/cross/avr-binutils/PLIST:1.12
--- pkgsrc/cross/avr-binutils/PLIST:1.11        Wed Sep  8 12:02:59 2021
+++ pkgsrc/cross/avr-binutils/PLIST     Wed Sep 22 02:35:40 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2021/09/08 12:02:59 micha Exp $
+@comment $NetBSD: PLIST,v 1.12 2021/09/22 02:35:40 mef Exp $
 avr/bin/ar
 avr/bin/as
 avr/bin/ld
@@ -122,6 +122,8 @@ avr/lib/ldscripts/avrxmega7.xn
 avr/lib/ldscripts/avrxmega7.xr
 avr/lib/ldscripts/avrxmega7.xu
 avr/lib/libbfd.la
+avr/lib/libiberty/libiberty.a
+avr/lib/libiberty/libiberty.texi
 bin/avr-addr2line
 bin/avr-ar
 bin/avr-as

Index: pkgsrc/emulators/simulavr/Makefile
diff -u pkgsrc/emulators/simulavr/Makefile:1.31 pkgsrc/emulators/simulavr/Makefile:1.32
--- pkgsrc/emulators/simulavr/Makefile:1.31     Sun May 31 14:11:42 2020
+++ pkgsrc/emulators/simulavr/Makefile  Wed Sep 22 02:35:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2020/05/31 14:11:42 mef Exp $
+# $NetBSD: Makefile,v 1.32 2021/09/22 02:35:40 mef Exp $
 #
 DISTNAME=              simulavr-1.0.0
 PKGREVISION=           5
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=               avr-libc-[0-9]*:../../c
 CONFIGURE_ARGS+=       --disable-tests
 CONFIGURE_ARGS+=       --enable-python=python${PYVERSSUFFIX}
 CONFIGURE_ARGS+=       --with-bfd=${PREFIX}/avr
-CONFIGURE_ARGS+=       --with-libiberty=${PREFIX}/lib/gcc/avr
+CONFIGURE_ARGS+=       --with-libiberty=${PREFIX}/avr/lib/libiberty
 CONFIGURE_ENV+=                TEX=no
 
 # Following line does not work yet (examples/python directory)