[pkgsrc/trunk]: pkgsrc/cross/bfd-mdsetimage Make this build with the version ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d267a49daef
branches:  trunk
changeset: 480427:7d267a49daef
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Sep 09 01:33:10 2004 +0000

description:
Make this build with the version of binutils currently in cross-binutils.
No idea if this works, since I don't know how to use this, but the diff
looks sane enough to me.

diffstat:

 cross/bfd-mdsetimage/Makefile           |   4 ++--
 cross/bfd-mdsetimage/files/mdsetimage.c |  12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (66 lines):

diff -r fc8691702ee2 -r 7d267a49daef cross/bfd-mdsetimage/Makefile
--- a/cross/bfd-mdsetimage/Makefile     Wed Sep 08 22:20:17 2004 +0000
+++ b/cross/bfd-mdsetimage/Makefile     Thu Sep 09 01:33:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/08/27 06:29:07 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2004/09/09 01:33:10 wiz Exp $
 
 DISTNAME=      bfd-mdsetimage-1.15.1
 CATEGORIES=    cross
@@ -22,7 +22,7 @@
                LIBS="${BFD_LIBS}"
 
 FIX_RPATH+=    BFD_LIBS
-BFD_LIBS=      -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lbfd-${BFD_VERSION} -liberty
+BFD_LIBS=      -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lbfd -liberty -lintl
 
 do-extract:
        @${MKDIR} ${WRKSRC}
diff -r fc8691702ee2 -r 7d267a49daef cross/bfd-mdsetimage/files/mdsetimage.c
--- a/cross/bfd-mdsetimage/files/mdsetimage.c   Wed Sep 08 22:20:17 2004 +0000
+++ b/cross/bfd-mdsetimage/files/mdsetimage.c   Thu Sep 09 01:33:10 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mdsetimage.c,v 1.3 2001/10/01 23:39:25 cgd Exp $ */
+/* $NetBSD: mdsetimage.c,v 1.4 2004/09/09 01:33:10 wiz Exp $ */
 /* from: NetBSD: mdsetimage.c,v 1.15 2001/03/21 23:46:48 cgd Exp $ */
 
 /*
@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #ifndef lint
-__RCSID("$NetBSD: mdsetimage.c,v 1.3 2001/10/01 23:39:25 cgd Exp $");
+__RCSID("$NetBSD: mdsetimage.c,v 1.4 2004/09/09 01:33:10 wiz Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -59,9 +59,9 @@
        size_t offset;
 } md_root_symbols[] = {
 #define        X_MD_ROOT_IMAGE 0
-       { "_md_root_image", NULL, 0 },
+       { "_md_root_image", 0, 0 },
 #define        X_MD_ROOT_SIZE  1
-       { "_md_root_size", NULL, 0 },
+       { "_md_root_size", 0, 0 },
        { NULL }
 };
 
@@ -206,7 +206,7 @@
        long number_of_symbols;
        asymbol **symbol_table = NULL;
        struct symbols *s;
-       struct sec *p;
+       struct bfd_section *p;
 
        storage_needed = bfd_get_symtab_upper_bound(abfd);
        if (storage_needed <= 0)
@@ -239,7 +239,7 @@
        free(symbol_table);
 
        for (s = symbols; s->name != NULL; s++) {
-               if (s->vma == NULL)
+               if (s->vma == 0)
                        return (1);
 
                for (p = abfd->sections; p != NULL; p = p->next) {