svn commit: r313242 - in stable/11: . usr.sbin/bsnmpd/tools usr.sbin/bsnmpd/tools/bsnmptools usr.sbin/bsnmpd/tools/libbsnmptools

[Ngie Cooper]

Author: ngie
Date: Sat Feb  4 17:21:17 2017
New Revision: 313242
URL: https://svnweb.freebsd.org/changeset/base/313242

Log:
  MFC r311174:
  
  Make /usr/lib/libbsnmptools.so.0 into an INTERRNALLIB
  
  Although it increases the size of the bsnmp{get,set,walk} binaries by
  four on my [amd64] system, it removes the need for producing .debug
  files, profiled libraries, and for installing the library itself,
  reducing the overall size use on disk by the utilities noted
  previously.
  
  Plus, it guards against ABI/API compatibility issues with the library
  as it's only used internal to the tools themselves.

Modified:
  stable/11/ObsoleteFiles.inc
  stable/11/usr.sbin/bsnmpd/tools/Makefile
  stable/11/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
  stable/11/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/ObsoleteFiles.inc
==============================================================================
--- stable/11/ObsoleteFiles.inc	Sat Feb  4 17:18:49 2017	(r313241)
+++ stable/11/ObsoleteFiles.inc	Sat Feb  4 17:21:17 2017	(r313242)
@@ -38,6 +38,11 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20170103: libbsnmptools.so made into an INTERNALLIB
+OLD_FILES+=usr/lib/libbsnmptools.a
+OLD_FILES+=usr/lib/libbsnmptools_p.a
+OLD_LIBS+=usr/lib/libbsnmptools.so.0
+OLD_LIBS+=usr/lib/libbsnmptools.so
 # 20170112: sysdecode_getfsstat_flags() renamed to sysdecode_getfsstat_mode()
 OLD_FILES+=usr/share/man/man3/sysdecode_getfsstat_flags.3.gz
 # 20161229: Three files from gnop tests consolidated into one

Modified: stable/11/usr.sbin/bsnmpd/tools/Makefile
==============================================================================
--- stable/11/usr.sbin/bsnmpd/tools/Makefile	Sat Feb  4 17:18:49 2017	(r313241)
+++ stable/11/usr.sbin/bsnmpd/tools/Makefile	Sat Feb  4 17:21:17 2017	(r313242)
@@ -4,4 +4,8 @@
 SUBDIR=	libbsnmptools \
 	bsnmptools
 
+SUBDIR_DEPEND_bsnmptools=	libbsnmptools
+
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>

Modified: stable/11/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
==============================================================================
--- stable/11/usr.sbin/bsnmpd/tools/bsnmptools/Makefile	Sat Feb  4 17:18:49 2017	(r313241)
+++ stable/11/usr.sbin/bsnmpd/tools/bsnmptools/Makefile	Sat Feb  4 17:21:17 2017	(r313242)
@@ -8,7 +8,9 @@
 PROG=	bsnmpget
 
 LIBADD=	bsnmp bsnmptools
-CFLAGS+=	-I${.CURDIR}/../libbsnmptools
+
+CFLAGS+=	-I${.CURDIR:H}/libbsnmptools
+LDFLAGS+=	-L${.OBJDIR:H}/libbsnmptools
 
 LINKS=  ${BINDIR}/bsnmpget ${BINDIR}/bsnmpwalk
 LINKS+=  ${BINDIR}/bsnmpget ${BINDIR}/bsnmpset

Modified: stable/11/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile
==============================================================================
--- stable/11/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile	Sat Feb  4 17:18:49 2017	(r313241)
+++ stable/11/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile	Sat Feb  4 17:21:17 2017	(r313242)
@@ -5,9 +5,9 @@
 .PATH: ${.CURDIR}
 
 LIB=	bsnmptools
-#INTERNALLIB=
+
 SRCS=	bsnmpimport.c bsnmpmap.c bsnmptools.c bsnmptc.c
 
-SHLIB_MAJOR=	0
+INTERNALLIB=
 
 .include <bsd.lib.mk>