From owner-svn-src-head@freebsd.org Wed Nov 25 19:13:38 2015 Return-Path: Delivered-To: svn-src-head@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 3A25DA370DC; Wed, 25 Nov 2015 19:13:38 +0000 (UTC) (envelope-from bdrewery@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 C3209116B; Wed, 25 Nov 2015 19:13:37 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAPJDaes094752; Wed, 25 Nov 2015 19:13:36 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAPJDaS0094748; Wed, 25 Nov 2015 19:13:36 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201511251913.tAPJDaS0094748@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 25 Nov 2015 19:13:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291313 - in head/lib: libproc librtld_db X-SVN-Group: head 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.20 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: Wed, 25 Nov 2015 19:13:38 -0000 Author: bdrewery Date: Wed Nov 25 19:13:35 2015 New Revision: 291313 URL: https://svnweb.freebsd.org/changeset/base/291313 Log: META MODE: Rework circular dependency guard for librtld_db/libproc. librtld_db only needs libutil.h to build, not the libproc library. So it can safely use its header and allow libproc to depend on librtld_rb to be built first to link. This is required after fixing ld --sysroot in r291226. Sponsored by: EMC / Isilon Storage Division Modified: head/lib/libproc/Makefile head/lib/libproc/Makefile.depend head/lib/librtld_db/Makefile head/lib/librtld_db/Makefile.depend Modified: head/lib/libproc/Makefile ============================================================================== --- head/lib/libproc/Makefile Wed Nov 25 19:13:32 2015 (r291312) +++ head/lib/libproc/Makefile Wed Nov 25 19:13:35 2015 (r291313) @@ -14,9 +14,6 @@ SRCS= proc_bkpt.c \ INCS= libproc.h CFLAGS+= -I${.CURDIR} -# avoid cyclic dependency -CFLAGS+= -I${.CURDIR:H}/librtld_db -GENDIRDEPS_FILTER+= Nlib/librtld_db .if ${MK_CXX} == "no" CFLAGS+= -DNO_CXA_DEMANGLE Modified: head/lib/libproc/Makefile.depend ============================================================================== --- head/lib/libproc/Makefile.depend Wed Nov 25 19:13:32 2015 (r291312) +++ head/lib/libproc/Makefile.depend Wed Nov 25 19:13:35 2015 (r291313) @@ -12,6 +12,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libcxxrt \ lib/libelf \ + lib/librtld_db \ lib/libutil \ Modified: head/lib/librtld_db/Makefile ============================================================================== --- head/lib/librtld_db/Makefile Wed Nov 25 19:13:32 2015 (r291312) +++ head/lib/librtld_db/Makefile Wed Nov 25 19:13:35 2015 (r291313) @@ -10,5 +10,7 @@ SRCS= rtld_db.c INCS= rtld_db.h CFLAGS+= -I${.CURDIR} +# Avoid circular dependency, we only need the libproc.h header here. +CFLAGS+= -I${.CURDIR:H}/libproc .include Modified: head/lib/librtld_db/Makefile.depend ============================================================================== --- head/lib/librtld_db/Makefile.depend Wed Nov 25 19:13:32 2015 (r291312) +++ head/lib/librtld_db/Makefile.depend Wed Nov 25 19:13:35 2015 (r291313) @@ -10,7 +10,6 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libelf \ - lib/libproc \ lib/libutil \