Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.289.2.5 retrieving revision 1.290 diff -u -p -r1.289.2.5 -r1.290 --- src/share/mk/bsd.lib.mk 2014/09/03 02:09:24 1.289.2.5 +++ src/share/mk/bsd.lib.mk 2008/11/24 02:01:46 1.290 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.289.2.5 2014/09/03 02:09:24 msaitoh Exp $ +# $NetBSD: bsd.lib.mk,v 1.290 2008/11/24 02:01:46 cube Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include @@ -9,7 +9,6 @@ LIBISMODULE?= no LIBISPRIVATE?= no -LIBISCXX?= no _LIB_PREFIX= lib @@ -68,7 +67,7 @@ DPADD+= ${LIBDO.${_lib}}/lib${_lib}.so .endif # } ##### Build and install rules -MKDEP_SUFFIXES?= .o .po .pico .go .ln +MKDEP_SUFFIXES?= .o .po .so .go .ln CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include} CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++} @@ -127,8 +126,8 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR} # add additional suffixes not exported. # .po is used for profiling object files. -# .pico is used for PIC object files. -.SUFFIXES: .out .a .ln .pico .po .go .o .s .S .c .cc .cpp .cxx .C .m .F .f .r .y .l .cl .p .h +# .so is used for PIC object files. +.SUFFIXES: .out .a .ln .so .po .go .o .s .S .c .cc .cpp .cxx .C .m .F .f .r .y .l .cl .p .h .SUFFIXES: .sh .m4 .m @@ -146,14 +145,14 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR} # with ELF, also set shared-lib version for ld.so. # SHLIB_LDSTARTFILE: support .o file, call C++ file-level constructors # SHLIB_LDENDFILE: support .o file, call C++ file-level destructors -# FPICFLAGS: flags for ${FC} to compile .[fF] files to .pico objects. +# FPICFLAGS: flags for ${FC} to compile .[fF] files to .so objects. # CPPPICFLAGS: flags for ${CPP} to preprocess .[sS] files for ${AS} # CPICFLAGS: flags for ${CC} to compile .[cC] files to pic objects. -# CSHLIBFLAGS: flags for ${CC} to compile .[cC] files to .pico objects. +# CSHLIBFLAGS: flags for ${CC} to compile .[cC] files to .so objects. # (usually includes ${CPICFLAGS}) # CAPICFLAGS: flags for ${CC} to compiling .[Ss] files # (usually just ${CPPPICFLAGS} ${CPICFLAGS}) -# APICFLAGS: flags for ${AS} to assemble .[sS] to .pico objects. +# APICFLAGS: flags for ${AS} to assemble .[sS] to .so objects. .if ${MACHINE_ARCH} == "alpha" # { @@ -202,8 +201,8 @@ MKSHLIBOBJS= no SHLIB_SOVERSION= ${SHLIB_MAJOR} SHLIB_SHFLAGS= -Wl,-soname,${_LIB_PREFIX}${LIB}.so.${SHLIB_SOVERSION} SHLIB_SHFLAGS+= -Wl,--warn-shared-textrel -SHLIB_LDSTARTFILE?= ${_GCC_CRTDIR}/crti.o ${_GCC_CRTBEGINS} -SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${_GCC_CRTDIR}/crtn.o +SHLIB_LDSTARTFILE?= ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGINS} +SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${DESTDIR}/usr/lib/crtn.o .endif CFLAGS+= ${COPTS} @@ -229,7 +228,7 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.c} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET} -.c.pico: +.c.so: ${_MKTARGET_COMPILE} ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET} .if !defined(CFLAGS) || empty(CFLAGS:M*-g*) @@ -254,7 +253,7 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.cc} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET} -.cc.pico .cpp.pico .cxx.pico .C.pico: +.cc.so .cpp.so .cxx.so .C.so: ${_MKTARGET_COMPILE} ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET} .if !defined(CFLAGS) || empty(CFLAGS:M*-g*) @@ -279,7 +278,7 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.f} ${DEBUGFLAGS} -g ${.IMPSRC} -o ${.TARGET} -.f.pico: +.f.so: ${_MKTARGET_COMPILE} ${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET} .if !defined(FOPTS) || empty(FOPTS:M*-g*) @@ -311,7 +310,7 @@ FFLAGS+= ${FOPTS} ${OBJCOPY} -X ${.TARGET} .endif -.m.pico: +.m.so: ${_MKTARGET_COMPILE} ${COMPILE.m} ${CSHLIBFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*) @@ -346,12 +345,12 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.S} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} -.s.pico: +.s.so: ${_MKTARGET_COMPILE} ${COMPILE.s} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} ${OBJCOPY} -x ${.TARGET} -.S.pico: +.S.so: ${_MKTARGET_COMPILE} ${COMPILE.S} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} ${OBJCOPY} -x ${.TARGET} @@ -394,14 +393,14 @@ PROFFLAGS?=-DGPROF -DPROF # since it's needed for making shared lib. # but don't install it. SOLIB=lib${LIB}_pic.a -SOBJS+=${OBJS:.o=.pico} +SOBJS+=${OBJS:.o=.so} .else SOLIB=lib${LIB}.a .endif .else SOLIB=lib${LIB}_pic.a _LIBS+=${SOLIB} -SOBJS+=${OBJS:.o=.pico} +SOBJS+=${OBJS:.o=.so} .endif .if defined(SHLIB_FULLVERSION) _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION} @@ -493,25 +492,19 @@ LDADD+= -lgcc_pic .endif .endif -.if ${LIBISCXX} != "no" -LIBCC:= ${CXX} -.else -LIBCC:= ${CC} -.endif - lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \ ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE} ${_MKTARGET_BUILD} rm -f lib${LIB}.so.${SHLIB_FULLVERSION} .if defined(DESTDIR) - ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}${SHLIBDIR}/ \ + ${CC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \ ${_LIBLDOPTS} \ -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \ -Wl,--whole-archive ${SOLIB} \ -Wl,--no-whole-archive ${LDADD} \ -L${_GCC_LIBGCCDIR} .else - ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \ + ${CC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \ -o ${.TARGET} ${_LIBLDOPTS} \ -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD} .endif @@ -714,9 +707,6 @@ ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: .endif # !target(libinstall) # } ##### Pull in related .mk logic -LINKSOWN?= ${LIBOWN} -LINKSGRP?= ${LIBGRP} -LINKSMODE?= ${LIBMODE} .include .include .include