From patchwork Mon Aug 2 19:00:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 12414615 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B98A2C4338F for ; Mon, 2 Aug 2021 19:01:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9785361103 for ; Mon, 2 Aug 2021 19:01:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229607AbhHBTBo (ORCPT ); Mon, 2 Aug 2021 15:01:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229551AbhHBTBn (ORCPT ); Mon, 2 Aug 2021 15:01:43 -0400 Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA1C4C061764 for ; Mon, 2 Aug 2021 12:01:33 -0700 (PDT) Received: by mail-qv1-xf2e.google.com with SMTP id m12so8757799qvt.1 for ; Mon, 02 Aug 2021 12:01:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T5v9i8w99O3J4xy+XDTPHFHRGMz/eNCxKF16mn/hAHw=; b=XGIlo/cXBeOOsNduDhOJT+xzhX88q7BFR6O1uL6gUB+irZijybtk8sgiiGrH2lMGDR GgSSmRb5Y92TEd25fJ5R3rfLO36eDNqk3EaCDSRZU6uUxKTB2jfe/i8UvGGBw/gxoH8h TW5YrqesHJaHwBoJokqnMofvLu+w72CPDxIS0kyLrunZEZ/QP03311ZgpoYAVOEhJXfk ZnH/9uaEljzXbvayAZR3gZzIqYayd2mUS0yq3cQn2UG6vGjH2Ey0jKxBaKPKXiAP1mp9 RfjVkhhDxwsxJVWUai2wQKJbGdnM6WUUaJnJSGTeeHhQdf6cR9Y7+L/WOIOh8Cv+3IPL NNOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T5v9i8w99O3J4xy+XDTPHFHRGMz/eNCxKF16mn/hAHw=; b=nUtc1MlXKOmAPdZzdL3ppjgm5vpGBkdzS2er1WTKCRG2SINw7aXXszO8FNVzJdEVy0 6uyQ+IECsoij0aNu6PLl77xGG5C/5M203pnhQCkSuMcD3Bp4mLpq8ThOKAlsBxM9FchH q0AMfl0qqVboQU10RZYXrawftDuXUlIGu7sFys77/YElTpEy8MYFfqQov1J6qRY5qUpW oDH+upjDb+WV171Um4hKrwX2lMRhFKNdwf99PJWJbBrHZvIoFlC9rxXT4pYNPN+ZLEju 8WJ8SiiyUxtKy1I/RBFSbdMkDycA5/85gXaPihIe6VlgVv2IROY3WNNt9TSNY/QIJEJZ s5Qw== X-Gm-Message-State: AOAM5303iMbKv2fOleyVS8p9SFs/L0AlVEa35prQh4RnPTbWPB4Tdrle 6/9q9BjaC32j35VJ8Si1gExqHZCiZ70= X-Google-Smtp-Source: ABdhPJzBRxngiEBKuYafAG+HyQRkyj+zSO0s0drzYtq5BECfTmdB3z+BjJy7PmlZqa1BeNPGy9YO2g== X-Received: by 2002:a0c:e310:: with SMTP id s16mr17852655qvl.10.1627930892665; Mon, 02 Aug 2021 12:01:32 -0700 (PDT) Received: from carlos-mbp.lan (104-1-92-200.lightspeed.sntcca.sbcglobal.net. [104.1.92.200]) by smtp.gmail.com with ESMTPSA id b21sm4949885qtb.58.2021.08.02.12.01.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 12:01:32 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: hanwen@google.com, =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= Subject: [PATCH 1/3] fixup! Provide zlib's uncompress2 from compat/zlib-compat.c Date: Mon, 2 Aug 2021 12:00:52 -0700 Message-Id: <20210802190054.58282-2-carenas@gmail.com> X-Mailer: git-send-email 2.32.0.826.g286871f41a In-Reply-To: <20210802190054.58282-1-carenas@gmail.com> References: <20210802190054.58282-1-carenas@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 124b6e20ef (Provide zlib's uncompress2 from compat/zlib-compat.c, 2021-07-20) adds a compatibility replacement function for uncompress2 that could be used for building with zlib < 1.2.9, but adds it to libgit. this could result in link failures depending on the library order used by the link command as shown in (from the 32bit linux CI task for the seen branch): reftable/libreftable.a(block.o): In function `block_reader_init': /__w/git/git/reftable/block.c:222: undefined reference to `uncompress2' collect2: error: ld returned 1 exit status Makefile:2649: recipe for target 'git-daemon' failed add it instead to the libreftable library that is also the current user. Signed-off-by: Carlo Marcelo Arenas Belón --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 94ba729376..d1c2a8acc1 100644 --- a/Makefile +++ b/Makefile @@ -1760,7 +1760,7 @@ endif ifdef NO_UNCOMPRESS2 BASIC_CFLAGS += -DNO_UNCOMPRESS2 - LIB_OBJS += compat/zlib-uncompress2.o + REFTABLE_OBJS += compat/zlib-uncompress2.o endif ifdef NO_POSIX_GOODIES From patchwork Mon Aug 2 19:00:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 12414619 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EB29C432BE for ; Mon, 2 Aug 2021 19:01:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C609610FF for ; Mon, 2 Aug 2021 19:01:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230478AbhHBTBq (ORCPT ); Mon, 2 Aug 2021 15:01:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229946AbhHBTBp (ORCPT ); Mon, 2 Aug 2021 15:01:45 -0400 Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79F7BC06175F for ; Mon, 2 Aug 2021 12:01:34 -0700 (PDT) Received: by mail-qv1-xf36.google.com with SMTP id s11so9384947qvz.7 for ; Mon, 02 Aug 2021 12:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aE+J6qWLnxO1x5bHSMmdBpA6gMUIZ7Head26KyK6tFU=; b=RwqA3yn61b3kbQUXrSM/IIp4o1bOPRAxt6ufosbqXFsVx6b7S2kQgM/CITu1ruSYZK 4wEpEenzFmGoFXjmejK5B09+06w6aXTLu90uSEvT40OMnttIlX5HniHPAXi79eGJla6A ZXnqH18pPCEBAAe9TcGWgmn5Q1fyeL/GlFrme4/khAD53SMnT0vXcEfBBLPYX96C6bRd dCu6xZeqU+SUVvz1T0tC1/JzabMqu9t6JrQ0OWFmD5gBOUd+w5Bjgs6bA/g+O693erY9 NNTvNVpM0/qBnyXkFasN4P+QVo1SQbKV/9NUb/phg+0FLw9KGxyy/aIKUf7l4Y1EpxRz FDag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aE+J6qWLnxO1x5bHSMmdBpA6gMUIZ7Head26KyK6tFU=; b=tDh0A2LwGzFgfUARIk5gUk7r3a9a04x8bEpVTFOGgxKCcubk66dJLC/id1MFn1Qw28 ruqZuteKmiqfvJG+0GlJNyE4mgps+6BQ6Ot1f6diC17Tj1DJwr7tGP/SII+yFWyfCZY8 XBEKoaFJciDh/6z+zD7QeZ2Z/SQxDxcJ+DMYFv68JaqRxuszaUnLkQp/Ad/kFvN/TxL1 KEBw9je0ceyil9lDdj3RQBIcX7617+acPRt3ZaodFW6VDIl4iiXkRTpqth4MUQvKXVFB edOlVtOnIhOJ+O+L7/Wh+c7uX/xOvw4zwq5rke4z0gkI0GdWvPlSBpQr6TZltp9Lf+it jPAA== X-Gm-Message-State: AOAM531HPwaXYD7152lGL04yH5TmJEfEHKpgfyHI4f8Qc74Qim9JW0MN TG4C1WC2f6jGasqytrba98Y2UbE3K6c= X-Google-Smtp-Source: ABdhPJwcNN7DbqKrOA9/YR4VQ4cb6eZmFk0AdP2QfdoYzvuLRsJXUOStYxzwrGLvXKqIMm89G6UiKQ== X-Received: by 2002:a0c:e6a4:: with SMTP id j4mr17811304qvn.16.1627930893508; Mon, 02 Aug 2021 12:01:33 -0700 (PDT) Received: from carlos-mbp.lan (104-1-92-200.lightspeed.sntcca.sbcglobal.net. [104.1.92.200]) by smtp.gmail.com with ESMTPSA id b21sm4949885qtb.58.2021.08.02.12.01.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 12:01:33 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: hanwen@google.com, =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= Subject: [PATCH 2/3] reftable: clarify zlib version dependency Date: Mon, 2 Aug 2021 12:00:53 -0700 Message-Id: <20210802190054.58282-3-carenas@gmail.com> X-Mailer: git-send-email 2.32.0.826.g286871f41a In-Reply-To: <20210802190054.58282-1-carenas@gmail.com> References: <20210802190054.58282-1-carenas@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 3541411189 (reftable: reading/writing blocks, 2021-07-20) add a comment explaining that a newer zlib version is required but being a little vague about the specifics make sure the zlib version is mentioned to aid on deciding to enable or not the NO_UNCOMPRESS2 compatibility layer Signed-off-by: Carlo Marcelo Arenas Belón --- Squashing this as part of a reroll of hn/reftable might be preferable reftable/block.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/reftable/block.c b/reftable/block.c index 92f8e5abfa..eb5268dd3a 100644 --- a/reftable/block.c +++ b/reftable/block.c @@ -16,7 +16,9 @@ license that can be found in the LICENSE file or at #include #ifdef NO_UNCOMPRESS2 -/* This is uncompress2, which is only available in zlib as of 2017. +/* + * This is uncompress2, which is only available in zlib >= 1.2.9 + * (released as of early 2017) */ int uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source, uLong *sourceLen); From patchwork Mon Aug 2 19:00:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 12414621 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0890C4338F for ; Mon, 2 Aug 2021 19:01:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 97138610FE for ; Mon, 2 Aug 2021 19:01:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231191AbhHBTBr (ORCPT ); Mon, 2 Aug 2021 15:01:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231133AbhHBTBq (ORCPT ); Mon, 2 Aug 2021 15:01:46 -0400 Received: from mail-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85809C061760 for ; Mon, 2 Aug 2021 12:01:35 -0700 (PDT) Received: by mail-qv1-xf2d.google.com with SMTP id g6so9375704qvj.8 for ; Mon, 02 Aug 2021 12:01:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DpyIrEtTCiEX3pzs5kNiBf4o6VtRx3ZO6VLKPOI/WgI=; b=erBWMTcdsrNcIYbaLJdJ4yiFjl68NsRGSyAZ/OAbwLjUM98qAtq12CgSiZGrjiY5nw Tubxthbf0IIAbE6TVXywLflO+8cZPrx0S66PQ9SYsF/OF+zef5vd/kGSbuVuMgrXGYip U+0ZP5fs29+DRRlnGUkZxQjqtABaXFf2YGm5zi3isZERoFoPJ5RmKp0GIxXVaDlX/CPA 99V45miqTglvAGnDCvkVmWFJYnu5cdTRZgWv0DHSTrYbGmcw5BrE+IbYJKwA0Ho3VUgl NRfCvIndwQW7Jg4TNEpgZgriUGBEXsuYonM/Gp6ms9P3uZUfhkSFO8yM+kqRyHSokFnA bokQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DpyIrEtTCiEX3pzs5kNiBf4o6VtRx3ZO6VLKPOI/WgI=; b=bVNo47+8r8ksKsEa8Ls+MUWECIg5z5ZODbiMtlHHP1Xi1OiTjxugfjZCAqisDNWmgi ZbiSKa1w0Wr1YUCBvkDMsr2x2uw77/LLuTcBjlJzBzAlUyxsmCXHbLXbljFLxULHx+hk YgCs6pLKUDq035X0MefI6jGzK/u2sU9i0o2d8fO0KD4VTAhhutWfXqxt4Ui5WLtej00L N57KsFEeMHi4uce/smfO7q2o/DjzpxYAjQJNv0NHIk88l0m5zF0ZMA/n4Ma1HQ2BjS5G KLEOiV65tY0Qyv66sWy8KW0KlPPq5LGK54tqg1r+eXiAAAAjC8eJg2bpI9b5nmk5Jv3X ca+g== X-Gm-Message-State: AOAM532CyJYPXifMuyxyfp8JufSGzVJPmKT0hbfhjCVTWlKbXrdZ6KZl Zr6v1FAnJjXi0H4hCCduHbk3fMVKYQg= X-Google-Smtp-Source: ABdhPJwpqnyxKdGzlnSDgMTjmz1onTtHKtGHnI7EalbVykcR+ilUchbkx/dcMing4c2Q+BZiN26UVQ== X-Received: by 2002:ad4:4eaf:: with SMTP id ed15mr6872369qvb.11.1627930894538; Mon, 02 Aug 2021 12:01:34 -0700 (PDT) Received: from carlos-mbp.lan (104-1-92-200.lightspeed.sntcca.sbcglobal.net. [104.1.92.200]) by smtp.gmail.com with ESMTPSA id b21sm4949885qtb.58.2021.08.02.12.01.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 12:01:34 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: hanwen@google.com, =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= Subject: [PATCH 3/3] openbsd: allow reftable building with zlib 1.2.3 Date: Mon, 2 Aug 2021 12:00:54 -0700 Message-Id: <20210802190054.58282-4-carenas@gmail.com> X-Mailer: git-send-email 2.32.0.826.g286871f41a In-Reply-To: <20210802190054.58282-1-carenas@gmail.com> References: <20210802190054.58282-1-carenas@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org all released versions of OpenBSD (up to 6.9) include an older than 1.2.9 version of zlib in base. enable the compat uncompress2 function until is no longer needed (likely at least until the next 2 future releases are not yet EOL) Signed-off-by: Carlo Marcelo Arenas Belón --- config.mak.uname | 1 + 1 file changed, 1 insertion(+) diff --git a/config.mak.uname b/config.mak.uname index 59726d6538..074dc2324e 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -260,6 +260,7 @@ ifeq ($(uname_S),FreeBSD) FILENO_IS_A_MACRO = UnfortunatelyYes endif ifeq ($(uname_S),OpenBSD) + NO_UNCOMPRESS2 = YesPlease NO_STRCASESTR = YesPlease NO_MEMMEM = YesPlease USE_ST_TIMESPEC = YesPlease From patchwork Wed Aug 4 06:44:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= X-Patchwork-Id: 12417923 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA41AC4338F for ; Wed, 4 Aug 2021 06:45:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9C15608FC for ; Wed, 4 Aug 2021 06:45:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235658AbhHDGpU (ORCPT ); Wed, 4 Aug 2021 02:45:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235030AbhHDGpT (ORCPT ); Wed, 4 Aug 2021 02:45:19 -0400 Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B835C0613D5 for ; Tue, 3 Aug 2021 23:45:06 -0700 (PDT) Received: by mail-qk1-x733.google.com with SMTP id t66so1918567qkb.0 for ; Tue, 03 Aug 2021 23:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h3XbD4yimsVw6k+THUA5rerNVJZcN3WBQSzP/Z5dTCk=; b=ednHzfas8vwk8JHrjzU+wJdxd6angpbyRJJsq1/idfhGlBqms9uGOw5Q+Q8Wv4XT9i OmFxhFV9FvmJvQB73EVyhSPxAG6mTeVpLCHDe1tTUhz7byAOLDCQ6tpTC3XA+woAbbvp QBmnHnLLq0I7pgAdawaXoqV/vx/k3XXfAgNTcVcbgg9N1OhHWcKGfdekzi0GwlfWYELe O34X6nOF1Zn0dXjhwMfdjBRYJVhlWwyKzz++jp2RXitIBFRZRhLq8Fsqa33iRQ8EQUvk 6VOD3bwB+s+y+E/6NzZPL//mOwSXWd478M/C4XYjpkcoXVjc5beeYt7jLgJZPlj1nico KyTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h3XbD4yimsVw6k+THUA5rerNVJZcN3WBQSzP/Z5dTCk=; b=KdQTy3n7io5H+c+dPYtl14nGZ4L2gOPu9iiCfdEn0UahGtKtl7qm+G7zALrFs7oQ6U UsZcrBq45BwsmHUbML/nnNsQq0lwGtvaVqNVMuaC4tsK5ezeVoQzsZoBWTneo8IFrEct kv+r+CCReWtSOSoRhyiLdVbzGSHpVhcKj2za1r6LQVcUAyOa5JlT0VY3Dfi+3gIm64o2 /50a0vU8ZZKS0XcFIz9QZy0hOg0Qypzjwu9bBBugbMATslJMreuEbIVzO23mFV0TltuJ auNB/14cG0g0tiN5+ahO3sQvBJ/ZK2YtXo0TczXSYsveLJPVlTPjWy3x84oUKRsgSOWx H+cQ== X-Gm-Message-State: AOAM530Ex5RlLjoYh+ASEAT66IyhRJYDIqm9JbuAQi6AsGzPI3tLVgGo gSI3V8ujPNdNQXcutFghSdwhBifmdHw= X-Google-Smtp-Source: ABdhPJzXMkVxvI5YzQYCHJfRZ0RSlTPhN1KoXxGj5d905gp5WOi3T+rQDFXI1Ksp0Sr31TYpcZc1iA== X-Received: by 2002:a05:620a:12d8:: with SMTP id e24mr23773967qkl.354.1628059505630; Tue, 03 Aug 2021 23:45:05 -0700 (PDT) Received: from carlos-mbp.lan (104-1-92-200.lightspeed.sntcca.sbcglobal.net. [104.1.92.200]) by smtp.gmail.com with ESMTPSA id m6sm760318qki.47.2021.08.03.23.45.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Aug 2021 23:45:05 -0700 (PDT) From: =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= To: git@vger.kernel.org Cc: hanwen@google.com, =?utf-8?q?Carlo_Marcelo_Arenas_Bel=C3=B3n?= Subject: [PATCH 4/3] fixup! reftable: add dump utility Date: Tue, 3 Aug 2021 23:44:34 -0700 Message-Id: <20210804064434.42236-1-carenas@gmail.com> X-Mailer: git-send-email 2.33.0.rc0.443.g98cc19b6c0 In-Reply-To: <20210802190054.58282-1-carenas@gmail.com> References: <20210802190054.58282-1-carenas@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org avoid _XOPEN_SOURCE in alpine by making sure git-compat-util.h is included first (through hash.h) as recommended and therefore avoid: In file included from ./hash.h:4, from reftable/dump.c:19: ./git-compat-util.h:147: warning: "_XOPEN_SOURCE" redefined 147 | #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */ | In file included from /usr/include/unistd.h:8, from reftable/reftable-writer.h:15, from reftable/dump.c:14: /usr/include/features.h:16: note: this is the location of the previous definition 16 | #define _XOPEN_SOURCE 700 | Signed-off-by: Carlo Marcelo Arenas Belón --- This allows for the alpine CI job to build, but will still fail with the reported segfault in the subcommand for `git reflog`. It is important to note that it only happens in "seen" though, as the same code merged to master pass that test (even if it might fail somewhere else) reftable/dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reftable/dump.c b/reftable/dump.c index 668cfa8996..eb7b2b4161 100644 --- a/reftable/dump.c +++ b/reftable/dump.c @@ -6,6 +6,7 @@ license that can be found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd */ +#include "hash.h" #include "reftable-blocksource.h" #include "reftable-error.h" #include "reftable-merged.h" @@ -16,7 +17,6 @@ license that can be found in the LICENSE file or at #include "reftable-reader.h" #include "reftable-stack.h" #include "reftable-generic.h" -#include "hash.h" #include #include