Add fix from upstream for missing call to AC_BIG_ENDIAN in configure.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.4 x86_64

4 files changed, 270 insertions, 7 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index be7faa952562..24fc1e16f945 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.252 2008/12/02 21:22:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.253 2008/12/06 01:35:54 vapier Exp $
+
+  06 Dec 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.14-AC_BIG_ENDIAN.patch, util-linux-2.14.1.ebuild:
+  Add fix from upstream for missing call to AC_BIG_ENDIAN in configure.
 
   02 Dec 2008; Brent Baude <ranger@gentoo.org> util-linux-2.14.1.ebuild:
   stable ppc64, bug 249107
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 9b6c814f6cd8..74a23c1cf3bb 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -31,6 +31,7 @@ AUX util-linux-2.13-ioprio-syscalls.patch 353 RMD160 a71a1423c1b6fa96320285d8a29
 AUX util-linux-2.13-setuid-checks.patch 1860 RMD160 9146bad2a5593424f52cea4615e4fe53cff60654 SHA1 c4da69c54a735c9fa717ef9c0dc07d11cd731181 SHA256 aec9802cace8538a77e006721b05bf50436b116f5e56d7468ca85ffc253d7e0a
 AUX util-linux-2.13-uclibc.patch 1627 RMD160 3c52bac5b792c3ee6ccf69324729793314f279af SHA1 d85ad97b602daec290cc28858269ae4bcc0666f3 SHA256 7f0c5dcf91d3143c99006ada59ccb7842427933ad14e39c88bfaa7985d91a392
 AUX util-linux-2.13.1-no-a.out.patch 659 RMD160 8398db67db7224038e51cd9febc239d0cd6072d7 SHA1 29573af66b0e1fd68cfacf7109ad8470fbebc432 SHA256 4b70927a0c635c514d2ee71a33d71e43292e70b4fcfaae2fc789383f3486b51b
+AUX util-linux-2.14-AC_BIG_ENDIAN.patch 6651 RMD160 19e09c9c00461306065c194188529ffb137e7c7f SHA1 1b51e7c12014e817a3125b6dcc5bef47cb344aac SHA256 77f699a5e648dd89126172ae4c36b99dac7b1eb146c6036d0373851fe71eb304
 DIST loop-AES-v3.1f.tar.bz2 173423 RMD160 7490e3d90727621fde3052fd1747af338518b158 SHA1 abcc9c29c16596923a0c50a9190025a08b069ef4 SHA256 f744f3dd74b554d1a2e3788752c4a63049647bfd2bae71d9fff2427c0e175ca7
 DIST loop-AES-v3.2c.tar.bz2 222421 RMD160 d6b3781103aa64aa6db738083ff2d1adb4f9ca8f SHA1 63102863459370e35f4edb26e83f548f8ce1a7bb SHA256 c0313b445cb41ef586ba9774fc7cbf41114d93064b3417cf8512da6f746d3542
 DIST util-linux-2.12i-cryptoapi-losetup.patch.bz2 4800 RMD160 82e54aedd691aa93b67de9dfb9049a3f012a29f7 SHA1 69b757c28b6401abe454f060c2a24da49e2d129a SHA256 565a0cc6c3c148a66969276ae9d34dc34f19fbd45df2740343793ee067b3700f
@@ -41,14 +42,14 @@ DIST util-linux-ng-2.14.1-20081015.diff.bz2 51788 RMD160 eb657a6e5a0cdd3545716ce
 DIST util-linux-ng-2.14.1.tar.bz2 2929618 RMD160 23484769f7b73aeb3170333e7656ae2c9613d380 SHA1 4b738db04b27278329af216b15e96752e5af8cc3 SHA256 bf289c5399ab78674d9662ff2906a63ab540e88bf8bb1d3c7326dc8b1bef802c
 EBUILD util-linux-2.12r-r8.ebuild 6784 RMD160 c84f893ea67a77fa83a2f04952ae745aaa4dcba4 SHA1 39cb035a05e3437e2a9cd28e4b6d7c0886e9a7b7 SHA256 23cdadb84a007b9560e6d70b0d42d51fca3902712c071790ec0676564c1ce3c0
 EBUILD util-linux-2.13.1.1.ebuild 2546 RMD160 592f2c38b3c01a58d2bc430f11a7db697be21cdc SHA1 aaac3b9b08bcb7918753c5ac46afa2c02608f0b2 SHA256 6954ec92e5e04058f1900df62fc1efc445fe8444f4b28e36aaef40eda332f707
-EBUILD util-linux-2.14.1.ebuild 2573 RMD160 dfc1ae7c9ed9096f4ae10b894cc0fe6338661abf SHA1 3efb0af38cc45915f5ac417c49bdccb05679e4b6 SHA256 1b85dde15e3bb1710829a92eab615198e97d7d3ec2aa3a4ab1537be7ffcf797e
+EBUILD util-linux-2.14.1.ebuild 2627 RMD160 b25bbc9c3591403628e4ec5bb90a35a9d5c5805a SHA1 ec0b41c31776f3c216364ba34b00a3afc5b818f8 SHA256 bf8a3baa3e16755a0a4638903f5e90e7978919d0796fa409700bb0c393c5b12d
 EBUILD util-linux-9999.ebuild 2115 RMD160 2e24b69651286dc8c751b39c7b43a9cbd6f579ab SHA1 e6d713b5b4e75bf2ede0b4a817789e75a9ef52f7 SHA256 c96b58766ac5e81ca689d2ae3e84cb9252b3129b4ea7f88b15cc2d290b86515f
