Don't install libbfd and libopcodes and the associated headers.

They really are just a way to share common code between gdb and binutils
(which in the GNU world are seperate packages).  The developers (and I'm
one of them) make absolutely no effert to maintain a stable API/ABI.

If ports people really need libbfd or libopcodes, they should just
package a suitable version.

ok weingart@, deraadt@

diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
index e325197..ca5a04d 100644 (file)
--- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.bsd-wrapper,v 1.72 2008/01/14 22:01:23 espie Exp $
+#      $OpenBSD: Makefile.bsd-wrapper,v 1.73 2008/08/22 13:02:53 kettenis Exp $
 
 NEW_BINUTILS=alpha amd64 arm hppa hppa64 i386 mips64 powerpc sh sparc sparc64
 
@@ -10,17 +10,8 @@ USING_NEW_BINUTILS?=no
 .  endif
 .endfor
 
-SUBDIRS=
-CONF_SUBDIRS=
-
-.if ${USING_NEW_BINUTILS:L} == "yes"
-CONF_SUBDIRS+= opcodes bfd
-SUBDIRS+=      opcodes bfd
-INST_SUBDIRS+= opcodes bfd
-.else
-CONF_SUBDIRS+= opcodes bfd
-SUBDIRS+=      opcodes bfd
-.endif
+SUBDIRS=       opcodes bfd
+CONF_SUBDIRS=  opcodes bfd
 
 # This allows moving the whole binutils installation around for 
 # testing purposes
@@ -98,7 +89,7 @@ do-config: .USE
        MAKEINFO='makeinfo --no-split' \
        sh ${.CURDIR}/configure --prefix=${PREFIX} \
            --infodir='$${prefix}/share/info' \
-           --disable-nls --disable-gdbtk --disable-commonbfdlib ${CF} \
+           --disable-nls --disable-gdbtk --disable-install-libbfd ${CF} \
            ${CONFIGTARGET}
        cd ${.OBJDIR} && \
            sed -e 's,SUBDIRS *=,SUBDIRS ?=,' <Makefile >Makefile.tmp && \
@@ -139,24 +130,9 @@ install: maninstall
 clean cleandir:
        -@if [ -e Makefile ]; then ${MAKE} distclean; fi
 
-prereq: config.status
-       cd ${.OBJDIR}/bfd && ${MAKE} bfd.h
-       # we don't install ansidecl.h, we merge it into the file that
-       # needs it instead.
-       sed -e '/^#include "ansidecl.h"/r${.CURDIR}/include/ansidecl.h' -e '//d' \
-               bfd/bfd.h >bfd/mybfd.h
-
 c++filt.1: binutils/cxxfilt.man
        sed -e 's,@PROGRAM@,c++filt,' <${.CURDIR}/binutils/cxxfilt.man >$@
 
-includes:
-.if ${USING_NEW_BINUTILS:L} == "yes"
-       install -C -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
-               ${.CURDIR}/include/bfdlink.h ${DESTDIR}/usr/include
-       install -C -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
-               bfd/mybfd.h ${DESTDIR}/usr/include/bfd.h
-.endif
-
 depend:
        # Nothing here so far...
 

diff --git a/include/Makefile b/include/Makefile
index 605e1f9..d4ff6fe 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.144 2008/06/04 21:12:50 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.145 2008/08/22 13:02:53 kettenis Exp $
 #      $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #      @(#)Makefile    5.45.1.1 (Berkeley) 5/6/91
@@ -51,11 +51,11 @@ RDIRS=      ../lib/libpthread ../lib/libcompat ../lib/libcurses \
 PRDIRS=
 
 # Directories with an includes target that use Makefile.bsd-wrapper
-WDIRS= ../usr.sbin/httpd ../gnu/usr.bin/binutils
+WDIRS= ../usr.sbin/httpd
 
 # Places using Makefile.bsd-wrapper that needs a prerequisite target met
 # before includes
-PWDIRS=        ../gnu/usr.bin/binutils
+PWDIRS=
 
 .if ${USE_GCC3:L} == "yes"
 WDIRS+= ../gnu/lib/libstdc++ ../gnu/usr.bin/gcc ../gnu/lib/libobjc \