From owner-svn-src-all@freebsd.org Mon Jun 22 08:41:12 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 61440344F87; Mon, 22 Jun 2020 08:41:12 +0000 (UTC) (envelope-from ruslanngaripov@gmail.com) Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49r2tv4LTSz4Ngr; Mon, 22 Jun 2020 08:41:11 +0000 (UTC) (envelope-from ruslanngaripov@gmail.com) Received: by mail-lj1-x243.google.com with SMTP id a9so18293984ljn.6; Mon, 22 Jun 2020 01:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=O4Nrl0kQHwTCCbHdNqyypq5GjtnJUS6bdJQKBOapMnk=; b=mHK24itWAf3ZsDVkmfDHN61/r7j2fc+kkMaWNp9Aj2vRlLR3ZF7a8QpppEQnc6xPpo 38HZMhFJhEiQiTh7NXTgFMQWuUyxkxzBtVzB7K3SZhd/N6rNZS2QChQfFydb9f6bGtzv of3F7auC2x8EspT5nTaw5fiFPDTej5NF1pu+Eb8Snf3ouKEVwx+s2LNedmyL0gIpvbaT 7Dah5+m+jr4dIGY3M2P3LIi3f3scOPxdiyGw4R5Tl+qK2zYEB1nU8wzU65SA2SWzIOYl 4/uMwwT7LhvZ1wuEDdh4CKudH4Tkl/And5/p85En+F2qx4yDAdwV7wPu1UWsKob3xqej zb4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=O4Nrl0kQHwTCCbHdNqyypq5GjtnJUS6bdJQKBOapMnk=; b=AgsDvR4WgeqBM/cFV3Kp1VqH/pHvbYzvSH1BQiOaMU4STpdnWwkSyLNw77jrb6M0qw LGXtV44w5nzh8jAdIaltDojz9ijyWvlSkWGcGtzgz9mxw6fVT3lYmlG8jzkwEFUTeOdq H3UxccwRGAJoiIC1/LS3wcRAUrKhK9e7cq5GRPR1er0KZ5RZnvD72m8RP9m3wYVI7OO/ yQHTdY9IQyszK1qFzaeE7xebyd7jaNWp0fkXmitthsCf4ZIpGlKhDAokjB7W5svcrblI Cv6l9qkKcnwm0wAUPvBIKyxLDzMqHDjUUH2J5FFDyD4w6n1JlxBw7vcavOPvnsOgEQ2s TEfg== X-Gm-Message-State: AOAM533NE9KS/Uywj88wRNglOyTrD3p0M9UvhrT9cdsoW7aTeA/qH0XU wgMo+hpzxxhSO5OWQFoPmfwVX2RD X-Google-Smtp-Source: ABdhPJxNDjlly01RrOzbSQ56MNPzjPLF4HD7IoBI3k5BMBdoQxaBD9qZwMiU6aRLACrCrqtLPg+MAA== X-Received: by 2002:a2e:8945:: with SMTP id b5mr6603650ljk.169.1592815269176; Mon, 22 Jun 2020 01:41:09 -0700 (PDT) Received: from [192.168.1.6] ([188.226.57.142]) by smtp.gmail.com with ESMTPSA id g5sm2601875ljk.93.2020.06.22.01.41.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Jun 2020 01:41:08 -0700 (PDT) Subject: Re: svn commit: r362452 - in head: contrib/xz/src/liblzma/check lib/liblzma share/mk To: Xin LI , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202006202132.05KLW781071057@repo.freebsd.org> From: Ruslan Garipov Message-ID: <25ecb60a-4038-3f30-5784-605cf8d0836f@gmail.com> Date: Mon, 22 Jun 2020 13:41:03 +0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <202006202132.05KLW781071057@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49r2tv4LTSz4Ngr X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=mHK24itW; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of ruslanngaripov@gmail.com designates 2a00:1450:4864:20::243 as permitted sender) smtp.mailfrom=ruslanngaripov@gmail.com X-Spamd-Result: default: False [-3.69 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RECEIVED_SPAMHAUS_PBL(0.00)[188.226.57.142:received]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_FROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; NEURAL_HAM_LONG(-1.03)[-1.031]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-1.00)[-0.996]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::243:from]; NEURAL_HAM_SHORT(-0.67)[-0.666]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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, 22 Jun 2020 08:41:12 -0000 On 6/21/2020 2:32 AM, Xin LI wrote: > Author: delphij > Date: Sat Jun 20 21:32:07 2020 > New Revision: 362452 > URL: https://svnweb.freebsd.org/changeset/base/362452 > > Log: > liblzma: Make liblzma use libmd implementation of SHA256. I'm trying to update from r362172 (GENERIC-NODEBUG) to r362468 (a custom KERNCONF), and failing on buildworld: ===> lib/liblzma (obj,all,install) make[4]: /usr/obj/usr/src/i386.i386/lib/liblzma/.depend, 1: ignoring stale .depend for /usr/obj/usr/src/i386.i386/tmp/usr/lib/libmd.a building shared library liblzma.so.5 cc -target i386-unknown-freebsd13.0 --sysroot=/usr/obj/usr/src/i386.i386/tmp ... tsort -q` -lmd -lpthread ld: error: unable to find library -lmd cc: error: linker command failed with exit code 1 (use -v to see invocation) *** Error code 1 Stop. make[4]: stopped in /usr/src/lib/liblzma As I've already mentioned I run FreeBSD 13.0-CURRENT x86 r362172 GENERIC-NODEBUG. The kernel/user land were built with the default kernel config and empty make.conf and src.conf. Now I'm trying to update to r362468 with custom kernel config, make.conf and src.conf. What should I show you from those files in order you can help me to fix the error? I just don't understand why libmd isn't built. Because the library currently exists as /lib/libmd.so.6 (therefore, it was build on the previous update to r362172), I believe I missed something in my config files. Thanks! > > MFC after: 2 weeks > PR: 200142 > > Deleted: > head/contrib/xz/src/liblzma/check/sha256.c > Modified: > head/lib/liblzma/Makefile > head/lib/liblzma/Symbol.map > head/lib/liblzma/config.h > head/share/mk/src.libnames.mk > > Modified: head/lib/liblzma/Makefile > ============================================================================== > --- head/lib/liblzma/Makefile Sat Jun 20 21:06:02 2020 (r362451) > +++ head/lib/liblzma/Makefile Sat Jun 20 21:32:07 2020 (r362452) > @@ -78,8 +78,7 @@ SRCS+= common.c \ > .PATH: ${LZMADIR}/check > SRCS+= check.c \ > crc32_table.c \ > - crc64_table.c \ > - sha256.c > + crc64_table.c > .if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386" > SRCS+= crc32_x86.S \ > crc64_x86.S > @@ -125,11 +124,11 @@ SRCS+= simple_coder.c \ > > .PATH: ${LZMADIR} > > -VERSION_MAJOR!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_MAJOR" {print $$3 } ' \ > +VERSION_MAJOR!= sed -n '/define.*LZMA_VERSION_MAJOR/{s,[^0-9.],,gp;q;}' \ > ${LZMADIR}/api/lzma/version.h > -VERSION_MINOR!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_MINOR" {print $$3 } ' \ > +VERSION_MINOR!= sed -n '/define.*LZMA_VERSION_MINOR/{s,[^0-9.],,gp;q;}' \ > ${LZMADIR}/api/lzma/version.h > -VERSION_PATCH!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_PATCH" {print $$3 } ' \ > +VERSION_PATCH!= sed -n '/define.*LZMA_VERSION_PATCH/{s,[^0-9.],,gp;q;}' \ > ${LZMADIR}/api/lzma/version.h > > WARNS?= 3 > @@ -147,7 +146,7 @@ CFLAGS+= -DHAVE_CONFIG_H \ > -I${LZMADIR}/simple \ > -I${LZMADIR:H}/common > > -LIBADD+= pthread > +LIBADD+= md pthread > > VERSION_DEF= ${.CURDIR}/Versions.def > SYMBOL_MAPS= ${.CURDIR}/Symbol.map > @@ -160,10 +159,11 @@ FILESDIR= ${LIBDATADIR}/pkgconfig > > liblzma.pc: liblzma.pc.in > sed -e 's,@prefix@,/usr,g ; \ > - s,@exec_prefix@,/usr,g ; \ > + s,@exec_prefix@,/usr,g ; \ > s,@libdir@,/usr/lib,g ; \ > s,@includedir@,/usr/include,g ; \ > - s,@PACKAGE_URL@,http://tukaani.org/xz/,g ; \ > + s,@LIBS@,-pthread -lmd,g ; \ > + s,@PACKAGE_URL@,https://tukaani.org/xz/,g ; \ > s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \ > s,@PTHREAD_CFLAGS@,,g ; \ > s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET} > > Modified: head/lib/liblzma/Symbol.map > ============================================================================== > --- head/lib/liblzma/Symbol.map Sat Jun 20 21:06:02 2020 (r362451) > +++ head/lib/liblzma/Symbol.map Sat Jun 20 21:32:07 2020 (r362452) > @@ -180,9 +180,6 @@ XZprivate_1.0 { > lzma_raw_coder_memusage; > lzma_raw_decoder_init; > lzma_raw_encoder_init; > - lzma_sha256_finish; > - lzma_sha256_init; > - lzma_sha256_update; > lzma_simple_arm_decoder_init; > lzma_simple_arm_encoder_init; > lzma_simple_armthumb_decoder_init; > > Modified: head/lib/liblzma/config.h > ============================================================================== > --- head/lib/liblzma/config.h Sat Jun 20 21:06:02 2020 (r362451) > +++ head/lib/liblzma/config.h Sat Jun 20 21:32:07 2020 (r362452) > @@ -211,16 +211,13 @@ > /* #undef HAVE_SHA256INIT */ > > /* Define to 1 if the system has the type `SHA256_CTX'. */ > -/* FreeBSD - disabled libmd SHA256 for now */ > -/* #undef HAVE_SHA256_CTX */ > +#define HAVE_SHA256_CTX 1 > > /* Define to 1 if you have the header file. */ > -/* FreeBSD - disabled libmd SHA256 for now */ > -/* #undef HAVE_SHA256_H */ > +#define HAVE_SHA256_H 1 > > /* Define to 1 if you have the `SHA256_Init' function. */ > -/* FreeBSD - disabled libmd SHA256 for now */ > -/* #undef HAVE_SHA256_INIT */ > +#define HAVE_SHA256_INIT 1 > > /* Define to 1 if the system has the type `SHA2_CTX'. */ > /* #undef HAVE_SHA2_CTX */ > > Modified: head/share/mk/src.libnames.mk > ============================================================================== > --- head/share/mk/src.libnames.mk Sat Jun 20 21:06:02 2020 (r362451) > +++ head/share/mk/src.libnames.mk Sat Jun 20 21:32:07 2020 (r362452) > @@ -350,7 +350,7 @@ _DP_heimipcs= heimbase roken pthread > _DP_kafs5= asn1 krb5 roken > _DP_krb5+= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc > _DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err > -_DP_lzma= pthread > +_DP_lzma= md pthread > _DP_ucl= m > _DP_vmmapi= util > _DP_opencsd= cxxrt > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >