Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Feb 2023 09:05:38 +0100
From:      se@FreeBSD.org
To:        Xin LI <delphij@FreeBSD.org>
Cc:        dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   Re: git: 6998572a74a9 - main - hastd: use zlib's crc32 implementation.
Message-ID:  <267649f3-7334-57e1-59aa-d064775ab5d6@FreeBSD.org>
In-Reply-To: <202302030714.3137EVRQ088519@gitrepo.freebsd.org>
References:  <202302030714.3137EVRQ088519@gitrepo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Am 03.02.23 um 08:14 schrieb Xin LI:
> The branch main has been updated by delphij:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=6998572a74a98721781ecd5b6829435259f9825a
> 
> commit 6998572a74a98721781ecd5b6829435259f9825a
> Author:     Xin LI <delphij@FreeBSD.org>
> AuthorDate: 2023-02-03 07:14:21 +0000
> Commit:     Xin LI <delphij@FreeBSD.org>
> CommitDate: 2023-02-03 07:14:21 +0000
> 
>      hastd: use zlib's crc32 implementation.
>      
>      Reviewed by:    pjd
>      MFC after:      2 weeks
>      Differential Revision: https://reviews.freebsd.org/D35767

This commit broke sbin/hasctl, it still wants to use the removed
crc32.c from the hastd directory.

The following patch is untested but did allow buildworld to finish.
(Untested, since I do not use hast.)

diff --git a/sbin/hastctl/Makefile b/sbin/hastctl/Makefile
index 00c89ef4f743..3f2198e74df6 100644
--- a/sbin/hastctl/Makefile
+++ b/sbin/hastctl/Makefile
@@ -7,7 +7,6 @@ PACKAGE=hast

  PROG=  hastctl
  SRCS=  activemap.c
-SRCS+= crc32.c
  SRCS+= ebuf.c
  SRCS+= hast_checksum.c hast_compression.c hast_proto.c hastctl.c
  SRCS+= lzf.c
@@ -33,7 +32,7 @@ CFLAGS+=-DINET6
  CFLAGS+=-DYY_NO_UNPUT
  CFLAGS+=-DYY_NO_INPUT

-LIBADD=        md util
+LIBADD=        md util z

  YFLAGS+=-v




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?267649f3-7334-57e1-59aa-d064775ab5d6>