From owner-svn-src-all@freebsd.org Mon Dec 3 06:09:50 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A3211317014; Mon, 3 Dec 2018 06:09:50 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from mail.daemonic.se (mail.daemonic.se [IPv6:2607:f740:d:20::25]) (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 B776872F4C; Mon, 3 Dec 2018 06:09:49 +0000 (UTC) (envelope-from zeising@freebsd.org) Received: from cid.daemonic.se (localhost [IPv6:::1]) by mail.daemonic.se (Postfix) with ESMTP id 437ZMv6F7VzDj8V; Mon, 3 Dec 2018 06:09:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at daemonic.se Received: from mail.daemonic.se ([127.0.0.1]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256) by cid.daemonic.se (mailscanner.daemonic.se [127.0.0.1]) (amavisd-new, port 10587) with ESMTPS id 8iW6k2-bUmiL; Mon, 3 Dec 2018 06:09:47 +0000 (UTC) Received: from garnet.daemonic.se (unknown [IPv6:2001:470:dca9:201:380a:bc54:6f12:4a9b]) by mail.daemonic.se (Postfix) with ESMTPSA id 437ZMt6B3qzDhFd; Mon, 3 Dec 2018 06:09:46 +0000 (UTC) Subject: Re: svn commit: r340997 - head/lib/libarchive To: Justin Hibbits , Martin Matuska Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers References: <201811262145.wAQLjRwO048495@repo.freebsd.org> From: Niclas Zeising Message-ID: Date: Mon, 3 Dec 2018 07:09:39 +0100 User-Agent: Mutt/1.5.21 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: B776872F4C X-Spamd-Result: default: False [-0.62 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.41)[-0.409,0]; NEURAL_HAM_SHORT(-0.34)[-0.339,0]; NEURAL_SPAM_LONG(0.13)[0.126,0]; ASN(0.00)[asn:36236, ipnet:2607:f740:d::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2018 06:09:50 -0000 On 12/2/18 4:03 AM, Justin Hibbits wrote: > On Mon, Nov 26, 2018 at 3:45 PM Martin Matuska wrote: >> >> Author: mm >> Date: Mon Nov 26 21:45:27 2018 >> New Revision: 340997 >> URL: https://svnweb.freebsd.org/changeset/base/340997 >> >> Log: >> libarchive configuration changes >> - move HAVE_BZLIB_H, HAVE_LIBLZMA and HAVE_LZMA_H to config_freebsd.h >> - activate support for multi-threaded lzma encoding [1] >> >> PR: 233543 [1] >> Reported by: cem >> MFC after: 1 week >> >> Modified: >> head/lib/libarchive/Makefile >> head/lib/libarchive/config_freebsd.h >> >> Modified: head/lib/libarchive/Makefile >> ============================================================================== >> --- head/lib/libarchive/Makefile Mon Nov 26 20:56:05 2018 (r340996) >> +++ head/lib/libarchive/Makefile Mon Nov 26 21:45:27 2018 (r340997) >> @@ -7,7 +7,6 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive >> LIB= archive >> >> LIBADD= z bz2 lzma bsdxml >> -CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 >> >> # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. >> # It has no real relation to the libarchive version number. >> >> Modified: head/lib/libarchive/config_freebsd.h >> ============================================================================== >> --- head/lib/libarchive/config_freebsd.h Mon Nov 26 20:56:05 2018 (r340996) >> +++ head/lib/libarchive/config_freebsd.h Mon Nov 26 21:45:27 2018 (r340997) >> @@ -133,14 +133,17 @@ >> #define HAVE_LCHFLAGS 1 >> #define HAVE_LCHMOD 1 >> #define HAVE_LCHOWN 1 >> +#define HAVE_LIBLZMA 1 >> #define HAVE_LIBZ 1 >> #define HAVE_LIMITS_H 1 >> #define HAVE_LINK 1 >> +#define HAVE_LZMA_H 1 >> #define HAVE_LOCALE_H 1 >> #define HAVE_LOCALTIME_R 1 >> #define HAVE_LONG_LONG_INT 1 >> #define HAVE_LSTAT 1 >> #define HAVE_LUTIMES 1 >> +#define HAVE_LZMA_STREAM_ENCODER_MT 1 >> #define HAVE_MBRTOWC 1 >> #define HAVE_MEMMOVE 1 >> #define HAVE_MEMORY_H 1 >> > > This breaks ports-mgmt/pkg now, with the following failure log: > > --- pkg-static --- > /usr/lib/liblzma.a(stream_encoder_mt.o): In function `mythread_cond_init': > /usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:230: > undefined reference to `pthread_condattr_init' > /usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:233: > undefined reference to `pthread_condattr_setclock' > /usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:237: > undefined reference to `pthread_condattr_destroy' > /usr/lib/liblzma.a(stream_encoder_mt.o): In function `get_thread': > /usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:237: > undefined reference to `pthread_condattr_destroy' > /usr/lib/liblzma.a(stream_encoder_mt.o): In function `mythread_cond_init': > /usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:233: > undefined reference to `pthread_condattr_setclock' > /usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:237: > undefined reference to `pthread_condattr_destroy' > /usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:230: > undefined reference to `pthread_condattr_init' > /usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:237: > undefined reference to `pthread_condattr_destroy' > *** [pkg-static] Error code 1 > I'm seeing the same issue when builing i386 packages on amd64 using poudriere. For some reason the amd64 build is fine. This needs to be reverted or fixed asap. In the diff above it also looks like the -DHAVE_BZLIB_H=1 flag was forgottgen when moving to config_freebsd.h, but perhaps this was intentional. Regards -- Niclas Zeising