From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1auCMN-0000B9-TA for mharc-grub-devel@gnu.org; Sun, 24 Apr 2016 01:13:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auCML-00007R-MI for grub-devel@gnu.org; Sun, 24 Apr 2016 01:13:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1auCMG-0005M2-PC for grub-devel@gnu.org; Sun, 24 Apr 2016 01:13:29 -0400 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:33541) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auCMG-0005Ly-6I for grub-devel@gnu.org; Sun, 24 Apr 2016 01:13:24 -0400 Received: by mail-lf0-x244.google.com with SMTP id p64so13262996lfg.0 for ; Sat, 23 Apr 2016 22:13:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=WlT/H7RJ1I1DgYGuBmXrWgD0ttuCGiUWsp1y+cVqlzc=; b=iXIQgwN0VQKqlcfHRcsdIQNhXxxCfE/gzDp+0DZ7t4UzxuznmJJN6vNdnSQeKYYR79 4eti2Xnda9g3GbigCIp1g6rLp9ZySTYLW5Q44X2Dx/A05CppI6tw8q6HS5iKueyZXRBr YzWa8mT/No3VpXqVs5iIJ70OBwBOleC5yMGG0WNZI/3xO0N7XFlqgd/CgJ9rJMeVRZKu kp6me1yBqw4Kuc3V0QOHh6dBY5PRg9xVrt4lJW3I1EXiv6FWgkV2Sz8KghSlILFhJ2bl TqYbTuosOEL+O/fE3VW9U5sD50u7C20241abcwq0fRIBr3JeGLfkfmBGheWm85oTNcuI z11A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=WlT/H7RJ1I1DgYGuBmXrWgD0ttuCGiUWsp1y+cVqlzc=; b=ON0WX9cJZoyVZKxD2HXZFcOpwAJi2/62YLxwck7eXkzRDl8g0LJJw/HNOXVmD6CFlj xj3M2z8z+nEMnlxGq8Y4kjSAEI+yTjA1JRQ53SvbFtauKfEzjKm44XHAw1TR8DPHYQuS JmvSLIPFXDf2y+Y+qKQ/vGkK+dtUxwVhspC7g2ykkMfNIaq0y69DB82hF2zoO/k88DCg 2r8dTsA/wOfIQEIH7FHCw/eZh6B9BJQ9vy0sNVwQNjhuLw9YNYsL0eRSLeA+sUuVJBUE IYdfa3D9ToaEOhFHh38di6UOlHJAqSvIjN42qGubXMvxC+pBX0NDsHhOM+J9ck6wjjLW DJ+w== X-Gm-Message-State: AOPr4FWNG8WfaqwpoDNs07xzQ6/pqQOgdFkPMoSWYdLJyOoRZl9dDFnKvt5N+rwde1vR0w== X-Received: by 10.25.161.75 with SMTP id k72mr11941458lfe.86.1461474802583; Sat, 23 Apr 2016 22:13:22 -0700 (PDT) Received: from [192.168.1.42] (ppp109-252-90-50.pppoe.spdop.ru. [109.252.90.50]) by smtp.gmail.com with ESMTPSA id z21sm3146924lff.0.2016.04.23.22.13.21 for (version=TLSv1/SSLv3 cipher=OTHER); Sat, 23 Apr 2016 22:13:21 -0700 (PDT) Subject: Re: [PATCH v3] build: Use AC_HEADER_MAJOR to find device macros To: grub-devel@gnu.org References: <1461090442-5902-1-git-send-email-floppym@gentoo.org> From: Andrei Borzenkov Message-ID: <571C55F0.2040007@gmail.com> Date: Sun, 24 Apr 2016 08:13:20 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1461090442-5902-1-git-send-email-floppym@gentoo.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::244 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 05:13:30 -0000 19.04.2016 21:27, Mike Gilbert пишет: > Depending on the OS/libc, device macros are defined in different > headers. This change ensures we include the right one. > > sys/types.h - BSD > sys/mkdev.h - Sun > sys/sysmacros.h - glibc (Linux) > > glibc currently pulls sys/sysmacros.h into sys/types.h, but this may > change in a future release. > > https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html committed. Thanks! > --- > configure.ac | 3 ++- > grub-core/osdep/devmapper/getroot.c | 6 ++++++ > grub-core/osdep/devmapper/hostdisk.c | 5 +++++ > grub-core/osdep/linux/getroot.c | 6 ++++++ > grub-core/osdep/unix/getroot.c | 4 +++- > 5 files changed, 22 insertions(+), 2 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 57e1713..9ddfc53 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -388,7 +388,8 @@ fi > > # Check for functions and headers. > AC_CHECK_FUNCS(posix_memalign memalign getextmntent) > -AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h sys/mkdev.h limits.h) > +AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h limits.h) > +AC_HEADER_MAJOR > > AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$ac_includes_default > #include > diff --git a/grub-core/osdep/devmapper/getroot.c b/grub-core/osdep/devmapper/getroot.c > index 05eda50..72e5582 100644 > --- a/grub-core/osdep/devmapper/getroot.c > +++ b/grub-core/osdep/devmapper/getroot.c > @@ -40,6 +40,12 @@ > #include > #endif > > +#if defined(MAJOR_IN_MKDEV) > +#include > +#elif defined(MAJOR_IN_SYSMACROS) > +#include > +#endif > + > #include > > #include > diff --git a/grub-core/osdep/devmapper/hostdisk.c b/grub-core/osdep/devmapper/hostdisk.c > index 19c1101..a697bcb 100644 > --- a/grub-core/osdep/devmapper/hostdisk.c > +++ b/grub-core/osdep/devmapper/hostdisk.c > @@ -24,6 +24,11 @@ > #include > #include > > +#if defined(MAJOR_IN_MKDEV) > +#include > +#elif defined(MAJOR_IN_SYSMACROS) > +#include > +#endif > > #ifdef HAVE_DEVICE_MAPPER > # include > diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c > index 10480b6..09e7e6e 100644 > --- a/grub-core/osdep/linux/getroot.c > +++ b/grub-core/osdep/linux/getroot.c > @@ -35,6 +35,12 @@ > #include > #endif > > +#if defined(MAJOR_IN_MKDEV) > +#include > +#elif defined(MAJOR_IN_SYSMACROS) > +#include > +#endif > + > #include > #include /* ioctl */ > #include > diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c > index 1079a91..4bf37b0 100644 > --- a/grub-core/osdep/unix/getroot.c > +++ b/grub-core/osdep/unix/getroot.c > @@ -51,8 +51,10 @@ > #endif > > #include > -#if defined(HAVE_SYS_MKDEV_H) > +#if defined(MAJOR_IN_MKDEV) > #include > +#elif defined(MAJOR_IN_SYSMACROS) > +#include > #endif > > #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR) >