From: Theodore Ts'o Subject: Re: [PATCH 06/34] debugfs: add LIBINTL to debugfs link command Date: Fri, 19 Sep 2014 00:46:01 -0400 Message-ID: <20140919044601.GI26995@thunk.org> References: <20140913221112.13646.3873.stgit@birch.djwong.org> <20140913221152.13646.7986.stgit@birch.djwong.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-ext4@vger.kernel.org To: "Darrick J. Wong" Return-path: Received: from imap.thunk.org ([74.207.234.97]:36863 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752639AbaISEqG (ORCPT ); Fri, 19 Sep 2014 00:46:06 -0400 Content-Disposition: inline In-Reply-To: <20140913221152.13646.7986.stgit@birch.djwong.org> Sender: linux-ext4-owner@vger.kernel.org List-ID: On Sat, Sep 13, 2014 at 03:11:52PM -0700, Darrick J. Wong wrote: > Since debugfs now links in the journal code (which in turn depends on > internationalization libraries) we must add a linker option to pull > that in on Mac OSX. > > Signed-off-by: Darrick J. Wong The dependency on the internationalization libraries wasn't caused by the journal code. It was caused by create_inode.h pulling in nls-enable.h indiscriminately. The following should fix things (I'll check this in alongside some other patches needed to allow e2fsprogs to build under dietlibc): diff --git a/misc/create_inode.c b/misc/create_inode.c index 7f57979..cf7c097 100644 --- a/misc/create_inode.c +++ b/misc/create_inode.c @@ -17,6 +17,7 @@ #endif #include "create_inode.h" +#include "nls-enable.h" #if __STDC_VERSION__ < 199901L # if __GNUC__ >= 2 diff --git a/misc/create_inode.h b/misc/create_inode.h index 067bf96..145fd57 100644 --- a/misc/create_inode.h +++ b/misc/create_inode.h @@ -7,7 +7,6 @@ #include "et/com_err.h" #include "e2p/e2p.h" #include "ext2fs/ext2fs.h" -#include "nls-enable.h" struct hdlink_s { diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 69045b2..f09351d 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -58,6 +58,7 @@ extern int optind; #include "quota/quotaio.h" #include "mke2fs.h" #include "create_inode.h" +#include "nls-enable.h" #define STRIDE_LENGTH 8