From owner-svn-src-all@freebsd.org  Fri Dec 25 11:29:19 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF722A50D32;
 Fri, 25 Dec 2015 11:29:19 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8F0831FDE;
 Fri, 25 Dec 2015 11:29:19 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBPBTIOC058827;
 Fri, 25 Dec 2015 11:29:18 GMT (envelope-from cperciva@FreeBSD.org)
Received: (from cperciva@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBPBTIZp058825;
 Fri, 25 Dec 2015 11:29:18 GMT (envelope-from cperciva@FreeBSD.org)
Message-Id: <201512251129.tBPBTIZp058825@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cperciva set sender to
 cperciva@FreeBSD.org using -f
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 25 Dec 2015 11:29:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292723 - in head: lib/libc share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Dec 2015 11:29:19 -0000

Author: cperciva
Date: Fri Dec 25 11:29:18 2015
New Revision: 292723
URL: https://svnweb.freebsd.org/changeset/base/292723

Log:
  Make libxnet.so a symlink to libc.so.  This makes `-lxnet` a no-op, as
  POSIX requires for the c99 compiler.
  
  (In fact, our c99(1) already ignores -lxnet; but our make(1) doesn't set
  ${CC} correctly, and our cc(1) treats xnet like any other library.)
  
  Reviewed by:	kib

Modified:
  head/lib/libc/Makefile
  head/share/mk/bsd.lib.mk

Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile	Fri Dec 25 11:17:21 2015	(r292722)
+++ head/lib/libc/Makefile	Fri Dec 25 11:29:18 2015	(r292723)
@@ -26,6 +26,7 @@ LIBC_ARCH=${MACHINE_CPUARCH}
 LIB=c
 SHLIB_MAJOR= 7
 SHLIB_LDSCRIPT=libc.ldscript
+SHLIB_LDSCRIPT_LINKS=libxnet.so
 WARNS?=	2
 CFLAGS+=-I${LIBC_SRCTOP}/include -I${LIBC_SRCTOP}/../../include
 CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH}

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk	Fri Dec 25 11:17:21 2015	(r292722)
+++ head/share/mk/bsd.lib.mk	Fri Dec 25 11:29:18 2015	(r292723)
@@ -368,6 +368,9 @@ _libinstall:
 	${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} ${SHLIB_LINK:R}.ld \
 	    ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
+.for _SHLIB_LINK_LINK in ${SHLIB_LDSCRIPT_LINKS}
+	${INSTALL_SYMLINK} ${SHLIB_LINK} ${DESTDIR}${_LIBDIR}/${_SHLIB_LINK_LINK}
+.endfor
 .else
 .if ${_SHLIBDIR} == ${_LIBDIR}
 	${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}