CVS commit: [netbsd-7] src/share/mk
Module Name:src
Committed By: snj
Date: Fri Aug 25 03:49:26 UTC 2017
Modified Files:
src/share/mk [netbsd-7]: bsd.prog.mk
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1493):
share/mk/bsd.prog.mk: revision 1.301
add sqlite3 to statically linked libraries for pam.
To generate a diff of this commit:
cvs rdiff -u -r1.290.4.1 -r1.290.4.2 src/share/mk/bsd.prog.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.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.290.4.1 src/share/mk/bsd.prog.mk:1.290.4.2
--- src/share/mk/bsd.prog.mk:1.290.4.1 Wed Jun 10 17:16:24 2015
+++ src/share/mk/bsd.prog.mk Fri Aug 25 03:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.290.4.1 2015/06/10 17:16:24 snj Exp $
+# $NetBSD: bsd.prog.mk,v 1.290.4.2 2017/08/25 03:49:26 snj Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -218,9 +218,9 @@ PAM_STATIC_DPADD+= ${LIBSSH}
.endif
.if (${MKKERBEROS} != "no")
PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \
- -lroken -lcom_err -lheimbase -lcrypto
+ -lroken -lcom_err -lheimbase -lcrypto -lsqlite3
PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
- ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO}
+ ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} ${LIBSQLITE3}
.endif
.if (${MKSKEY} != "no")
PAM_STATIC_LDADD+= -lskey
CVS commit: [netbsd-7] src/share/mk
Module Name:src
Committed By: snj
Date: Fri Jun 5 17:03:43 UTC 2015
Modified Files:
src/share/mk [netbsd-7]: bsd.lib.mk
Log Message:
Pull up following revision(s) (requested by riz in ticket #825):
share/mk/bsd.lib.mk: revision 1.358 via patch
fix MKDEBUG vs parallel builds. split the creation of the final
.so file from the main link of it, and use the main file as the
input for both the .so output and the .so.debug file. for MKDEBUG
builds we now:
(a) create the (new) .so.full file
(d) create the .so.debug file
(c) create the (installable) .so file
for other builds, we simply use the same rule for (a) to create (c).
this stops the .so.debug rule from modifying the .so rule's target
and leading to mayhem.
see this thread for more details:
http://mail-index.netbsd.org/tech-toolchain/2015/06/03/msg002616.html
To generate a diff of this commit:
cvs rdiff -u -r1.355 -r1.355.2.1 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.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.355 src/share/mk/bsd.lib.mk:1.355.2.1
--- src/share/mk/bsd.lib.mk:1.355 Fri Jun 13 01:17:45 2014
+++ src/share/mk/bsd.lib.mk Fri Jun 5 17:03:43 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.355 2014/06/13 01:17:45 mrg Exp $
+# $NetBSD: bsd.lib.mk,v 1.355.2.1 2015/06/05 17:03:43 snj Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include bsd.init.mk
@@ -406,6 +406,7 @@ _LIB.ln:=llib-l${LIB}.ln
_LIB.so:=${_LIB}.so
_LIB.so.major:=${_LIB}.so.${SHLIB_MAJOR}
_LIB.so.full:=${_LIB}.so.${SHLIB_FULLVERSION}
+_LIB.so.link:=${_LIB}.so.${SHLIB_FULLVERSION}.link
.if ${MKDEBUG} != no
_LIB.so.debug:=${_LIB.so.full}.debug
.endif
@@ -614,8 +615,25 @@ LIBCC:= ${CC}
_LDADD.${_LIB}= ${LDADD} ${LDADD.${_LIB}}
_LDFLAGS.${_LIB}= ${LDFLAGS} ${LDFLAGS.${_LIB}}
-${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPLIBC} \
-${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
+_MAINLIBDEPS= ${SOLIB} ${DPADD} ${DPLIBC} \
+ ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
+
+.if defined(_LIB.so.debug)
+${_LIB.so.debug}: ${_LIB.so.link}
+ ${_MKTARGET_CREATE}
+ ( ${OBJCOPY} --only-keep-debug \
+ ${_LIB.so.link} ${_LIB.so.debug} \
+ ) || (rm -f ${.TARGET}; false)
+${_LIB.so.full}: ${_LIB.so.link} ${_LIB.so.debug}
+ ${_MKTARGET_CREATE}
+ ( ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
+ --add-gnu-debuglink=${_LIB.so.debug} \
+ ${_LIB.so.link} ${_LIB.so.full} \
+ ) || (rm -f ${.TARGET}; false)
+${_LIB.so.link}: ${_MAINLIBDEPS}
+.else # aka no MKDEBUG
+${_LIB.so.full}: ${_MAINLIBDEPS}
+.endif
${_MKTARGET_BUILD}
rm -f ${.TARGET}
${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} \
@@ -625,6 +643,8 @@ ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
# We don't use INSTALL_SYMLINK here because this is just
# happening inside the build directory/objdir. XXX Why does
# this spend so much effort on libraries that aren't live??? XXX
+# XXX Also creates dead symlinks until the .full rule runs
+# above and creates the main link
.if defined(SHLIB_FULLVERSION) defined(SHLIB_MAJOR) \
${SHLIB_FULLVERSION} != ${SHLIB_MAJOR}
${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so.major}.tmp
@@ -636,15 +656,6 @@ ${_LIB.so.full}: ${SOLIB} ${DPADD} ${DPL
${OBJCOPY} -R .ident ${.TARGET}
.endif
-.if defined(_LIB.so.debug)
-${_LIB.so.debug}: ${_LIB.so.full}
- ${_MKTARGET_CREATE}
- ( ${OBJCOPY} --only-keep-debug ${_LIB.so.full} ${_LIB.so.debug} \
- ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
- --add-gnu-debuglink=${_LIB.so.debug} ${_LIB.so.full} \
- ) || (rm -f ${.TARGET}; false)
-.endif
-
.if !empty(LOBJS) # {
LLIBS?= -lc
${_LIB.ln}: ${LOBJS}
CVS commit: [netbsd-7] src/share/mk
Module Name:src
Committed By: snj
Date: Sat Apr 11 05:36:13 UTC 2015
Modified Files:
src/share/mk [netbsd-7]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by mrg in ticket #674):
share/mk/bsd.own.mk: revision 1.845
remove support to look for GCC 4.5 in gcc.old.
To generate a diff of this commit:
cvs rdiff -u -r1.829.2.5 -r1.829.2.6 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.829.2.5 src/share/mk/bsd.own.mk:1.829.2.6
--- src/share/mk/bsd.own.mk:1.829.2.5 Mon Mar 9 08:45:26 2015
+++ src/share/mk/bsd.own.mk Sat Apr 11 05:36:13 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.829.2.5 2015/03/09 08:45:26 snj Exp $
+# $NetBSD: bsd.own.mk,v 1.829.2.6 2015/04/11 05:36:13 snj Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -72,9 +72,7 @@ HAVE_GCC?=48
# We import the old gcc as gcc.old when upgrading. EXTERNAL_GCC_SUBDIR is
# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
#
-.if ${HAVE_GCC} == 45
-EXTERNAL_GCC_SUBDIR= gcc.old
-.elif ${HAVE_GCC} == 48
+.if ${HAVE_GCC} == 48
EXTERNAL_GCC_SUBDIR= gcc
.else
EXTERNAL_GCC_SUBDIR= /does/not/exist
CVS commit: [netbsd-7] src/share/mk
Module Name:src
Committed By: snj
Date: Wed Mar 18 08:12:16 UTC 2015
Modified Files:
src/share/mk [netbsd-7]: bsd.README
Log Message:
Pull up following revision(s) (requested by mrg in ticket #615):
share/mk/bsd.README: revision 1.339
fix the description of MKX11RADEONKMS, as pointed out in PR#49753.
To generate a diff of this commit:
cvs rdiff -u -r1.335.2.1 -r1.335.2.2 src/share/mk/bsd.README
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.335.2.1 src/share/mk/bsd.README:1.335.2.2
--- src/share/mk/bsd.README:1.335.2.1 Mon Mar 9 08:45:26 2015
+++ src/share/mk/bsd.README Wed Mar 18 08:12:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.335.2.1 2015/03/09 08:45:26 snj Exp $
+# $NetBSD: bsd.README,v 1.335.2.2 2015/03/18 08:12:16 snj Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -415,7 +415,7 @@ MKX11MOTIF: If yes and ${X11FLAVOUR} i
MKX11RADEONKMS If no, build the xf86-video-ati 6.x driver (the last one
with user-mode switching support), otherwise build the
kernek-mode switching (KMS) requiring driver.
- Default: yes on i386 and amd64, yes elsewhere.
+ Default: yes on i386 and amd64, no elsewhere.
MKYP If no, disables building of YP (NIS)
infrastructure (libraries and support programs).
CVS commit: [netbsd-7] src/share/mk
Module Name:src
Committed By: snj
Date: Mon Feb 9 00:25:33 UTC 2015
Modified Files:
src/share/mk [netbsd-7]: bsd.own.mk
Log Message:
Apply patch (requested by chs in ticket #499):
Switch powerpc64 and m68k to gcc 4.8.
To generate a diff of this commit:
cvs rdiff -u -r1.829.2.2 -r1.829.2.3 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.829.2.2 src/share/mk/bsd.own.mk:1.829.2.3
--- src/share/mk/bsd.own.mk:1.829.2.2 Fri Jan 2 20:47:51 2015
+++ src/share/mk/bsd.own.mk Mon Feb 9 00:25:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.829.2.2 2015/01/02 20:47:51 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.829.2.3 2015/02/09 00:25:33 snj Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -61,13 +61,7 @@ MKGCC?= no
#
.if ${MKGCC:Uyes} != no
-# Platforms still using GCC 4.5
-.if \
- ${MACHINE_CPU} == m68k || \
- ${MACHINE_ARCH} == powerpc64
-HAVE_GCC?=45
-
-.elif ${MACHINE} == playstation2 || ${MACHINE_CPU} == aarch64
+.if ${MACHINE} == playstation2 || ${MACHINE_CPU} == aarch64
HAVE_GCC?=0
.else
# Otherwise, default to GCC4.8
CVS commit: [netbsd-7] src/share/mk
Module Name:src
Committed By: martin
Date: Fri Jan 2 20:47:51 UTC 2015
Modified Files:
src/share/mk [netbsd-7]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by mrg in ticket #371):
share/mk/bsd.own.mk: revision 1.839
switch PPC to GCC 4.8.
To generate a diff of this commit:
cvs rdiff -u -r1.829.2.1 -r1.829.2.2 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.829.2.1 src/share/mk/bsd.own.mk:1.829.2.2
--- src/share/mk/bsd.own.mk:1.829.2.1 Tue Dec 23 02:58:33 2014
+++ src/share/mk/bsd.own.mk Fri Jan 2 20:47:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.829.2.1 2014/12/23 02:58:33 snj Exp $
+# $NetBSD: bsd.own.mk,v 1.829.2.2 2015/01/02 20:47:51 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -64,7 +64,6 @@ MKGCC?= no
# Platforms still using GCC 4.5
.if \
${MACHINE_CPU} == m68k || \
- ${MACHINE_ARCH} == powerpc || \
${MACHINE_ARCH} == powerpc64
HAVE_GCC?=45
CVS commit: [netbsd-7] src/share/mk
Module Name:src
Committed By: snj
Date: Tue Dec 23 02:58:33 UTC 2014
Modified Files:
src/share/mk [netbsd-7]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by mrg in ticket #342):
share/mk/bsd.own.mk: revision 1.838
add X11SRCDIR entries for the new separated mesa components.
To generate a diff of this commit:
cvs rdiff -u -r1.829 -r1.829.2.1 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.829 src/share/mk/bsd.own.mk:1.829.2.1
--- src/share/mk/bsd.own.mk:1.829 Mon Aug 11 03:43:25 2014
+++ src/share/mk/bsd.own.mk Tue Dec 23 02:58:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.829 2014/08/11 03:43:25 jnemeth Exp $
+# $NetBSD: bsd.own.mk,v 1.829.2.1 2014/12/23 02:58:33 snj Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1250,8 +1250,9 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
xtrans fontconfig expat freetype evieext mkfontscale bdftopcf \
xkbcomp xorg-cf-files imake xorg-server xbiff xkbdata xkeyboard-config \
xbitmaps appres xeyes xev xedit sessreg pixman \
- beforelight bitmap editres makedepend fonttosfnt fslsfonts \
- fstobdf MesaDemos MesaGLUT MesaLib ico iceauth lbxproxy listres lndir \
+ beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
+ glu glw mesa-demos MesaDemos MesaGLUT MesaLib \
+ ico iceauth lbxproxy listres lndir \
luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
setxkbmap smproxy twm viewres x11perf xauth xcalc xclipboard \
xclock xcmsdb xconsole xcutsel xditview xdpyinfo xdriinfo xdm \
