From owner-svn-src-all@freebsd.org Sun Dec 2 03:03:58 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 AF082130CFDB; Sun, 2 Dec 2018 03:03:58 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D69EF7FF56; Sun, 2 Dec 2018 03:03:57 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-lj1-x235.google.com with SMTP id v1-v6so8340766ljd.0; Sat, 01 Dec 2018 19:03:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alumni-cwru-edu.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=orV+Dr5QLNAj4is/KZR3/YJczqGP0jHOuiqAkcGePIQ=; b=iUzh7nXzpQ/M6liq0yQfALLOmwqmy1b4Bsq7UAjSuzSx7LVbInXmRDxqUaoxZkpmFQ y3G0h3QDg9i8G5VciKR5d8F9S0KCFDmE9GWEwmTd9MswZedibKc18ltQt+qapsIidNgM TJ8mCUd1G1wzxFEchSChFxPp2KBwphE3WKYK62+1JUXH3C69hfcMEvmHsvR5TMciYXdM ACFQYaDx8KsEvQpe6SuCdZmtppNw2vUMzLIdHlT/DzTsQmhlmXvYVZQYVD9qofrKxXnF xnq8I8ujV0XSYfo2TyJ8IYmbEyggdnN2TmJOKzr7hrbuKjKI596bGC9cgbmz30Ct4gk9 lrcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=orV+Dr5QLNAj4is/KZR3/YJczqGP0jHOuiqAkcGePIQ=; b=Jo+g15kiyyxtB1y/ZiAifHgJcBbn2TOrCdjI6l6gM6pSveyPtZ1jx5B3iUNjRdhCW+ KB+C7ZzxjJuTByj1JKMjv1Rk3VGLGJeIT2TfJIfeVXYYg1KhhjRoHT6m3XcuK5MmkP09 gU8bFGchsXS1DfWt6kk3u2ex9tgX0eCOQvKE5XiwYnaTzdHC5lwbkQG+r1Hy2cOh9oFd 4Pjil0s1PDXDFXfkwqJ8dfxj3zDmTpd9en3/aMGqrzjuveaAv+YmNqLIaNDVL53YLsSm YvRAqiTa5DG1iZvZZYNnQgB87zaDg48Axw21T1sLMfPDEYSfz8Z+EeZvT8vo/58exJMo fRFg== X-Gm-Message-State: AA+aEWbOom5dYcZQHxLTY6hWwGDvz0liXZr8Otcy9aiclS7mKpZ2JyQU R4z6WuoU8CWl8fVNfUHhsb2wpJU4muPaWU8QweDTqeYE X-Google-Smtp-Source: AFSGD/UkAHImugHrH3GTgPsSpE3+wI16xWlZK8/r1nFcN88xldI/H1PjERhmOmCLw7OckYUfRpHlRSVSg/PWvN9UkbM= X-Received: by 2002:a2e:8007:: with SMTP id j7-v6mr7303314ljg.22.1543719833216; Sat, 01 Dec 2018 19:03:53 -0800 (PST) MIME-Version: 1.0 References: <201811262145.wAQLjRwO048495@repo.freebsd.org> In-Reply-To: <201811262145.wAQLjRwO048495@repo.freebsd.org> From: Justin Hibbits Date: Sat, 1 Dec 2018 21:03:40 -0600 Message-ID: Subject: Re: svn commit: r340997 - head/lib/libarchive To: Martin Matuska Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: D69EF7FF56 X-Spamd-Result: default: False [-3.29 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; R_DKIM_ALLOW(-0.20)[alumni-cwru-edu.20150623.gappssmtp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[cwru.edu]; NEURAL_HAM_LONG(-1.00)[-0.996,0]; TO_DN_SOME(0.00)[]; IP_SCORE(-0.56)[ipnet: 2a00:1450::/32(-1.42), asn: 15169(-1.30), country: US(-0.09)]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; DKIM_TRACE(0.00)[alumni-cwru-edu.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[5.3.2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.5.4.1.0.0.a.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.52)[-0.522,0]; FORGED_SENDER(0.30)[jrh29@alumni.cwru.edu,chmeeedalf@gmail.com]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[jrh29@alumni.cwru.edu,chmeeedalf@gmail.com]; RCVD_COUNT_TWO(0.00)[2] 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: Sun, 02 Dec 2018 03:03:58 -0000 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 - Justin