From owner-freebsd-current@freebsd.org Sun Dec 20 01:57:41 2015 Return-Path: Delivered-To: freebsd-current@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 62D67A14CFD for ; Sun, 20 Dec 2015 01:57:41 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-pa0-x235.google.com (mail-pa0-x235.google.com [IPv6:2607:f8b0:400e:c03::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 39C121938; Sun, 20 Dec 2015 01:57:41 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-pa0-x235.google.com with SMTP id jx14so51619605pad.2; Sat, 19 Dec 2015 17:57:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=/54noRMAZ2fVc8bjyQsP9Q+pvikZmDeLnW2C7PdS2GM=; b=J/Kt7QCS3pGnzgWxgPO/Zurs2lyYmbAee9Ww/jPFIbemGKfo6fSofRplxOD5M0J4MQ PclnSjuR0FHMfPsavvHxqroVINNIbVB7j+esHQs2MNJizjmaALYELXPuI+lFPDVyz6uN S95IDb6XRi0B9q8UFm5Xh0E4ITTAHAY0rdPtBc1X759pGZEU6zYqdQ8VT0oIkTX6sZBj dTiC7sFdqI30gGk0yb7P60NrXp3NwPm2VcFlzW9iQzqGlNlJqEOrw/FxeaXlvSPSYbHF A7jOCkGJro4o33qmD7ajL14ClJumlyB5VZnSUuLfl3vxQDWBxaYdmrnjXZqgiWYlCKj8 /IaA== X-Received: by 10.67.3.230 with SMTP id bz6mr16892409pad.118.1450576660929; Sat, 19 Dec 2015 17:57:40 -0800 (PST) Received: from charmander ([162.17.188.113]) by smtp.gmail.com with ESMTPSA id by2sm30602053pab.20.2015.12.19.17.57.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Dec 2015 17:57:40 -0800 (PST) Sender: Mark Johnston Date: Sat, 19 Dec 2015 17:57:35 -0800 From: Mark Johnston To: NGie Cooper Cc: FreeBSD CURRENT , Bryan Drewery Subject: Re: Build error on i386 when building Message-ID: <20151220015735.GA48337@charmander> References: <468DF7A4-47F9-4460-A41F-226A799EA645@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <468DF7A4-47F9-4460-A41F-226A799EA645@gmail.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2015 01:57:41 -0000 On Sat, Dec 19, 2015 at 05:03:51PM -0800, NGie Cooper wrote: > Hi Mark, > I ran into the following error when trying to build the dtrace tests on i386 (both with 10.2-RELEASE-p7 and 11.0-CURRENT) — have you seen this issue before? Yes, that's because drti.o in stable/10 depends on libelf. The change which removes the libelf dependency shouldn't be MFCed because it breaks compatibility. When building an MFCed test suite on stable/10, you'll need to link the test programs against libelf. When building current on stable/10, dtrace(1) should use the drti.o from the objdir rather than the installed base. The diff below should solve these two problems. diff --git a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk index 0c528ef..dcec33a 100644 --- a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk +++ b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk @@ -30,6 +30,8 @@ SRCS.${prog}+= ${prog:S/.exe$/.c/} .if exists(${prog:S/^tst.//:S/.exe$/.d/}) SRCS.${prog}+= ${prog:S/^tst.//:S/.exe$/.d/} +LDADD.${prog}+= -lelf +DPADD.${prog}+= ${LIBELF} .endif .endfor diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 8fe6b68..1eeb0b9 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -128,7 +128,7 @@ CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sig PO_CXXFLAGS ?= ${CXXFLAGS} DTRACE ?= dtrace -DTRACEFLAGS ?= -C -x nolibs +DTRACEFLAGS ?= -C -x nolibs -x libdir=${.OBJDIR}/cddl/lib/drti .if empty(.MAKEFLAGS:M-s) ECHO ?= echo