From patchwork Wed Feb 9 02:02:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 12739553 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7F55C4321E for ; Wed, 9 Feb 2022 02:39:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240972AbiBICjX (ORCPT ); Tue, 8 Feb 2022 21:39:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244169AbiBICCb (ORCPT ); Tue, 8 Feb 2022 21:02:31 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 456DCC06157B for ; Tue, 8 Feb 2022 18:02:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=1glhJ01QY/z/1oIFzlkDJyz6tI4o2a6NhFja9S4WSsk=; b=szn3/XqwAPQC8Q8FzqI+9nlHNl BTMejBkab1+K+Qja9PQvMUb5Fi/a/c59T5RM/Hp/2Vljg7/31FGD+2iqxXCkBiT3BCb+8Gz6R9Qrl TAuLTEFVJ2X89EUZZx+9sflHAMsnnpIaS8dZqiyl6HLCCYZkl8x24EOHLcNyLd0H+VN4vSQVkiRzZ w95cTOmPoa5uTVRWVV/00Pypj5Bwu8g7vczU9HcsCLqBj6NdzzXXM7EasK8b6wo9vlYO7gu0L/Wov q3oeqR14s5rEBV6ofdRQWpA+8TXD1d3GLU4Dx3cD3uDl3Q4BXYN4RWaqQAhcV1ds5rWaye/5rgyvU M5jnExTA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nHcJO-00FxxX-3S; Wed, 09 Feb 2022 02:02:26 +0000 From: Luis Chamberlain To: raymond.barbiero.dev@gmail.com Cc: fstests@vger.kernel.org, Luis Chamberlain Subject: [PATCH 1/4] configure.in: rename to configure.ac Date: Tue, 8 Feb 2022 18:02:20 -0800 Message-Id: <20220209020223.3805346-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220209020223.3805346-1-mcgrof@kernel.org> References: <20220209020223.3805346-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org autoheader complains and tell us to rename configure.in to configure.ac. Let's do that. Signed-off-by: Luis Chamberlain --- configure.in => configure.ac | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename configure.in => configure.ac (100%) diff --git a/configure.in b/configure.ac similarity index 100% rename from configure.in rename to configure.ac From patchwork Wed Feb 9 02:02:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 12739554 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C7F1C433F5 for ; Wed, 9 Feb 2022 02:39:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241374AbiBICj0 (ORCPT ); Tue, 8 Feb 2022 21:39:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244162AbiBICCb (ORCPT ); Tue, 8 Feb 2022 21:02:31 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46529C0613CB for ; Tue, 8 Feb 2022 18:02:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=UGzHVTPG4dvUvX/Z2TjedHo8ijns/SaCDuVs7mCNLA0=; b=HM+ho9+fH8ccFkqKf8ERzVywu6 KWmedZxN4vkQgCUlQ+4Nh8UjlmWz2eOLrP1AFwv/DH+snW3uJLmP+eLaIjGswxlKaNpTsLwK3O+39 hTsFFWlL2JkhKnRePj6vsQLfSYN6LL5DwkAxVT1Shf/D0fB4CgaeaI2T2adplT/fRqCiFZJDrE8S+ /JCs33/6FelEEUkzGeIrunwxasGG7sBIUCYb6roUezrYbASwnvgpVHuCEztRXEx8kIu4oI+H0ZkZc VjtzXcDragcN9ZqQXGRtImAJVhp/zMMY2yKMyG/Lwz8MamVdSjh4QWHDaEgpXUDbOG87pMoYbRLHF njRb4YGg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nHcJO-00Fxxb-4P; Wed, 09 Feb 2022 02:02:26 +0000 From: Luis Chamberlain To: raymond.barbiero.dev@gmail.com Cc: fstests@vger.kernel.org, Luis Chamberlain Subject: [PATCH 2/4] config.h.in: run autoheader and update Date: Tue, 8 Feb 2022 18:02:21 -0800 Message-Id: <20220209020223.3805346-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220209020223.3805346-1-mcgrof@kernel.org> References: <20220209020223.3805346-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Run autoheader and update config.h.in based on the latest autotools. Signed-off-by: Luis Chamberlain --- config.h.in | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/config.h.in b/config.h.in index 0b8a24f..82d417b 100644 --- a/config.h.in +++ b/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the `asprintf' function. */ #undef HAVE_ASPRINTF @@ -121,9 +121,6 @@ /* Define to 1 if you have the `lsetxattr' function. */ #undef HAVE_LSETXATTR -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_NDIR_H @@ -139,6 +136,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -171,6 +171,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H @@ -219,10 +222,13 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS -/* Define to 1 if you can safely include both and . */ +/* Define to 1 if you can safely include both and . This + macro is obsolete. */ #undef TIME_WITH_SYS_TIME /* Define _GNU_SOURCE so that we get all necessary prototypes */ From patchwork Wed Feb 9 02:02:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 12739551 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5E6EC4167B for ; Wed, 9 Feb 2022 02:39:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241119AbiBICjY (ORCPT ); Tue, 8 Feb 2022 21:39:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244156AbiBICCb (ORCPT ); Tue, 8 Feb 2022 21:02:31 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5185CC061348 for ; Tue, 8 Feb 2022 18:02:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=kJJu4cddWOeVRKP4W6qa3slSsXKVbv6Lgxw+HCtJntw=; b=4imxJY/hNcgq6whpBahUEMSzrP 4B3rrkh3ltLqzZwCEaHsl/Fz3TW2KmBZiMjfjfKwUATJTkckNnirVNvFIcMhYOU9OrKoJwps2ddBN B2cjo/gw80/Ymkej9gFr097l0oRzZ+d8RUuMW7rKEwbr+STLb6O2PqJwebFQPHx0SE+qRJw7F1+NG Br2Iq47HlGN6C07XUEqP1X9A0oYHdtdnT2ZO8rA3Q6JHPd2JVB6G4iCZsTr/RIJ5pbemKHQw/rDwM fbPQJJjX/9oeLez1mfp1QM6bQxZPN0JlHdWiAY+NEpZK26eNp2/QM7wG1b1faP54A5MBqNoLYZttf q82y99DQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nHcJO-00Fxxf-5P; Wed, 09 Feb 2022 02:02:26 +0000 From: Luis Chamberlain To: raymond.barbiero.dev@gmail.com Cc: fstests@vger.kernel.org, Luis Chamberlain Subject: [PATCH 3/4] Makefile: address deprecation of /usr/include/rpc Date: Tue, 8 Feb 2022 18:02:22 -0800 Message-Id: <20220209020223.3805346-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220209020223.3805346-1-mcgrof@kernel.org> References: <20220209020223.3805346-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org /usr/include/rpc is now removed from glibc. Software which uses that should use libtirpc-devel, and to make it work we should use pkg-config against that library. Fix making dbench compile again for rpc stuff. Signed-off-by: Luis Chamberlain --- Makefile.in | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 00af80e..a12affb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,6 +15,8 @@ LIBS=@LIBS@ -lpopt -lz @LIBSMBCLIENT@ @LIBISCSI@ DESTDIR=/ CC=@CC@ CFLAGS=@CFLAGS@ -I. -DVERSION=\"$(VERSION)\" -DDATADIR=\"$(datadir)\" +CFLAGS+=`pkg-config --cflags libtirpc` +LIBS+=`pkg-config --libs libtirpc` EXEEXT=@EXEEXT@ LIBNFS_OBJ = libnfs.o mount_client.o nfs_client.o mount_xdr.o nfs_xdr.o @@ -40,11 +42,11 @@ libnfs.a: $(LIBNFS_OBJ) nfsio.o: nfsio.c mount.h nfs.h @echo Compiling $@ - gcc -g -c nfsio.c -o $@ + gcc -g $(CFLAGS) -c nfsio.c -o $@ libnfs.o: libnfs.c libnfs.h mount.h nfs.h @echo Compiling $@ - gcc -g -c libnfs.c -o $@ + gcc -g $(CFLAGS) -c libnfs.c -o $@ mount.h: mount.x @echo Generating $@ @@ -56,7 +58,7 @@ nfs.h: nfs.x mount_xdr.o: mount_xdr.c mount.h @echo Compiling $@ - gcc -g -c mount_xdr.c -o $@ + gcc -g $(CFLAGS) -c mount_xdr.c -o $@ mount_xdr.c: mount.x @echo Generating $@ @@ -64,7 +66,7 @@ mount_xdr.c: mount.x mount_client.o: mount_client.c mount.h @echo Compiling $@ - gcc -g -c mount_client.c -o $@ + gcc -g $(CFLAGS) -c mount_client.c -o $@ mount_client.c: mount.x @echo Generating $@ @@ -72,7 +74,7 @@ mount_client.c: mount.x nfs_xdr.o: nfs_xdr.c nfs.h @echo Compiling $@ - gcc -g -c nfs_xdr.c -o $@ + gcc $(CFLAGS) -g -c nfs_xdr.c -o $@ nfs_xdr.c: nfs.x @echo Generating $@ @@ -80,7 +82,7 @@ nfs_xdr.c: nfs.x nfs_client.o: nfs_client.c nfs.h @echo Compiling $@ - gcc -g -c nfs_client.c -o $@ + gcc -g $(CFLAGS) -c nfs_client.c -o $@ nfs_client.c: nfs.x @echo Generating $@ From patchwork Wed Feb 9 02:02:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 12739552 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0A28C4167E for ; Wed, 9 Feb 2022 02:39:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241221AbiBICjZ (ORCPT ); Tue, 8 Feb 2022 21:39:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244165AbiBICCb (ORCPT ); Tue, 8 Feb 2022 21:02:31 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 599C8C061353 for ; Tue, 8 Feb 2022 18:02:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=fHX01Uv1CO0hKp3SeIiwWsUvqactZ5BlTqGY5XH0z3Y=; b=sBBgR8EkUGlQ8sQUS8m4/5Wpd+ RAOk/TvcvQF/kRGRouafzojzTKbsz5oJ3NzJdtNjyv+8GKHW1TVVEQgHajV8+ueZndvOQDwfxSLSa iNBNhk1VLTmKBdYBq0h43/HMJwTwUM6hLj669/M2LgReCYaqlLgQpzAP80LR7H5zSF3ylCi4Q7WRy 0ltx4ivbathgdc5+i4K4y8X9THWvZvMm17KGY50092v0yGK6B+YY80q0x39AQwUAe9KaXlOVcujOk Kh0UYNWGEonc09BliFiGd85n2kGEVmvz0Sn3wUWiai21wF/3maHMkTbVFqBzp/Vxq1HcLIWtz8AMg j+zbs07g==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nHcJO-00Fxxj-6O; Wed, 09 Feb 2022 02:02:26 +0000 From: Luis Chamberlain To: raymond.barbiero.dev@gmail.com Cc: fstests@vger.kernel.org, Luis Chamberlain Subject: [PATCH 4/4] libnfs.c: fix compilation due to intptr_t move Date: Tue, 8 Feb 2022 18:02:23 -0800 Message-Id: <20220209020223.3805346-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220209020223.3805346-1-mcgrof@kernel.org> References: <20220209020223.3805346-1-mcgrof@kernel.org> MIME-Version: 1.0 Sender: Luis Chamberlain Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org intptr_t is now part of thread_db.h, so include that file to make it compile again. dbench now at least compiles on debian testing. Signed-off-by: Luis Chamberlain --- libnfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libnfs.c b/libnfs.c index 1f60ef0..edbcd61 100644 --- a/libnfs.c +++ b/libnfs.c @@ -17,6 +17,7 @@ along with this program; if not, see . */ #define _FILE_OFFSET_BITS 64 +#include #include "mount.h" #include "nfs.h" #include "libnfs.h"