From owner-svn-src-head@FreeBSD.ORG Tue May 12 16:23:18 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3D8EC5F; Tue, 12 May 2015 16:23:18 +0000 (UTC) Received: from melamine.cuivre.fr.eu.org (houdart.cuivre.fr.eu.org [81.57.40.110]) (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 7C98B13B1; Tue, 12 May 2015 16:23:17 +0000 (UTC) Received: by melamine.cuivre.fr.eu.org (Postfix, from userid 1000) id E46623B47; Tue, 12 May 2015 18:23:12 +0200 (CEST) Date: Tue, 12 May 2015 18:23:12 +0200 From: Thomas Quinot To: d@delphij.net Cc: Bryan Drewery , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r282736 - in head: . lib/libmd Message-ID: <20150512162312.GA89899@melamine.cuivre.fr.eu.org> References: <201505102121.t4ALLr3A076661@svn.freebsd.org> <5551480E.90906@FreeBSD.org> <55514EFA.4040608@delphij.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55514EFA.4040608@delphij.net> X-message-flag: WARNING! Using Outlook can damage your computer. User-Agent: Mutt/1.5.23 (2014-03-12) 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: Tue, 12 May 2015 16:23:18 -0000 * Xin Li, 2015-05-12 : > On 05/11/15 17:23, Bryan Drewery wrote: > > The libmd changes break pkg - so all packages. > > > > http://beefy6.nyi.freebsd.org/data/head-amd64-default/p386108_s282785/ > logs/pkg-1.5.2.log > > > > > > > >> CCLD pkg-static /usr/lib/liblzma.a(check.o): In function > >> `lzma_check_init': > >> /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr > ib/xz/src/liblzma/check/check.c:(.text+0x5e): > >> undefined reference to `_libmd_SHA256_Init' > >> /usr/lib/liblzma.a(check.o): In function `lzma_check_update': > >> /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr > ib/xz/src/liblzma/check/check.c:(.text+0xbf): > >> undefined reference to `_libmd_SHA256_Update' > >> /usr/lib/liblzma.a(check.o): In function `lzma_check_finish': > >> /usr/local/poudriere/jails/head-amd64/usr/src/lib/liblzma/../../contr > ib/xz/src/liblzma/check/check.c:(.text+0x10d): > >> undefined reference to `_libmd_SHA256_Final' cc: error: linker > >> command failed with exit code 1 (use -v to see invocation) *** > >> [pkg-static] Error code 1 > > > > > > Can you please just revert this and 282726 until they are working > > and have a passing exp-run? > > Looks like this is because my change (r282775) which makes libmd a > dependency of liblzma, while pkg didn't catch up with, and it's > unrelated to libmd change. > > A quick hack would be: > > - --- src/Makefile.in.orig 2015-05-11 17:49:52.690333554 -0700 > +++ src/Makefile.in 2015-05-11 17:50:03.427853585 -0700 > @@ -617,7 +617,7 @@ > $(top_builddir)/compat/libbsd_compat.la \ > $(top_builddir)/external/libsbuf_static.la $(pkg_OBJECTS) \ > @LIBJAIL_LIB@ @LDNS_LIBS@ @OS_LIBS@ -larchive -lz -lutil -lbz2 \ > - - -llzma -lssl -lcrypto -lm $(am__append_1) $(am__append_2) \ > + -lmd -llzma -lssl -lcrypto -lm $(am__append_1) $(am__append_2) \ > $(am__append_3) > DYNPROG = pkg > @BUILD_STATIC_TRUE@pkg_static_LDFLAGS = -all-static > > But it would break earlier FreeBSD. Should I revert my change and > request for a exp-run? Xin, I'm assuming you are taking the lead on fixing this part. Could you please let me know if I can contribute, or if any change I made so far needs to be reverted? Thanks! Thomas.