svn commit: r344530 - in head: . lib/libifconfig share/mk sys/sys

[Ed Maste]

Author: emaste
Date: Mon Feb 25 18:22:20 2019
New Revision: 344530
URL: https://svnweb.freebsd.org/changeset/base/344530

Log:
  Make libifconfig INTERNALLIB
  
  Instead of PRIVATELIB + NO_PIC.  This avoids the need for the wlandebug
  PIE special case added in r344211, and provides a stronger guarantee
  against 3rd party software coming to depend on the API or ABI.
  
  If / when we declare the API/ABI to be stable we can make it a normal
  library.
  
  Discussed with:	bapt
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/ObsoleteFiles.inc
  head/lib/libifconfig/Makefile
  head/share/mk/bsd.libnames.mk
  head/share/mk/src.libnames.mk
  head/sys/sys/capability.h

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Mon Feb 25 18:11:59 2019	(r344529)
+++ head/ObsoleteFiles.inc	Mon Feb 25 18:22:20 2019	(r344530)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20190222: libifconfig made INTERNALLIB
+OLD_FILES+=/usr/lib/libprivateifconfig.a
+OLD_FILES+=/usr/lib/libprivateifconfig_p.a
 # 20190131: pfil(9) changed
 OLD_FILES+=usr/share/man/man9/pfil_hook_get.9
 OLD_FILES+=usr/share/man/man9/pfil_rlock.9

Modified: head/lib/libifconfig/Makefile
==============================================================================
--- head/lib/libifconfig/Makefile	Mon Feb 25 18:11:59 2019	(r344529)
+++ head/lib/libifconfig/Makefile	Mon Feb 25 18:22:20 2019	(r344530)
@@ -2,9 +2,7 @@
 
 PACKAGE=	lib${LIB}
 LIB=		ifconfig
-PRIVATELIB=	true
-# Don't build shared library, for now.
-NO_PIC= 
+INTERNALLIB=	true
 
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	1

Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk	Mon Feb 25 18:11:59 2019	(r344529)
+++ head/share/mk/bsd.libnames.mk	Mon Feb 25 18:22:20 2019	(r344530)
@@ -80,7 +80,6 @@ LIBIBMAD?=	${LIBDESTDIR}${LIBDIR_BASE}/libibmad.a
 LIBIBNETDISC?=	${LIBDESTDIR}${LIBDIR_BASE}/libibnetdisc.a
 LIBIBUMAD?=	${LIBDESTDIR}${LIBDIR_BASE}/libibumad.a
 LIBIBVERBS?=	${LIBDESTDIR}${LIBDIR_BASE}/libibverbs.a
-LIBIFCONFIG?=	${LIBDESTDIR}${LIBDIR_BASE}/libifconfig.a
 LIBIPSEC?=	${LIBDESTDIR}${LIBDIR_BASE}/libipsec.a
 LIBIPT?=	${LIBDESTDIR}${LIBDIR_BASE}/libipt.a
 LIBJAIL?=	${LIBDESTDIR}${LIBDIR_BASE}/libjail.a

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Mon Feb 25 18:11:59 2019	(r344529)
+++ head/share/mk/src.libnames.mk	Mon Feb 25 18:22:20 2019	(r344530)
@@ -20,7 +20,6 @@ _PRIVATELIBS=	\
 		event \
 		heimipcc \
 		heimipcs \
-		ifconfig \
 		ldns \
 		sqlite3 \
 		ssh \
@@ -35,6 +34,7 @@ _INTERNALLIBS=	\
 		cron \
 		elftc \
 		fifolog \
+		ifconfig \
 		ipf \
 		lpr \
 		netbsd \
@@ -449,6 +449,9 @@ LIBVERS?=	${LIBVERSDIR}/libvers${PIE_SUFFIX}.a
 
 LIBSLDIR=	${OBJTOP}/kerberos5/lib/libsl
 LIBSL?=		${LIBSLDIR}/libsl${PIE_SUFFIX}.a
+
+LIBIFCONFIGDIR=	${OBJTOP}/lib/libifconfig
+LIBIFCONFIG?=	${LIBIFCONFIGDIR}/libifconfig${PIE_SUFFIX}.a
 
 LIBIPFDIR=	${OBJTOP}/sbin/ipf/libipf
 LIBIPF?=	${LIBIPFDIR}/libipf${PIE_SUFFIX}.a

Modified: head/sys/sys/capability.h
==============================================================================
--- head/sys/sys/capability.h	Mon Feb 25 18:11:59 2019	(r344529)
+++ head/sys/sys/capability.h	Mon Feb 25 18:22:20 2019	(r344530)
@@ -35,13 +35,13 @@
  * Historically, the key userspace and kernel Capsicum definitions were found
  * in this file.  However, it conflicted with POSIX.1e's capability.h, so has
  * been renamed capsicum.h.  The file remains for backwards compatibility
- * reasons as a nested include.  It is expected to be removed before
- * FreeBSD 13.
+ * reasons as a nested include.  It will be removed on March 31, 2019 and will
+ * not be in FreeBSD 13.
  */
 #ifndef _SYS_CAPABILITY_H_
 #define	_SYS_CAPABILITY_H_
 
-#warning this file includes <sys/capability.h> which is deprecated
+#warning this file includes <sys/capability.h>, to be removed on March 31, 2019.
 #include <sys/capsicum.h>
 
 #endif /* !_SYS_CAPABILITY_H_ */