r2564 - in glibc-package/trunk/debian: . patches patches/any
Author: madcoder
Date: 2007-09-16 18:19:24 +0000 (Sun, 16 Sep 2007)
New Revision: 2564
Removed:
glibc-package/trunk/debian/patches/any/local-sysmacros.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
Closes 442427.
* remove any/local-sysmacros.diff: sorry for bug #43659 but it makes gimp
(and presumably other software) FTBFS, it's too dispruptive.
Closes: #442427.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-09-14 00:26:47 UTC (rev 2563)
+++ glibc-package/trunk/debian/changelog 2007-09-16 18:19:24 UTC (rev 2564)
@@ -1,3 +1,11 @@
+glibc (2.6.1-5) UNRELEASED; urgency=low
+
+ * remove any/local-sysmacros.diff: sorry for bug #43659 but it makes gimp
+ (and presumably other software) FTBFS, it's too dispruptive.
+ Closes: #442427.
+
+ -- Pierre Habouzit <madcoder@debian.org> Sun, 16 Sep 2007 20:17:02 +0200
+
glibc (2.6.1-4) unstable; urgency=low
* Disable any/local-ipv6-lookup.diff as it is causing breakages.
Deleted: glibc-package/trunk/debian/patches/any/local-sysmacros.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-sysmacros.diff 2007-09-14 00:26:47 UTC (rev 2563)
+++ glibc-package/trunk/debian/patches/any/local-sysmacros.diff 2007-09-16 18:19:24 UTC (rev 2564)
@@ -1,30 +0,0 @@
---- libc/sysdeps/unix/sysv/linux/sys/sysmacros.h
-+++ libc/sysdeps/unix/sysv/linux/sys/sysmacros.h
-@@ -62,9 +62,24 @@
-
-
- /* 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)
-+static __inline unsigned int
-+__NTH (major (unsigned long long int dev))
-+{
-+ return gnu_dev_major (dev);
-+}
-+
-+static __inline unsigned int
-+__NTH (minor (unsigned long long int dev))
-+{
-+ return gnu_dev_minor (dev);
-+}
-+
-+static __inline unsigned long long int
-+__NTH (makedev (unsigned int maj, unsigned int min))
-+{
-+ return gnu_dev_makedev (maj, min);
-+}
- #endif
-
- #endif /* sys/sysmacros.h */
-+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-09-14 00:26:47 UTC (rev 2563)
+++ glibc-package/trunk/debian/patches/series 2007-09-16 18:19:24 UTC (rev 2564)
@@ -140,7 +140,6 @@
any/local-rtld.diff -p0
any/local-sysctl.diff -p0
any/local-stubs_h.diff
-any/local-sysmacros.diff
any/local-tcsetaddr.diff -p0
any/local-tst-mktime2.diff -p0
any/local-version-sanity.diff -p0
Reply to: