Quick fix for last changes to sysmacros.h that breaks a few things like sys-libs/pwdb and xfree among others.

4 files changed, 83 insertions, 4 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index c8238f90ce01..8659741660be 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.84 2003/09/28 23:46:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.85 2003/09/29 22:51:44 azarah Exp $
+
+  30 Sep 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.3.2-r6.ebuild,
+  files/2.3.2/sysmacros.h:
+  Quick fix for last changes to sysmacros.h that breaks a few things like
+  sys-libs/pwdb and xfree among others.
 
 *glibc-2.3.2-r6 (28 Sep 2003)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 5eb36e93898c..dffb4a1984b7 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,10 +1,10 @@
 MD5 faecaafd64455df8f1a0b21b657581a3 glibc-2.3.2-r2.ebuild 17616
 MD5 ec652c5641efa40df96db52e3b00f91e glibc-2.2.5-r8.ebuild 9682
 MD5 89f63166320e4607f935b2930c3b45d9 glibc-2.3.2-r3.ebuild 17330
-MD5 27dbe76e0be4041b10f0c9c70d523fd2 ChangeLog 17221
+MD5 d25301fe70dd4b4d5e66d86ae036c479 ChangeLog 17438
 MD5 bbd9fe3118554c69975335a9743a7746 glibc-2.3.2-r1.ebuild 16405
 MD5 1e8074131f0afe3b08b9c2b07eccd001 glibc-2.3.2-r4.ebuild 17343
-MD5 fc0c714dfaa387e87777068f47ed8833 glibc-2.3.2-r6.ebuild 16985
+MD5 2286fe6ad49bebfcf288cecf47097995 glibc-2.3.2-r6.ebuild 17129
 MD5 4ed49e594e024c91fcc2a74385a7fab4 glibc-2.3.2-r5.ebuild 16984
 MD5 911665b60e1101be73f4b3213131abf5 glibc-2.3.1-r4.ebuild 10287
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
@@ -66,6 +66,7 @@ MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.p
 MD5 d21659e6aa8802290d6734ec118bbb81 files/2.3.2/glibc-2.3.2-mips-pread-linux2.5.patch 5310
 MD5 1a926f1adc2f321abb31b1e11024e3ac files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
 MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344
+MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
 MD5 5182f441608833569cb9e78536baf8af files/2.2.5/glibc-2.2.5-arm-errlist-fix.diff 2210
 MD5 93c2f3cb1c07d9a39da245b065c74f6c files/2.2.5/glibc-2.2.5-divdi3.diff 9752
 MD5 e9d9d086e8ed29ed49252d4cd0050f66 files/2.2.5/glibc-2.2.5.restrict_arr.patch 762
diff --git a/sys-libs/glibc/files/2.3.2/sysmacros.h b/sys-libs/glibc/files/2.3.2/sysmacros.h
new file mode 100644
index 000000000000..a9bfa78d3ef2
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.2/sysmacros.h
@@ -0,0 +1,69 @@
+/* Definitions of macros to access `dev_t' values.
+   Copyright (C) 1996, 1997, 1999, 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _SYS_SYSMACROS_H
+#define _SYS_SYSMACROS_H	1
+
+#include <features.h>
+
+/* If the compiler does not know long long it is out of luck.  We are
+   not going to hack weird hacks to support the dev_t representation
+   they need.  */
+#ifdef __GLIBC_HAVE_LONG_LONG
+__extension__
+extern __inline unsigned int gnu_dev_major (unsigned long long int __dev)
+     __THROW;
+__extension__
+extern __inline unsigned int gnu_dev_minor (unsigned long long int __dev)
+     __THROW;
+__extension__
+extern __inline unsigned long long int gnu_dev_makedev (unsigned int __major,
+							unsigned int __minor)
+     __THROW;
+
+# if defined __GNUC__ && __GNUC__ >= 2
+__extension__ extern __inline unsigned int
+gnu_dev_major (unsigned long long int __dev) __THROW
+{
+  return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff);
+}
+
+__extension__ extern __inline unsigned int
+gnu_dev_minor (unsigned long long int __dev) __THROW
+{
+  return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff);
+}
+
+__extension__ extern __inline unsigned long long int
+gnu_dev_makedev (unsigned int __major, unsigned int __minor) __THROW
+{
+  return ((__minor & 0xff) | ((__major & 0xfff) << 8)
+	  | (((unsigned long long int) (__minor & ~0xff)) << 12)
+	  | (((unsigned long long int) (__major & ~0xfff)) << 32));
+}
+# endif
+
+
+/* Access the functions with their traditional names.  */
+# define major(dev) gnu_dev_major (dev)
+# define minor(dev) gnu_dev_minor (dev)
+# define makedev(maj, min) gnu_dev_makedev (maj, min)
+#endif
+
+#endif /* sys/sysmacros.h */
diff --git a/sys-libs/glibc/glibc-2.3.2-r6.ebuild b/sys-libs/glibc/glibc-2.3.2-r6.ebuild
index 397731b71db7..c62534e93063 100644
--- a/sys-libs/glibc/glibc-2.3.2-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r6.ebuild,v 1.1 2003/09/28 23:46:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r6.ebuild,v 1.2 2003/09/29 22:51:45 azarah Exp $
 
 IUSE="nls pic build nptl"
 
@@ -354,6 +354,10 @@ src_unpack() {
 		cd ${S}; epatch ${FILESDIR}/2.3.2/${P}-ia64-LOAD_ARGS-fixup.patch
 	fi
 
+	# Quick fix for borkage with sys-libs/pwdb, xfree, etc.
+	cp -f ${FILESDIR}/2.3.2/sysmacros.h \
+		${S}/sysdeps/unix/sysv/linux/sys/sysmacros.h
+
 	# Fix permissions on some of the scripts
 	chmod u+x ${S}/scripts/*.sh
 }