From owner-svn-src-head@freebsd.org Tue Mar 24 21:45:28 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A8D8126BA63; Tue, 24 Mar 2020 21:45:28 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48n4YM3dywz4cl5; Tue, 24 Mar 2020 21:45:27 +0000 (UTC) (envelope-from emaste@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 48C636811; Tue, 24 Mar 2020 21:37:35 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02OLbZMh025154; Tue, 24 Mar 2020 21:37:35 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02OLbZkW025153; Tue, 24 Mar 2020 21:37:35 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003242137.02OLbZkW025153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 24 Mar 2020 21:37:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359286 - head X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 359286 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2020 21:45:28 -0000 Author: emaste Date: Tue Mar 24 21:37:34 2020 New Revision: 359286 URL: https://svnweb.freebsd.org/changeset/base/359286 Log: Makefile.inc1: remove old (2018) stale dependency hacks We handle a number of stale dependency issues on an ad-hoc basis, in order to support ongoing NO_CLEAN builds. These hacks do not need to be maintained indefinitely; now remove those for issues that are more than a year old. Sponsored by: The FreeBSD Foundation Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Mar 24 21:28:48 2020 (r359285) +++ head/Makefile.inc1 Tue Mar 24 21:37:34 2020 (r359286) @@ -962,9 +962,8 @@ _cleanobj_fast_depend_hack: .PHONY fi .endif .endfor -# 20180604 r334626 brk sbrk # 20190916 r352703 shm_open -.for f in brk sbrk shm_open +.for f in shm_open @if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \ egrep -qw '${f}\.[sS]' ${OBJTOP}/lib/libc/.depend.${f}.o; then \ echo "Removing stale dependencies for ${f} syscall wrappers"; \ @@ -972,37 +971,6 @@ _cleanobj_fast_depend_hack: .PHONY ${_LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \ fi .endfor -# 20181013 r339348 bcopy reimplemented as .c -.for f in bcopy memcpy memmove - @if [ -e "${OBJTOP}/lib/libc/.depend.${f}.o" ] && \ - egrep -qw 'bcopy\.[sS]' ${OBJTOP}/lib/libc/.depend.${f}.o; then \ - echo "Removing stale dependencies for bcopy"; \ - rm -f ${OBJTOP}/lib/libc/.depend.${f}.* \ - ${_LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \ - fi -.endfor -# 20181115 r340463 bzero reimplemented as .c - @if [ -e "${OBJTOP}/lib/libc/.depend.bzero.o" ] && \ - egrep -qw 'bzero\.[sS]' ${OBJTOP}/lib/libc/.depend.bzero.o; then \ - echo "Removing stale dependencies for bzero"; \ - rm -f ${OBJTOP}/lib/libc/.depend.bzero.* \ - ${_LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.bzero.*}; \ - fi -# 20181009 track migration from ntp's embedded libevent to updated one - @if [ -e "${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o" ] && \ - egrep -q 'contrib/ntp/sntp/libevent/bufferevent_openssl.c' \ - ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o ; then \ - echo "Removing stale libevent dependencies"; \ - rm -f ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.*; \ - fi - -# 20181209 r341759 track migration across wpa update - @if [ -e "${OBJTOP}/usr.sbin/wpa/wpa_supplicant/.depend.rrm.o" ] && \ - egrep -q 'src/ap/rrm.c' \ - ${OBJTOP}/usr.sbin/wpa/wpa_supplicant/.depend.rrm.o; then \ - echo "Removing stale wpa dependencies"; \ - rm -f ${OBJTOP}/usr.sbin/wpa/*/.depend*; \ - fi _worldtmp: .PHONY @echo