CVS commit: [netbsd-5] src/share/mk
Module Name:src Committed By: msaitoh Date: Wed Sep 3 02:09:24 UTC 2014 Modified Files: src/share/mk [netbsd-5]: bsd.README bsd.lib.mk Log Message: Pull up following revision(s) (requested by tls in ticket #1338): share/mk/bsd.README: revision 1.265 share/mk/bsd.lib.mk: revision 1.304 Change shared object file extension from .so to .pico, to avoid conflicts with shared libaries names libXX.so; as recently seen with MKUPDATE=yes builds for libelf and libnvpair. All now stalled regular .so files need to be manually removed from object directories. To generate a diff of this commit: cvs rdiff -u -r1.236.2.8 -r1.236.2.9 src/share/mk/bsd.README cvs rdiff -u -r1.289.2.4 -r1.289.2.5 src/share/mk/bsd.lib.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.236.2.8 src/share/mk/bsd.README:1.236.2.9 --- src/share/mk/bsd.README:1.236.2.8 Sat Jun 6 22:10:12 2009 +++ src/share/mk/bsd.README Wed Sep 3 02:09:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.236.2.8 2009/06/06 22:10:12 bouyer Exp $ +# $NetBSD: bsd.README,v 1.236.2.9 2014/09/03 02:09:24 msaitoh Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make include files for the NetBSD @@ -56,7 +56,7 @@ the tree where the file gets installed. The profiled libraries are no longer built in a different directory than the regular libraries. A new suffix, .po, is used to denote a profiled -object, and .so denotes a shared (position-independent) object. +object, and .pico denotes a shared (position-independent) object. There are various make variables used during the build. Index: src/share/mk/bsd.lib.mk diff -u src/share/mk/bsd.lib.mk:1.289.2.4 src/share/mk/bsd.lib.mk:1.289.2.5 --- src/share/mk/bsd.lib.mk:1.289.2.4 Thu Jan 6 05:20:25 2011 +++ src/share/mk/bsd.lib.mk Wed Sep 3 02:09:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.lib.mk,v 1.289.2.4 2011/01/06 05:20:25 riz Exp $ +# $NetBSD: bsd.lib.mk,v 1.289.2.5 2014/09/03 02:09:24 msaitoh Exp $ # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 .include bsd.init.mk @@ -68,7 +68,7 @@ DPADD+= ${LIBDO.${_lib}}/lib${_lib}.so .endif # } # Build and install rules -MKDEP_SUFFIXES?= .o .po .so .go .ln +MKDEP_SUFFIXES?= .o .po .pico .go .ln CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include} CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++} @@ -127,8 +127,8 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR} # add additional suffixes not exported. # .po is used for profiling object files. -# .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 +# .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 .SUFFIXES: .sh .m4 .m @@ -146,14 +146,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 .so objects. +# FPICFLAGS: flags for ${FC} to compile .[fF] files to .pico 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 .so objects. +# CSHLIBFLAGS: flags for ${CC} to compile .[cC] files to .pico objects. # (usually includes ${CPICFLAGS}) # CAPICFLAGS: flags for ${CC} to compiling .[Ss] files # (usually just ${CPPPICFLAGS} ${CPICFLAGS}) -# APICFLAGS: flags for ${AS} to assemble .[sS] to .so objects. +# APICFLAGS: flags for ${AS} to assemble .[sS] to .pico objects. .if ${MACHINE_ARCH} == alpha # { @@ -229,7 +229,7 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.c} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET} -.c.so: +.c.pico: ${_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 +254,7 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.cc} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET} -.cc.so .cpp.so .cxx.so .C.so: +.cc.pico .cpp.pico .cxx.pico .C.pico: ${_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 +279,7 @@ FFLAGS+= ${FOPTS} ${_MKTARGET_COMPILE} ${COMPILE.f} ${DEBUGFLAGS} -g ${.IMPSRC} -o ${.TARGET} -.f.so: +.f.pico:
CVS commit: [netbsd-5] src/share/mk
Module Name:src Committed By: riz Date: Mon Aug 8 19:50:30 UTC 2011 Modified Files: src/share/mk [netbsd-5]: bsd.x11.mk Log Message: Pull up following revision(s) (requested by dholland in ticket #1646): share/mk/bsd.x11.mk: revision 1.98 Fix the value of appdefaultdir that ends up in native X .pc files. (It should be app-defaults but was app-default, probably because of a typo; it's been wrong ever since this logic was put in two and a half years ago, and as app-defaults files are a legacy mechanism it took this long for anyone to notice.) Should be pulled up to -5. To generate a diff of this commit: cvs rdiff -u -r1.70.2.2 -r1.70.2.3 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.70.2.2 src/share/mk/bsd.x11.mk:1.70.2.3 --- src/share/mk/bsd.x11.mk:1.70.2.2 Thu Sep 17 04:24:42 2009 +++ src/share/mk/bsd.x11.mk Mon Aug 8 19:50:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.70.2.2 2009/09/17 04:24:42 snj Exp $ +# $NetBSD: bsd.x11.mk,v 1.70.2.3 2011/08/08 19:50:30 riz Exp $ .include bsd.init.mk @@ -265,7 +265,7 @@ s,@libdir@,\\$$\{prefix\}/lib,; \ s,@includedir@,\\$$\{prefix\}/include,; \ s,@datarootdir@,\\$$\{prefix\}/share,; \ - s,@appdefaultdir@,\\$$\{libdir}/X11/app-default,; \ + s,@appdefaultdir@,\\$$\{libdir}/X11/app-defaults,; \ s,@MAPDIR@,\\$$\{libdir\}/X11/fonts/util,; \ s,@ICONDIR@,\\$$\{datarootdir\}/icons,; \ s,@PACKAGE_VERSION@,$${_pkg_version},; \
CVS commit: [netbsd-5] src/share/mk
Module Name:src Committed By: snj Date: Tue Oct 20 01:28:59 UTC 2009 Modified Files: src/share/mk [netbsd-5]: bsd.own.mk Log Message: Pull up following revision(s) (requested by rmind in ticket #1107): share/mk/bsd.own.mk: revision 1.571 add sunleo To generate a diff of this commit: cvs rdiff -u -r1.542.2.10 -r1.542.2.11 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.542.2.10 src/share/mk/bsd.own.mk:1.542.2.11 --- src/share/mk/bsd.own.mk:1.542.2.10 Thu Sep 17 04:24:42 2009 +++ src/share/mk/bsd.own.mk Tue Oct 20 01:28:59 2009 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.542.2.10 2009/09/17 04:24:42 snj Exp $ +# $NetBSD: bsd.own.mk,v 1.542.2.11 2009/10/20 01:28:59 snj Exp $ .if !defined(_BSD_OWN_MK_) _BSD_OWN_MK_=1 @@ -872,8 +872,8 @@ .for _v in \ ag10e apm ark ast ati chips cirrus crime cyrix glint i128 i740 imstt \ intel mach64 mga neomagic newport nsc nv nvxbox pnozz r128 radeonhd \ - rendition s3 s3virge savage siliconmotion sis sunffb suncg6 suntcx \ - tdfx tga trident tseng vesa vga via vmware wsfb + rendition s3 s3virge savage siliconmotion sis sunffb suncg6 sunleo \ + suntcx tdfx tga trident tseng vesa vga via vmware wsfb X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist .endfor