From patchwork Wed Feb 1 04:51:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9548911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7A73A60425 for ; Wed, 1 Feb 2017 04:52:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DDDA27FE4 for ; Wed, 1 Feb 2017 04:52:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FAAA283F4; Wed, 1 Feb 2017 04:52:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A73727FE4 for ; Wed, 1 Feb 2017 04:52:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750978AbdBAEwo (ORCPT ); Tue, 31 Jan 2017 23:52:44 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:33765 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750917AbdBAEwo (ORCPT ); Tue, 31 Jan 2017 23:52:44 -0500 Received: by mail-pg0-f68.google.com with SMTP id 194so32998621pgd.0 for ; Tue, 31 Jan 2017 20:52:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Vj9j/65ua/rIoGmwQQpFvWrV78pYcTPQHk6GdQYd+Ss=; b=VZJy5zkzyVA2tI3M64j2KNff/t30QH8eKCDG5cqs2t8pnUiJ9AP8nDROP8NUHn0W3Q A8Gxp9q8PWX/+RWBMIrxGMPOqYescuFvztvgmkrM79vMX3s056wuf7r1RrjEfuVMBnjb P7EOtnwVBQXiakjYrL++wSsh7eGyrqBCdjM1qqA2LozSf/QeNKFtNKXfasEQn+YfU4yy QC6IwWeb/lXB4dbQHkLrKRauU35OkpfI8LWT3MH3QlkrdA2PfQh2bM4y9vnxZbzNR2zB Qvk0+HROUfuyWFQeLgqldhKthpBfVx0+vGvlC6AvxwH2pL9tYIY0RWgRjlYljdbq44zi Uk7A== 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; bh=Vj9j/65ua/rIoGmwQQpFvWrV78pYcTPQHk6GdQYd+Ss=; b=BxYGHYCYvLGllo1TPhB6r1yZJ4zgJoNTwbtenknX/POyO8iAj8VLxUJ+4RoVxGM76r 1onsWd69NMDsHbg8EdIjKkqt9mUfC1ZMe0Lwz+sRhZPRs0NgpNIUOhIo0CzWC4f26OiZ GB1FgF1MfAI+TXXwApNryDUNnQ0US6aMlu9hBGQ/wQ9fq62hiHtRZKVxcML4ALX2HYtt 4jtCT+VDBv/hMsfhuClP6HLwg5oBGiQUIsfVJIBLjwUS20G+XCKT/2lx0G0zzlbpO2BX gM90KBNgi3LYYfIYCpP05O43uniakCslO3im40z9B1rtY3Wtm7xginbTlIoQ24b32d+K PS9A== X-Gm-Message-State: AIkVDXKQYtfd5uJUXG2PiGf9V6Oe3zXt8dEKWBDpFLPbir0pwDHfrhFHeZXWT/TFa8FAPQ== X-Received: by 10.98.103.195 with SMTP id t64mr1243275pfj.106.1485924763287; Tue, 31 Jan 2017 20:52:43 -0800 (PST) Received: from localhost.localdomain (c-73-239-167-150.hsd1.wa.comcast.net. [73.239.167.150]) by smtp.gmail.com with ESMTPSA id m12sm45401035pgc.46.2017.01.31.20.52.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 20:52:42 -0800 (PST) From: Eric Biggers To: linux-xfs Cc: Gwendal Grignou , Felix Janda , Eric Biggers Subject: [PATCH] Fix building xfsprogs on 32-bit platforms (again) Date: Tue, 31 Jan 2017 20:51:44 -0800 Message-Id: <20170201045144.29488-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers Building xfsprogs on 32-bit platforms was broken again by the recent split of BUILD_CFLAGS from CFLAGS. -D_FILE_OFFSET_BITS=64 was not added to BUILD_CFLAGS, but in fact BUILD_CFLAGS is used to compile crc32selftest, which includes xfs.h and therefore requires this declaration. Fix this by adding -D_FILE_OFFSET_BITS=64 to BUILD_CFLAGS. Fixes: 0a71e3839630 ("build: Allow compiling xfsprogs in a cross compile environment") Signed-off-by: Eric Biggers Reviewed-by: Eric Sandeen --- include/builddefs.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/builddefs.in b/include/builddefs.in index 612b547d..6554e421 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -26,7 +26,7 @@ MALLOCLIB = @malloc_lib@ LOADERFLAGS = @LDFLAGS@ LTLDFLAGS = @LDFLAGS@ CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -BUILD_CFLAGS = @BUILD_CFLAGS@ +BUILD_CFLAGS = @BUILD_CFLAGS@ -D_FILE_OFFSET_BITS=64 LIBRT = @librt@ LIBUUID = @libuuid@