From owner-svn-src-head@freebsd.org Wed Oct 24 15:09:11 2018 Return-Path: Delivered-To: svn-src-head@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 4295AFEE1B5 for ; Wed, 24 Oct 2018 15:09:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe2c.google.com (mail-vs1-xe2c.google.com [IPv6:2607:f8b0:4864:20::e2c]) (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 D1FF29727B for ; Wed, 24 Oct 2018 15:09:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vs1-xe2c.google.com with SMTP id r83so3382826vsc.4 for ; Wed, 24 Oct 2018 08:09:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mPT8S/B+lPz0DQdgoivmB+0+jBtA98vPZtDR3Up1ibQ=; b=zNfpN3DPQuXLVHsTKoQLnDLm/4IIXwLyeM+6XHok2ppPQKmsPKRqKFs9ZNdpIMFrqa MsBOQnYl2vSbyrvjcAy3YAIpniBHGLibDr91dGeD7S08cPusXqzb0u7wm39T/JfIcSs3 BOFr2P02bk4fhzsZq8yknb1FJa9JEUCmzpy/TFvCcf4k+1NGFAzxVmBvJF27AwiebGRA R2cECxPcYEKGT2VL8uNmj6EJ5T6S3o+5TnkgI42rDnLoSaIIYXPe6kSdgUzrFENsHmqJ LhUD59LzteEpjkydThfRCRD1ToMHOfQOdjavvMgmUrTpbDIjhNaLauVtwmmvWvKrFCIM nbqQ== 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=mPT8S/B+lPz0DQdgoivmB+0+jBtA98vPZtDR3Up1ibQ=; b=Dzl+pTU+Qoxno6nLWjX5w0wCi9fMkdvQ0yBZf0DpEK13oKBzfhhEixrI4Q0U4rUSRW ymAmHDLoLeYARRaun6SrEGg2SiMaJJ3v9jO6c1IA5WbBx0nJu6Z29hRRbiDQSBFYKSEg gRU3Sb4xm487QWa/0aS0zzQIBnxkp8h2ym4WFGQN3qM0ToGCzWII/svaqVtGwYcO4OiR N7Z2dOjMDZciNrFVoPZagEz2F4Dt/SXuUl/xRxzmP0udvIiDDLinoH6KxrpZp2pWytJx cT3TaGQ45G0/Qp/Zjzj2wjbm980CVCbHP0ruV3y1wftMw5GeT6SDT1fIVrnGP7WJ0TVP D5fA== X-Gm-Message-State: AGRZ1gKkJUx2CY7Kmb8S+sEvFa/405J/6fcEQ+ko1Ro9naWBptUG0Ch9 dENgVxr8P+XHefMvCDyo83UaWc0FVk4gsUOUxT+Zcw== X-Google-Smtp-Source: AJdET5ccpXNvAmkXTf3N3/Vjknnav4dhvpNcImNTj/QsTqUzRMifYUz1XzLO26uk4QzdCKVgBUzDetRV9JKnOEafdt0= X-Received: by 2002:a67:e86:: with SMTP id 128mr1275082vso.201.1540393749882; Wed, 24 Oct 2018 08:09:09 -0700 (PDT) MIME-Version: 1.0 References: <201810232311.w9NNBc4n031783@repo.freebsd.org> <4893BA79-ED08-401E-9AFD-4A9BD71A076C@me.com> <20181024150107.GE5335@kib.kiev.ua> In-Reply-To: <20181024150107.GE5335@kib.kiev.ua> From: Warner Losh Date: Wed, 24 Oct 2018 09:08:59 -0600 Message-ID: Subject: Re: svn commit: r339673 - head/stand/libsa To: Konstantin Belousov Cc: Toomas Soome , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 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: Wed, 24 Oct 2018 15:09:11 -0000 On Wed, Oct 24, 2018 at 9:01 AM Konstantin Belousov wrote: > On Wed, Oct 24, 2018 at 08:33:19AM +0300, Toomas Soome wrote: > > > > > > > On 24 Oct 2018, at 02:11, Konstantin Belousov wrote: > > > > > > Author: kib > > > Date: Tue Oct 23 23:11:38 2018 > > > New Revision: 339673 > > > URL: https://svnweb.freebsd.org/changeset/base/339673 > > > > > > Log: > > > Fix stand/ build after r339671. > > > > > > ffs_subr.c requires calculate_crc32c() from libkern. Unfortunately we > > > cannot just add libkern/crc32.c to libstand because crc32.o is already > > > compiled from contrib/zlib/crc32.c. Use the include trick to rename > > > the source. > > > > > > Note that libstand also provides crc32.c which seems to be unused. > > > > It is used by part.c, by the GPT functions. However, if we have > non-optional compile case for crc32, it is not hard to update part.c and > drop the unused instance. > > My point is that static library cannot usefully contain two files with the > same name. I believe that libstand.a provides crc32.o compiled from the > contrib/zlib location. > Yes. It does. Warner