diff --git a/compat/external/gpl3/binutils/lib/Makefile b/compat/external/gpl3/binutils/lib/Makefile new file mode 100644 index 000000000000..470ce317a6da --- /dev/null +++ b/compat/external/gpl3/binutils/lib/Makefile @@ -0,0 +1,11 @@ +# $NetBSD: Makefile,v 1.1 2009/09/11 16:01:58 mrg Exp $ + +.include + +_CURDIR:= ${.CURDIR} + +.CURDIR:=${NETBSDSRCDIR}/external/gpl3/binutils/lib + +.include "${.CURDIR}/Makefile" + +.CURDIR:= ${_CURDIR} diff --git a/compat/external/gpl3/binutils/lib/libbfd/Makefile b/compat/external/gpl3/binutils/lib/libbfd/Makefile new file mode 100644 index 000000000000..e92d57ed5dac --- /dev/null +++ b/compat/external/gpl3/binutils/lib/libbfd/Makefile @@ -0,0 +1,37 @@ +# $NetBSD: Makefile,v 1.1 2009/09/11 16:01:58 mrg Exp $ +# Generated from: NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp + +NOLINT= # defined +NOMAN= # defined +NONLS= # defined +NOINFO= # defined +NOSHARE= # defined + +NOCHECKVER= # defined + +.include + +# Resolve pathnames in variables. +_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR +.for var in ${_RESOLVE_VARS} +${var}:= ${${var}} +.endfor + +.include + +_CURDIR:= ${.CURDIR} + +.PATH: ${NETBSDSRCDIR}/external/gpl3/binutils/lib/libbfd +.CURDIR:=${NETBSDSRCDIR}/external/gpl3/binutils/lib/libbfd + +.include "${NETBSDSRCDIR}/compat/Makefile.compat" +.include "${.CURDIR}/Makefile" + +# Resolve pathnames from "real" Makefile, and switch .CURDIR back. +_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP +.for var in ${_RESOLVE_VARS} +${var}:= ${${var}} +.endfor + +.CURDIR:= ${_CURDIR} +.undef _CURDIR diff --git a/compat/external/gpl3/binutils/lib/libiberty/Makefile b/compat/external/gpl3/binutils/lib/libiberty/Makefile new file mode 100644 index 000000000000..09823bec28fb --- /dev/null +++ b/compat/external/gpl3/binutils/lib/libiberty/Makefile @@ -0,0 +1,37 @@ +# $NetBSD: Makefile,v 1.1 2009/09/11 16:01:58 mrg Exp $ +# Generated from: NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp + +NOLINT= # defined +NOMAN= # defined +NONLS= # defined +NOINFO= # defined +NOSHARE= # defined + +NOCHECKVER= # defined + +.include + +# Resolve pathnames in variables. +_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR +.for var in ${_RESOLVE_VARS} +${var}:= ${${var}} +.endfor + +.include + +_CURDIR:= ${.CURDIR} + +.PATH: ${NETBSDSRCDIR}/external/gpl3/binutils/lib/libiberty +.CURDIR:=${NETBSDSRCDIR}/external/gpl3/binutils/lib/libiberty + +.include "${NETBSDSRCDIR}/compat/Makefile.compat" +.include "${.CURDIR}/Makefile" + +# Resolve pathnames from "real" Makefile, and switch .CURDIR back. +_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP +.for var in ${_RESOLVE_VARS} +${var}:= ${${var}} +.endfor + +.CURDIR:= ${_CURDIR} +.undef _CURDIR diff --git a/compat/external/gpl3/binutils/lib/libopcodes/Makefile b/compat/external/gpl3/binutils/lib/libopcodes/Makefile new file mode 100644 index 000000000000..595b27cc9e8b --- /dev/null +++ b/compat/external/gpl3/binutils/lib/libopcodes/Makefile @@ -0,0 +1,37 @@ +# $NetBSD: Makefile,v 1.1 2009/09/11 16:01:59 mrg Exp $ +# Generated from: NetBSD: build-makefiles,v 1.7 2009/07/21 00:23:02 mrg Exp + +NOLINT= # defined +NOMAN= # defined +NONLS= # defined +NOINFO= # defined +NOSHARE= # defined + +NOCHECKVER= # defined + +.include + +# Resolve pathnames in variables. +_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR +.for var in ${_RESOLVE_VARS} +${var}:= ${${var}} +.endfor + +.include + +_CURDIR:= ${.CURDIR} + +.PATH: ${NETBSDSRCDIR}/external/gpl3/binutils/lib/libopcodes +.CURDIR:=${NETBSDSRCDIR}/external/gpl3/binutils/lib/libopcodes + +.include "${NETBSDSRCDIR}/compat/Makefile.compat" +.include "${.CURDIR}/Makefile" + +# Resolve pathnames from "real" Makefile, and switch .CURDIR back. +_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP +.for var in ${_RESOLVE_VARS} +${var}:= ${${var}} +.endfor + +.CURDIR:= ${_CURDIR} +.undef _CURDIR diff --git a/compat/external/lib/Makefile b/compat/external/lib/Makefile index 34e824e6c365..2d687cf3c046 100644 --- a/compat/external/lib/Makefile +++ b/compat/external/lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2009/06/10 12:48:06 christos Exp $ +# $NetBSD: Makefile,v 1.9 2009/09/11 16:01:59 mrg Exp $ # # This Makefile exists to provide a single point to build @@ -21,4 +21,8 @@ SUBDIR+= ../bsd/openldap/lib SUBDIR+= ../bsd/bind/lib SUBDIR+= ../bsd/file/lib +.if ${MKBINUTILS} != "no" && ${HAVE_BINUTILS} == "219" +SUBDIR+= ../gpl3/binutils/lib +.endif + .include diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index e1ce4ce185d3..919b8c8786d8 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.67 2009/09/08 07:08:01 skrll Exp $ +# $NetBSD: md.amd64,v 1.68 2009/09/11 16:01:59 mrg Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -138,8 +138,10 @@ ./usr/lib/i386/libnetpgp.so.2.0 base-compat-shlib compat,pic ./usr/lib/i386/libobjc.so.3 base-compat-shlib compat,pic ./usr/lib/i386/libobjc.so.3.0 base-compat-shlib compat,pic -./usr/lib/i386/libopcodes.so.3 base-compat-shlib compat,pic,binutils -./usr/lib/i386/libopcodes.so.3.0 base-compat-shlib compat,pic,binutils +./usr/lib/i386/libopcodes.so.3 base-compat-shlib compat,pic,binutils=216 +./usr/lib/i386/libopcodes.so.3.0 base-compat-shlib compat,pic,binutils=216 +./usr/lib/i386/libopcodes.so.4 base-compat-shlib compat,pic,binutils=219 +./usr/lib/i386/libopcodes.so.4.0 base-compat-shlib compat,pic,binutils=219 ./usr/lib/i386/libossaudio.so.1 base-compat-shlib compat,pic ./usr/lib/i386/libossaudio.so.1.0 base-compat-shlib compat,pic ./usr/lib/i386/libp2k.so.1 base-compat-shlib compat,pic diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index 4e81f83a6bbc..ce580dcac516 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.59 2009/09/03 15:35:59 pooka Exp $ +# $NetBSD: md.sparc64,v 1.60 2009/09/11 16:01:59 mrg Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root ./usr/bin/fdformat base-util-bin @@ -132,8 +132,10 @@ ./usr/lib/sparc/libnetpgp.so.2.0 base-compat-shlib compat,pic ./usr/lib/sparc/libobjc.so.3 base-compat-shlib compat,pic ./usr/lib/sparc/libobjc.so.3.0 base-compat-shlib compat,pic -./usr/lib/sparc/libopcodes.so.3 base-compat-shlib compat,pic -./usr/lib/sparc/libopcodes.so.3.0 base-compat-shlib compat,pic +./usr/lib/sparc/libopcodes.so.3 base-compat-shlib compat,pic,binutils=216 +./usr/lib/sparc/libopcodes.so.3.0 base-compat-shlib compat,pic,binutils=216 +./usr/lib/sparc/libopcodes.so.4 base-compat-shlib compat,pic,binutils=219 +./usr/lib/sparc/libopcodes.so.4.0 base-compat-shlib compat,pic,binutils=219 ./usr/lib/sparc/libossaudio.so.1 base-compat-shlib compat,pic ./usr/lib/sparc/libossaudio.so.1.0 base-compat-shlib compat,pic ./usr/lib/sparc/libp2k.so.1 base-compat-shlib compat,pic