From owner-svn-src-head@FreeBSD.ORG Tue May 12 01:21:47 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91391166 for ; Tue, 12 May 2015 01:21:47 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 732751889 for ; Tue, 12 May 2015 01:21:47 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t4C1LlBR017737 for ; Tue, 12 May 2015 01:21:47 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id t4C1LlRu017734 for svn-src-head@freebsd.org; Tue, 12 May 2015 01:21:47 GMT (envelope-from bdrewery) Received: (qmail 4855 invoked from network); 11 May 2015 20:21:45 -0500 Received: from unknown (HELO ?10.10.1.139?) (freebsd@shatow.net@10.10.1.139) by sweb.xzibition.com with ESMTPA; 11 May 2015 20:21:45 -0500 Message-ID: <555155BE.30604@FreeBSD.org> Date: Mon, 11 May 2015 20:22:06 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: d@delphij.net, Thomas Quinot , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r282736 - in head: . lib/libmd References: <201505102121.t4ALLr3A076661@svn.freebsd.org> <5551480E.90906@FreeBSD.org> <55514EFA.4040608@delphij.net> In-Reply-To: <55514EFA.4040608@delphij.net> OpenPGP: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="5gCrqb4kXNxSgIgNFXDfKv7Ne6135h6FP" 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 01:21:47 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --5gCrqb4kXNxSgIgNFXDfKv7Ne6135h6FP Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 5/11/2015 7:53 PM, Xin Li wrote: > On 05/11/15 17:23, Bryan Drewery wrote: >> The libmd changes break pkg - so all packages. >=20 >> http://beefy6.nyi.freebsd.org/data/head-amd64-default/p386108_s282785/= > logs/pkg-1.5.2.log >=20 >=20 >=20 >>> CCLD pkg-static /usr/lib/liblzma.a(check.o): In function >>> `lzma_check_init':=20 >>> /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'=20 >>> /usr/lib/liblzma.a(check.o): In function `lzma_check_update':=20 >>> /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'=20 >>> /usr/lib/liblzma.a(check.o): In function `lzma_check_finish':=20 >>> /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 >=20 >=20 >> Can you please just revert this and 282726 until they are working >> and have a passing exp-run? >=20 > 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. >=20 > A quick hack would be: >=20 > --- 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 =3D pkg > @BUILD_STATIC_TRUE@pkg_static_LDFLAGS =3D -all-static >=20 > But it would break earlier FreeBSD. Should I revert my change and > request for a exp-run? Please. --=20 Regards, Bryan Drewery --5gCrqb4kXNxSgIgNFXDfKv7Ne6135h6FP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJVUVW/AAoJEDXXcbtuRpfPXAoIAInPx3TkJ4QxwE23GJx/bitp YTPOQQI1O3mhYOojDz7WC2gAqIZ1qV7Nk+uwtJMvNTvm02HRdRHMLhWZmDxmcQTd jabzBTmHReGoAYLinpUOwc6yJdMBDJi+wB0IZFHVZ/alR/taEs1Sy/7RiBdMNFRU YgPqxUZd4dV/soyddUGwVesXb8vwzc1/YXFK2YdMvWu6hodhocUUvGxq5IFOay85 gxvXGIxhGI04Sa0hzVntchynQaoFoDjAO7agwvltxZ+YV1UzWeUpQ4oPSpSfvZHD qA/sUIX5uc2w/kDIFPSgU/C7/bEDQM0Tba3gWP5zZS0x16tpomGEx+KdnLwKy9I= =mFvQ -----END PGP SIGNATURE----- --5gCrqb4kXNxSgIgNFXDfKv7Ne6135h6FP--