From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Rtqeh-0004vd-EI for mharc-grub-devel@gnu.org; Sat, 04 Feb 2012 20:12:35 -0500 Received: from eggs.gnu.org ([140.186.70.92]:51717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtqed-0004vW-WB for grub-devel@gnu.org; Sat, 04 Feb 2012 20:12:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rtqec-0006ge-Ge for grub-devel@gnu.org; Sat, 04 Feb 2012 20:12:31 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:38652) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtqec-0006gU-7m for grub-devel@gnu.org; Sat, 04 Feb 2012 20:12:30 -0500 Received: from [192.168.0.4] (d14-69-47-19.try.wideopenwest.com [69.14.19.47]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id 8E1AA1B4003 for ; Sun, 5 Feb 2012 01:12:28 +0000 (UTC) Message-ID: <4F2DD775.7010700@gentoo.org> Date: Sat, 04 Feb 2012 20:12:21 -0500 From: Mike Gilbert User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20120105 Thunderbird/9.0 MIME-Version: 1.0 To: grub-devel@gnu.org Subject: Re: [MERGE] Add a --disable-zfs configure flag. References: <4F2D8D69.8040101@gentoo.org> <4F2D8FD8.40604@gmail.com> <4F2D9912.5040702@gentoo.org> <4F2DB2FB.5090309@gentoo.org> In-Reply-To: <4F2DB2FB.5090309@gentoo.org> X-Enigmail-Version: 1.3.4 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------enigC98759E8FCD68EB4652D40B7" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 140.211.166.183 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2012 01:12:33 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigC98759E8FCD68EB4652D40B7 Content-Type: multipart/mixed; boundary="------------030100060104060109080507" This is a multi-part message in MIME format. --------------030100060104060109080507 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Here's a new bundle including a --without-libzfs flag, and a fix for my build issue. --------------030100060104060109080507 Content-Type: text/x-patch; name="grub-zfs-changes.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="grub-zfs-changes.patch" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: floppym@gentoo.org-20120205010752-empg4oxbegj3fepe # target_branch: http://bzr.savannah.gnu.org/r/grub/trunk/grub/ # testament_sha1: 3de5f3713591cd87700717bed9a9371d99f3e053 # timestamp: 2012-02-04 20:08:34 -0500 # base_revision_id: phcoder@gmail.com-20120204204729-kvhzfohes2vqg8h9 #=20 # Begin patch =3D=3D=3D modified file 'configure.ac' --- configure.ac 2012-02-04 20:47:29 +0000 +++ configure.ac 2012-02-05 01:05:27 +0000 @@ -974,16 +974,21 @@ [Define to 1 if you have the LZMA library.])],) AC_SUBST([LIBLZMA]) =20 -AC_CHECK_LIB([zfs], [libzfs_init], - [LIBZFS=3D"-lzfs" - AC_DEFINE([HAVE_LIBZFS], [1], - [Define to 1 if you have the ZFS library.])],) +AC_ARG_WITH([libzfs], + [AS_HELP_STRING([--without-libzfs], [Do not use libzfs.])]= ) + +if test x"$with_libzfs" !=3D xno; then + AC_CHECK_LIB([zfs], [libzfs_init], + [LIBZFS=3D"-lzfs" + AC_DEFINE([HAVE_LIBZFS], [1], + [Define to 1 if you have the ZFS library.])],)= + + AC_CHECK_LIB([nvpair], [nvlist_print], + [LIBNVPAIR=3D"-lnvpair" + AC_DEFINE([HAVE_LIBNVPAIR], [1], + [Define to 1 if you have the NVPAIR library.])= ],) +fi AC_SUBST([LIBZFS]) - -AC_CHECK_LIB([nvpair], [nvlist_print], - [LIBNVPAIR=3D"-lnvpair" - AC_DEFINE([HAVE_LIBNVPAIR], [1], - [Define to 1 if you have the NVPAIR library.])],= ) AC_SUBST([LIBNVPAIR]) =20 LIBS=3D"" =3D=3D=3D modified file 'util/getroot.c' --- util/getroot.c 2012-02-03 21:36:51 +0000 +++ util/getroot.c 2012-02-05 01:07:52 +0000 @@ -2380,7 +2380,7 @@ } #endif =20 -#ifdef HAVE_LIBZFS +#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR) static libzfs_handle_t *__libzfs_handle; =20 static void # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZtMHVMABbj/gAAcAQB9Z= /// f+/dmr////BgCbz6e7nVKeDVb2tpxTtSLpoKAAANRTNTTEAyNA0NAxAANMgADQGQSUCniGU2q= n4k 9U9T1ANAAAAAAAAJSmjBBoI9VH6NU/RMakeoGj1AyDR6jJoAASJJT9CZMgmTUxMTIaAGQaAMh= iNk mIcZMmjENNDATQxNGmTEDIwmjTTCDJgqSQmjQJpiaATaJNGmmiaek0A2oAGg2pZo18+4FDOWO= edB 0bRznZDqI5jdUYNzesjZDOMx37qDenVvStMrt19BYIvasYBu9NNVmOLq1RUFcSlKNaiZgW05m= lJL 0bmV/x38sD+MyZqsVUqlKnDqhr3Rq1iZS2EVkSyUqnNRllkk3SppwUsUmFjsDIXpbAv1q1D8P= RNH UdoR/jEVnNzaZ6dsNm+AVOEgBhwLFG3OqQ840iTtTTp3cuoOQOtNWoO9v23WMKmFoCGQQPPBC= Bme GFVxsGsbXohTXLD4aOYOBADB8pZgFEKUnOPWiioT2fRD9M80+o9h4Q80ehc7vXCuftNJyRqZT= zm2 /169O32bNLRC04Qvt7ZIdYo8WjNXXEREREQW5nhgrSL2gk4Y84RAZFiQ/X0nvkl0SMfrdd0iM= J8y 3ffg+UtfImejoWskrsCDVE5JKfncrxDyXILjJRVTCVjRakqEGrPds1Uw0YFj5T8ocCYKSZ/I4= Z4Z 4Un3dw3be00wuLzfiSOFclZ1/HfOuxlDCbDNWcRkT8goCrOClLtC8JqRcV5jDl3wlg4rSC8TP= p2b 1/UMT2LsGXy497kwZUrspfLl9cL9jXknh0xEuJGck1lSThuRp2LZqRWZGq/i1aJeggqSJ361I= 1kt r0HJ0eKwXMxQTBw7dRC3GJYxnjOxeQEcYNxzgNnggkmJsJzLERo/CIXMhntDlEbTM9jZXlUFx= g9C 4Ua00UsHiwmrOT5u3SZEUYF5rl/hPV7rq4Uu2U2Em8WMAVoyihMGCT6y5FzbWgNFfg95NDnDx= FZZ F9XSMW8EFbRDxgwxgW2VK0wkd7Yx33z4RbdwivO6UlN5AwsG0wpdiOweLIig4WzJyGUuuMisq= mBH ihnBBdAcSmRLMYDWvdFMzFonGLwCL+ARbiY52J2OhUWiHZsCl+3hAlYgMk9XTpvygVyaolSTX= bg0 QVKMG6dS2a/cyzc4dcNUymeY7EU3c+SMtRqbqtjdvTMEZKtIrLI64jCdjx4siDwSCLXURLpHr= K0w EdBBNRyhmquEzB4iGKcFBEdCLsB8KDS4kwbK+h0wpzY00imvRd89sKRSFFwTD4QcKnqcV4guG= zLo uMzbnwswhwhjkuWrFGatd8vvnhErDcYg5AwNRr6GLrDtderEYtKMZcaJsrgaLOWTrFXFbykMD= aYl qNxYXliYQsZisBoiY4FHzvznAo/c+z6/qPUa3CVaWlvdDbbcmaFypvcD1JIPIg03F59jrDuPY= fAN /qMVaGMYhts6ZC+NQyQpkioLTVVgNC6iCnsCxHcispMYcv9wt6jAXAdZUYw7pnHSqmN3GVFcD= Zmm U+U6TYzTomxTTLtpZV7GX+E815vMdZhWUg0GkgkaRwNdRyBzHCcJnvoW/SbQujWO02kuAoqsX= AvK DiUIXJKUQBIx+s9ZxcZSCmMOInPnVz9TfV0CugYaZHevrnLgzYoHG6imyoUPV7pw1IJcI++Gm= fHR sOwxOzratcPxR8dJGLVDF9Hx7MVtKYWESC8DGUVFJGMcTlgKu7BLw5vTAvS1DQ5YKR9SF88ZS= dud TodHHjzs/B6l2/rcnlfe3aMGUxYOWtsXcDf0brHdDfDYceqfhKnHRlTjss5czewJqwZZ2p0C+= ldA I7QwM8KASc4Utc24m4oE20DsSmgFuyQGHHqDA2Id2bRkUkzhiKQJAVhjbshyZss2uazdjnEMi= UnR bSTfPRQu+a2XAe+w2GreG8Ki4TwKWnWaIlND00eOl3XsOLCu92zFq1rvR7F3HWabtct8A3hx7= 9rp +00OY9LINa1qifCVHo2v0/IPA9adj/vePCSHrJYmdN/l2lofL2cjvNRxPMzqNc6NYXkvMI8vB= w67 s+pWeHXywpbmw4HK4le4zt1j2oqoorQJe+VC3ZSSgQZiJAgXAZc0fkWPacIr3PpVqillWillW= KWV bMY+ozY1GBV0ksX9sg3eCf3Li+r4PlJDVqq5GlPFGEMjRDajw6jtLW8g/b9+90wzMr7Ped9nm= j5i 9Hjg7SU3lYx+aR1+6RXae03EoxMT5ZOl841o9pm74fAvJcDOCCSg6+qv2bg0AwGAFKeWtLwCM= fwn hDmeC/Wm7yT0R3Q9CkcYlHuLkV6gyixUjIuDRge+ipQ3Wx7TKsv61a2/j1HMzdKNckOcLodBW= Pmj 8ZIYw8YXnebxxh2GcwMB1JlTHALdJaZoviVRZJS2Bb4MMxdUkSqJRN/Vttu5zx1SQ8XfDp6sT= Qi6 +JpD7p7y5GmSGAzSQxuiV+iSFQ8IfSvJq1zortc3L4J2nRDl6p3FiiXjsjzrSXJfDa618kOd5= dfJ DVDjDrhqOUKR9OCNaO3VdbYm6oWvicE12qHViRtPM3jNJDQ6em6GfsqX3l8MCqK5lDJRiLypM= dZz LzXr51KqVVVqLswWMT0qVUqlVDFL6PtmMTZvR0Xbeo6NrwNq++bcxhrox9BR2wsWnQakXnCGW= e8p oLtJq1jNNUkNMSiVW6ZrE1wyNDwRgb2dHEzWZbEUzvs7UeF2z4I+E3txPcYBYwOaO9HpOSPuu= c50 Ka0qLMidaHVDkfbCkeiPKSGLKdPZHcel7xt5U9tX1am0yhij/4u5IpwoSE2mDqmA --------------030100060104060109080507-- --------------enigC98759E8FCD68EB4652D40B7 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iF4EAREIAAYFAk8t13oACgkQC77qH+pIQ6RazgEAyC+gcUHLfKXycGqnDTY6kjdj z209s3S5+6A/Q83YRpIA/RuWqdtnNSqnQJPAtAAKzanHt5uMynKmnHWKNkWV2Rcm =5Fr7 -----END PGP SIGNATURE----- --------------enigC98759E8FCD68EB4652D40B7--