-MISC ChangeLog 38602 RMD160 5b1d08be795cf9b5cf098aafe68d1fe60c4dedc5 SHA1 0d28d5847d6eb2753c64cd29e55a57e35ee0b048 SHA256 55ad7e4ff0268cfb80493ceb05b43dd4d8d0695d523738a048dc2646e1106eb9
+MISC ChangeLog 38797 RMD160 e0423468960fffb265fc8549eef71a180f52a9af SHA1 2b722776bca740226b1ceb611dd4d81c9f106643 SHA256 0991564563aa0b6e0ec8cc8982644386be171db01731cb1262777bee146fad5d
 MISC metadata.xml 353 RMD160 747c4d6bef851325d143fed904bae6b102d6eb09 SHA1 782b133d9f9bc0662dd84aa6a4f17a117a96b69e SHA256 53c1f227fbd4fd73ef99f545de234c3608b2ca15268c6953f191a18653f26dc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk5aAQACgkQ67wieSYcaxd6QgCgzta5zNJTFJVAoqzy81WYawh8
-r4EAoLGbgxNc+NreLxsNNGuUIPH6Qzew
-=MpOh
+iEYEARECAAYFAkk51wAACgkQ67wieSYcaxfkfACggHVxP6AzTdWEqdSPcDam36Xf
+kXoAn0a9ZY9cglbgh3zw46cJSOLquH/U
+=cN2e
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/util-linux-2.14-AC_BIG_ENDIAN.patch b/sys-apps/util-linux/files/util-linux-2.14-AC_BIG_ENDIAN.patch
new file mode 100644
index 000000000000..beff6b84fd6c
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.14-AC_BIG_ENDIAN.patch
@@ -0,0 +1,257 @@
+patch configure to avoid running autotools
+
+commit 43f2d5bcbc61d2fb4731a7a28908fee20132727f
+Author: Karel Zak <kzak@redhat.com>
+Date:   Fri Dec 5 14:01:12 2008 +0100
+
+build-sys: add missing AC_C_BIGENDIAN
+
+This configure test is required in include/bitops.h.
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+--- configure
++++ configure
+@@ -5157,6 +5157,243 @@ fi
+ done
+ 
+ 
++{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
++if test "${ac_cv_c_bigendian+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # See if sys/param.h defines the BYTE_ORDER macro.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
++ bogus endian macros
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  # It does; now see whether it defined to BIG_ENDIAN or not.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_c_bigendian=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_c_bigendian=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	# It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++  # try to guess the endianness by grepping values into an object file
++  ac_cv_c_bigendian=unknown
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++int
++main ()
++{
++ _ascii (); _ebcdic ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  ac_cv_c_bigendian=yes
++fi
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++  if test "$ac_cv_c_bigendian" = unknown; then
++    ac_cv_c_bigendian=no
++  else
++    # finding both strings is unlikely to happen, but who knows?
++    ac_cv_c_bigendian=unknown
++  fi
++fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++
++  /* Are we little or big endian?  From Harbison&Steele.  */
++  union
++  {
++    long int l;
++    char c[sizeof (long int)];
++  } u;
++  u.l = 1;
++  return u.c[sizeof (long int) - 1] == 1;
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=no
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_c_bigendian=yes
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
++case $ac_cv_c_bigendian in
++  yes)
++
++cat >>confdefs.h <<\_ACEOF
++#define WORDS_BIGENDIAN 1
++_ACEOF
++ ;;
++  no)
++     ;;
++  *)
++    { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++
++
+ 
+ 
+ 
diff --git a/sys-apps/util-linux/util-linux-2.14.1.ebuild b/sys-apps/util-linux/util-linux-2.14.1.ebuild
index c2c78c6b8e89..08982bb5f28d 100644
--- a/sys-apps/util-linux/util-linux-2.14.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.14.1.ebuild,v 1.11 2008/12/05 17:42:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.14.1.ebuild,v 1.12 2008/12/06 01:35:54 vapier Exp $
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
 inherit eutils
@@ -43,6 +43,7 @@ src_unpack() {
 		unpack ${A}
 		cd "${S}"
 		#epatch "${FILESDIR}"/${PN}-2.13-uclibc.patch #203711
+		epatch "${FILESDIR}"/${PN}-2.14-AC_BIG_ENDIAN.patch
 		use loop-aes && epatch "${WORKDIR}"/util-linux-ng-2.14.1-20081015.diff
 		epatch "${FILESDIR}"/${PN}-2.13.1-no-a.out.patch #221939
 	fi