pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/cross Adjust after update of cross/binutils, and bump ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ed9f0c9a9fde
branches: trunk
changeset: 477819:ed9f0c9a9fde
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Fri Jul 09 20:48:15 2004 +0000
description:
Adjust after update of cross/binutils, and bump PKGREVISION
for the packages depending on it.
diffstat:
cross/COMMON/cross.mk | 12 +-
cross/COMMON/patches-binutils/patch-aa | 20 +-
cross/COMMON/patches-binutils/patch-ab | 41 --
cross/COMMON/patches-binutils/patch-arrays | 22 -
cross/COMMON/patches-binutils/patch-mips | 45 --
cross/COMMON/patches-binutils/patch-sh | 451 -----------------------------
cross/COMMON/patches-binutils/patch-si | 11 -
cross/i386-cygwin32/Makefile | 3 +-
cross/i386-cygwin32/distinfo | 6 +-
cross/i386-linux/Makefile | 3 +-
cross/i386-linux/distinfo | 6 +-
cross/i386-linuxglibc1/Makefile | 3 +-
cross/i386-linuxglibc1/distinfo | 6 +-
cross/i386-msdosdjgpp/Makefile | 3 +-
cross/i386-msdosdjgpp/distinfo | 6 +-
15 files changed, 35 insertions(+), 603 deletions(-)
diffs (truncated from 792 to 300 lines):
diff -r 58b5b0eddfc8 -r ed9f0c9a9fde cross/COMMON/cross.mk
--- a/cross/COMMON/cross.mk Fri Jul 09 20:44:53 2004 +0000
+++ b/cross/COMMON/cross.mk Fri Jul 09 20:48:15 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: cross.mk,v 1.28 2004/07/06 22:51:34 wiz Exp $
+# $NetBSD: cross.mk,v 1.29 2004/07/09 20:48:15 kristerw Exp $
# Shared definitions for building a cross-compile environment.
@@ -27,7 +27,7 @@
${INSTALL_DATA_DIR} ${TARGET_DIR}/lib
.if defined(USE_CROSS_BINUTILS)
-BINUTILS_DISTNAME= binutils-2.9.1
+BINUTILS_DISTNAME= binutils-2.15
BINUTILS_WRKSRC= ${WRKDIR}/${BINUTILS_DISTNAME}
# Don't use optimizations taken from /etc/mk.conf for the native compiler
@@ -37,7 +37,7 @@
CROSS_DISTFILES+= ${BINUTILS_DISTNAME}.tar.gz
MASTER_SITES+= ${MASTER_SITE_GNU:=binutils/}
CONFIGURE_ARGS+= --with-gnu-as --with-gnu-ld
-DEPENDS+= cross-binutils>=2.9.1.1:../../cross/binutils
+DEPENDS+= cross-binutils>=2.15.0.0:../../cross/binutils
PLIST_PRE+= ${COMMON_DIR}/PLIST-binutils
AS_FOR_TARGET= ${BINUTILS_WRKSRC}/gas/as-new
@@ -63,12 +63,18 @@
CFLAGS="${CFLAGS}" ${CONFIGURE_ENV} ./configure \
--prefix=${PREFIX} --host=${MACHINE_GNU_ARCH}--netbsd \
--target=${TARGET_ARCH} ${BFD64ARG}
+ cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-bfd
+ cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-libiberty
+ cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-intl
+ cd ${BINUTILS_WRKSRC} && ${MAKE_PROGRAM} configure-gas
binutils-build:
@cd ${BINUTILS_WRKSRC}/bfd && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} bfd.h
@cd ${BINUTILS_WRKSRC}/libiberty && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} all
+ @cd ${BINUTILS_WRKSRC}/intl && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} ${MAKE_FLAGS} all
@cd ${BINUTILS_WRKSRC}/gas && ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} as-new
${TEST} -x ${WRKDIR}/ar || ${LINK.c} -o ${WRKDIR}/ar \
diff -r 58b5b0eddfc8 -r ed9f0c9a9fde cross/COMMON/patches-binutils/patch-aa
--- a/cross/COMMON/patches-binutils/patch-aa Fri Jul 09 20:44:53 2004 +0000
+++ b/cross/COMMON/patches-binutils/patch-aa Fri Jul 09 20:48:15 2004 +0000
@@ -1,21 +1,13 @@
-$NetBSD: patch-aa,v 1.1 1999/01/04 22:37:30 tv Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/09 20:48:15 kristerw Exp $
---- gas/Makefile.in.orig Mon Jan 4 00:34:23 1999
-+++ gas/Makefile.in Mon Jan 4 00:37:14 1999
-@@ -452,14 +452,14 @@
+--- gas/Makefile.in.orig Sat Jul 3 02:57:14 2004
++++ gas/Makefile.in Sat Jul 3 03:00:33 2004
+@@ -710,7 +710,7 @@
+
# How to link with both our special library facilities
# and the system's installed libraries.
-
-GASLIBS = @OPCODES_LIB@ @BFDLIB@ ../libiberty/libiberty.a
-+GASLIBS = ../libiberty/libiberty.a
++GASLIBS = ${PREFIX}/lib/libbfd.a ${PREFIX}/lib/libiberty.a
# Files to be copied away after each stage in building.
STAGESTUFF = *.o $(noinst_PROGRAMS)
-
- as_new_SOURCES = $(GAS_CFILES)
- as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
-- $(extra_objects) $(GASLIBS)
-+ $(extra_objects) -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lopcodes-2.9.1 -lbfd-2.9.1 $(GASLIBS)
- as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
- $(extra_objects) $(GASLIBS)
-
diff -r 58b5b0eddfc8 -r ed9f0c9a9fde cross/COMMON/patches-binutils/patch-ab
--- a/cross/COMMON/patches-binutils/patch-ab Fri Jul 09 20:44:53 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/01/06 17:02:39 tv Exp $
-
---- libiberty/strerror.c.orig Fri May 1 11:47:54 1998
-+++ libiberty/strerror.c Wed Jan 6 12:03:36 1999
-@@ -7,21 +7,12 @@
-
- #include "config.h"
-
--#ifndef NEED_sys_errlist
--/* Note that errno.h (not sure what OS) or stdio.h (BSD 4.4, at least)
-- might declare sys_errlist in a way that the compiler might consider
-- incompatible with our later declaration, perhaps by using const
-- attributes. So we hide the declaration in errno.h (if any) using a
-- macro. */
--#define sys_errlist sys_errlist__
--#endif
--
- #include <stdio.h>
- #include <errno.h>
-
--#ifndef NEED_sys_errlist
--#undef sys_errlist
--#endif
-+/* Bogus: we have these! */
-+#undef NEED_sys_errlist
-+#undef NEED_sys_nerr
-
- /* Routines imported from standard C runtime libraries. */
-
-@@ -459,11 +450,6 @@
-
- static int sys_nerr;
- static const char **sys_errlist;
--
--#else
--
--extern int sys_nerr;
--extern char *sys_errlist[];
-
- #endif
-
diff -r 58b5b0eddfc8 -r ed9f0c9a9fde cross/COMMON/patches-binutils/patch-arrays
--- a/cross/COMMON/patches-binutils/patch-arrays Fri Jul 09 20:44:53 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- ./bfd/libbfd-in.h.orig Fri May 1 11:48:12 1998
-+++ ./bfd/libbfd-in.h Mon Dec 28 17:43:21 1998
-@@ -496,7 +498,7 @@
-
- /* List of supported target vectors, and the default vector (if
- bfd_default_vector[0] is NULL, there is no default). */
--extern const bfd_target * const bfd_target_vector[];
-+extern const bfd_target * const *bfd_target_vector;
- extern const bfd_target *bfd_default_vector[];
-
- /* Functions shared by the ECOFF and MIPS ELF backends, which have no
---- ./bfd/libbfd.h.orig Fri May 1 11:48:12 1998
-+++ ./bfd/libbfd.h Mon Dec 28 17:43:21 1998
-@@ -496,7 +498,7 @@
-
- /* List of supported target vectors, and the default vector (if
- bfd_default_vector[0] is NULL, there is no default). */
--extern const bfd_target * const bfd_target_vector[];
-+extern const bfd_target * const *bfd_target_vector;
- extern const bfd_target *bfd_default_vector[];
-
- /* Functions shared by the ECOFF and MIPS ELF backends, which have no
diff -r 58b5b0eddfc8 -r ed9f0c9a9fde cross/COMMON/patches-binutils/patch-mips
--- a/cross/COMMON/patches-binutils/patch-mips Fri Jul 09 20:44:53 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-$NetBSD: patch-mips,v 1.1 2000/02/19 00:50:46 tsutsui Exp $
-
---- config.sub.orig Sat May 2 00:48:46 1998
-+++ config.sub Thu Feb 17 01:17:57 2000
-@@ -177,7 +177,7 @@
- | alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
- | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
- | 1750a | dsp16xx | pdp11 \
-- | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-+ | mips64 | mipsel | mipseb | mips64el | mips64orion | mips64orionel \
- | mipstx39 | mipstx39el \
- | sparc | sparclet | sparclite | sparc64 | v850)
- basic_machine=$basic_machine-unknown
-@@ -230,7 +230,7 @@
- | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
- | xps100-* | clipper-* | orion-* \
- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-- | sparc64-* | mips64-* | mipsel-* \
-+ | sparc64-* | mips64-* | mipsel-* | mipseb-* \
- | mips64el-* | mips64orion-* | mips64orionel-* \
- | mipstx39-* | mipstx39el-* \
- | f301-*)
---- ld/configure.tgt.orig Sat May 2 00:48:48 1998
-+++ ld/configure.tgt Thu Feb 17 01:22:49 2000
-@@ -147,7 +147,8 @@
- mips*el-*-ecoff*) targ_emul=mipsidtl ;;
- mips*-*-ecoff*) targ_emul=mipsidt ;;
- mips*-dec-bsd*) targ_emul=mipsbsd ;;
--mips*-dec-netbsd*) targ_emul=elf32lmip ;;
-+mips*el-*-netbsd* | mips*-dec-netbsd*) targ_emul=elf32lmip ;;
-+mips*eb-*-netbsd*) targ_emul=elf32ebmip ;;
- mips*-*-bsd*) targ_emul=mipsbig ;;
- mips*vr4300el-*-elf*) targ_emul=elf32l4300 ;;
- mips*vr4300-*-elf*) targ_emul=elf32b4300 ;;
---- gas/configure.orig Sat May 2 00:45:07 1998
-+++ gas/configure Thu Feb 17 01:41:20 2000
-@@ -1544,7 +1544,7 @@
- m88k-*-coff*) fmt=coff ;;
-
- # don't change em like *-*-bsd does
-- mips-dec-netbsd*) fmt=elf endian=little ;;
-+ mips-*-netbsd*) fmt=elf ;;
- mips-dec-openbsd*) fmt=elf endian=little ;;
- mips-dec-bsd*) fmt=aout ;;
- mips-sony-bsd*) fmt=ecoff ;;
diff -r 58b5b0eddfc8 -r ed9f0c9a9fde cross/COMMON/patches-binutils/patch-sh
--- a/cross/COMMON/patches-binutils/patch-sh Fri Jul 09 20:44:53 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,451 +0,0 @@
-$NetBSD: patch-sh,v 1.1 2001/01/04 01:19:29 itojun Exp $
-
-ftp://ftp.netbsd.org/pub/NetBSD/arch/sh3/crosskit/
-
-diff -u -r -N -x *.orig -x CVS old/bfd/Makefile.am binutils-2.9.1/bfd/Makefile.am
---- bfd/Makefile.am Wed Jan 3 20:40:59 2001
-+++ bfd/Makefile.am Wed Jan 3 20:44:17 2001
-@@ -153,6 +153,7 @@
- elf-m10200.lo \
- elf-m10300.lo \
- elf32-ppc.lo \
-+ elf32-shunx.lo \
- elf32-sh.lo \
- elf32-sparc.lo \
- elf32-v850.lo \
-@@ -260,6 +261,7 @@
- elf-m10200.c \
- elf-m10300.c \
- elf32-ppc.c \
-+ elf32-shunx.c \
- elf32-sh.c \
- elf32-sparc.c \
- elf32-v850.c \
-@@ -797,6 +799,9 @@
- elf32-ppc.lo: elf32-ppc.c $(INCDIR)/bfdlink.h elf-bfd.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/ppc.h elf32-target.h
-+elf32-shunx.lo: elf32-shunx.c $(INCDIR)/bfdlink.h elf-bfd.h \
-+ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-+ elf32-target.h
- elf32-sh.lo: elf32-sh.c $(INCDIR)/bfdlink.h elf-bfd.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
- elf32-target.h
-diff -u -r -N -x *.orig -x CVS old/bfd/Makefile.in binutils-2.9.1/bfd/Makefile.in
---- bfd/Makefile.in Wed Jan 3 20:40:59 2001
-+++ bfd/Makefile.in Wed Jan 3 20:44:04 2001
-@@ -242,6 +242,7 @@
- elf-m10200.lo \
- elf-m10300.lo \
- elf32-ppc.lo \
-+ elf32-shunx.lo \
- elf32-sh.lo \
- elf32-sparc.lo \
- elf32-v850.lo \
-@@ -349,6 +350,7 @@
- elf-m10200.c \
- elf-m10300.c \
- elf32-ppc.c \
-+ elf32-shunx.c \
- elf32-sh.c \
- elf32-sparc.c \
- elf32-v850.c \
-@@ -1254,6 +1256,9 @@
- elf32-ppc.lo: elf32-ppc.c $(INCDIR)/bfdlink.h elf-bfd.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/ppc.h elf32-target.h
-+elf32-shunx.lo: elf32-shunx.c $(INCDIR)/bfdlink.h elf-bfd.h \
-+ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-+ elf32-target.h
- elf32-sh.lo: elf32-sh.c $(INCDIR)/bfdlink.h elf-bfd.h \
- $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
- elf32-target.h
-diff -u -r -N -x *.orig -x CVS old/bfd/config.bfd binutils-2.9.1/bfd/config.bfd
---- bfd/config.bfd Wed Jan 3 20:55:42 2001
-+++ bfd/config.bfd Wed Jan 3 20:46:00 2001
-@@ -40,6 +40,7 @@
- powerpc*) targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
- rs6000) targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
- sparc*) targ_archs=bfd_sparc_arch ;;
-+sh*) targ_archs=bfd_sh_arch ;;
- v850*) targ_archs=bfd_v850_arch ;;
- z8k*) targ_archs=bfd_z8k_arch ;;
- *) targ_archs=bfd_${targ_cpu}_arch ;;
-@@ -494,14 +495,34 @@
- targ_defvec=rs6000coff_vec
- ;;
-
-+ sh-*-netbsdelf)
-+ targ_defvec=bfd_elf32_shunx_vec
-+ targ_selvecs="bfd_elf32_shlunx_vec shcoff_vec shlcoff_vec "
-+ targ_underscore=yes
-+ ;;
-+ shel-*-netbsdelf)
-+ targ_defvec=bfd_elf32_shlunx_vec
-+ targ_selvecs="bfd_elf32_shunx_vec shcoff_vec shlcoff_vec "
-+ targ_underscore=yes
-+ ;;
- sh-*-elf*)
- targ_defvec=bfd_elf32_sh_vec
-- targ_selvecs="bfd_elf32_shl_vec shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
-+ targ_selvecs="bfd_elf32_shl_vec shcoff_vec shlcoff_vec "
-+ targ_underscore=yes
-+ ;;
-+ sh-*-netbsdcoff)
-+ targ_defvec=shcoff_vec
-+ targ_selvecs="shlcoff_vec "
-+ targ_underscore=yes
-+ ;;
-+ shel-*-netbsdcoff)
Home |
Main Index |
Thread Index |
Old Index