diff options
| -rw-r--r-- | gnu/egcs/libio/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | gnu/egcs/libstdc++/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/Makefile.bsd-wrapper | 10 | ||||
| -rw-r--r-- | lib/libkrb5/Makefile | 8 | ||||
| -rw-r--r-- | share/mk/bsd.lib.mk | 22 |
5 files changed, 9 insertions, 41 deletions
diff --git a/gnu/egcs/libio/Makefile.bsd-wrapper b/gnu/egcs/libio/Makefile.bsd-wrapper index e66da9a8e3f..0a1693ac7e3 100644 --- a/gnu/egcs/libio/Makefile.bsd-wrapper +++ b/gnu/egcs/libio/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2000/08/25 14:36:39 maja Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2012/08/31 00:11:27 deraadt Exp $ .if (${MACHINE_ARCH} == "mips") MAKE+= -DNOPIC @@ -64,12 +64,12 @@ clean: rm -f lib$(LIBIO).a $(LIBIO_SRCS:.c=.o) rm -f lib$(LIBIO)_g.a $(LIBIO_SRCS:.c=.go) rm -f lib$(LIBIO)_p.a $(LIBIO_SRCS:.c=.po) - rm -f lib$(LIBIO)_pic.a lib$(LIBIO).so.*.* $(LIBIO_SRCS:.c=.so) + rm -f lib$(LIBIO).so.*.* $(LIBIO_SRCS:.c=.so) rm -f llib-lib$(LIBIO).ln $(LIBIO_SRCS:.c=.ln) rm -f lib$(LIBIOSTREAM).a $(IOSTREAM_SRCS:.cc=.o) rm -f lib$(LIBIOSTREAM)_g.a $(IOSTREAM_SRCS:.cc=.go) rm -f lib$(LIBIOSTREAM)_p.a $(IOSTREAM_SRCS:.cc=.po) - rm -f lib$(LIBIOSTREAM)_pic.a lib$(LIBIOSTREAM).so.*.* \ + rm -f lib$(LIBIOSTREAM).so.*.* \ $(IOSTREAM_SRCS:.cc=.so) rm -f llib-lib$(LIBIOSTREAM).ln $(IOSTREAM_SRCS:.cc=.ln) diff --git a/gnu/egcs/libstdc++/Makefile.bsd-wrapper b/gnu/egcs/libstdc++/Makefile.bsd-wrapper index 279e324d71e..7b5e7898912 100644 --- a/gnu/egcs/libstdc++/Makefile.bsd-wrapper +++ b/gnu/egcs/libstdc++/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.16 2012/08/02 13:38:38 okan Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.17 2012/08/31 00:11:27 deraadt Exp $ .if (${MACHINE_ARCH} == "mips") NOPIC= @@ -83,7 +83,7 @@ clean: _SUBDIRUSE rm -f lib${LIB}.a ${STD_OBJS} rm -f lib${LIB}_g.a ${STD_OBJS:.o=.go} rm -f lib${LIB}_p.a ${STD_OBJS:.o=.po} - rm -f lib${LIB}_pic.a lib${LIB}.so.*.* ${STD_OBJS:.o=.so} + rm -f lib${LIB}.so.*.* ${STD_OBJS:.o=.so} rm -f llib-l${LIB}.ln ${STD_OBJS:.o=.ln} GXX_INCDIR=$(DESTDIR)/usr/include/g++ diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper b/gnu/usr.bin/perl/Makefile.bsd-wrapper index ce5f2af737a..ae85dd39fd1 100644 --- a/gnu/usr.bin/perl/Makefile.bsd-wrapper +++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.86 2011/09/24 12:23:09 millert Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.87 2012/08/31 00:11:27 deraadt Exp $ # # Build wrapper for Perl 5.10.0 # @@ -199,14 +199,6 @@ install.lib: .endif chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_p.a .endif -.if !defined(NOPIC) && (${MACHINE_CPU} != "mips64") - ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \ - lib${LIB}_pic.a ${DESTDIR}${LIBDIR} -.if (${INSTALL_COPY} != "-p") - ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a -.endif - chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a -.endif .if !defined(NOPIC) && defined(major) && defined(minor) ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ lib${LIB}.so.${major}.${minor} ${DESTDIR}${LIBDIR} diff --git a/lib/libkrb5/Makefile b/lib/libkrb5/Makefile index 16deae40bd8..48b62f28b19 100644 --- a/lib/libkrb5/Makefile +++ b/lib/libkrb5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2012/08/02 13:38:38 okan Exp $ +# $OpenBSD: Makefile,v 1.18 2012/08/31 00:11:27 deraadt Exp $ .include <bsd.own.mk> @@ -94,12 +94,6 @@ afterinstall: ln -f $(DESTDIR)$(LIBDIR)/lib$(LIB).so.$(SHLIB_MAJOR).$(SHLIB_MINOR) \ $(DESTDIR)$(LIBDIR)/lib$$f.so.$(SHLIB_MAJOR).$(SHLIB_MINOR) ;\ done - for f in $(SHLIB_LINKS); do \ - if [ -f $(DESTDIR)$(LIBDIR)/lib$(LIB)_pic.a ]; then \ - ln -f $(DESTDIR)$(LIBDIR)/lib$(LIB)_pic.a \ - $(DESTDIR)$(LIBDIR)/lib$${f}_pic.a ;\ - fi \ - done .endif for f in $(ALIB_LINKS); do \ ln -f $(DESTDIR)$(LIBDIR)/lib$(LIB).a \ diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 3bfb1ac75cb..53d8b7d5829 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lib.mk,v 1.65 2012/08/22 17:19:34 pascal Exp $ +# $OpenBSD: bsd.lib.mk,v 1.66 2012/08/31 00:11:26 deraadt Exp $ # $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 @@ -148,9 +148,6 @@ _LIBS+=lib${LIB}_p.a .endif .if !defined(NOPIC) -.if (${MACHINE_CPU} != "mips64") -_LIBS+=lib${LIB}_pic.a -.endif .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR) _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} .endif @@ -181,12 +178,6 @@ lib${LIB}_p.a: ${POBJS} ${RANLIB} lib${LIB}_p.a SOBJS+= ${OBJS:.o=.so} -lib${LIB}_pic.a: ${SOBJS} - @echo building shared object ${LIB} library - @rm -f lib${LIB}_pic.a - @${AR} cq lib${LIB}_pic.a `${LORDER} ${SOBJS} | tsort -q` - ${RANLIB} lib${LIB}_pic.a - lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}: ${SOBJS} ${DPADD} @echo building shared ${LIB} library \(version ${SHLIB_MAJOR}.${SHLIB_MINOR}\) @rm -f lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} @@ -200,7 +191,7 @@ clean: _SUBDIRUSE rm -f lib${LIB}.a ${OBJS} rm -f lib${LIB}_g.a ${GOBJS} rm -f lib${LIB}_p.a ${POBJS} - rm -f lib${LIB}_pic.a lib${LIB}.so.*.* ${SOBJS} + rm -f lib${LIB}.so.*.* ${SOBJS} .endif cleandir: _SUBDIRUSE clean @@ -248,15 +239,6 @@ realinstall: .endif chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_p.a .endif -.if !defined(NOPIC) && (${MACHINE_CPU} != "mips64") -# ranlib lib${LIB}_pic.a - ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m 600 \ - lib${LIB}_pic.a ${DESTDIR}${LIBDIR} -.if (${INSTALL_COPY} != "-p") - ${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a -.endif - chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a -.endif .if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR) ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR} |