[Glibc-bsd-commits] r1422 - in trunk: glibc-2.3-head/patches/fixes kfreebsd-kernel-headers/debian kfreebsd-kernel-headers/debian/patches libfreebsd/debian

[Petr Salinger]

Author: ps-guest
Date: 2006-04-02 19:08:12 +0000 (Sun, 02 Apr 2006)
New Revision: 1422

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff
Removed:
   trunk/glibc-2.3-head/patches/fixes/concat_macro.patch
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/libfreebsd/debian/control
Log:
* workaround difference between glibc and FreeBSD behaviour of __CONCAT() macro



Deleted: trunk/glibc-2.3-head/patches/fixes/concat_macro.patch
===================================================================
--- trunk/glibc-2.3-head/patches/fixes/concat_macro.patch	2006-04-02 08:43:15 UTC (rev 1421)
+++ trunk/glibc-2.3-head/patches/fixes/concat_macro.patch	2006-04-02 19:08:12 UTC (rev 1422)
@@ -1,21 +0,0 @@
-
-Author: petr
-Status: rejected upstream - http://sourceware.org/bugzilla/show_bug.cgi?id=2471
-
-Index: misc/sys/cdefs.h
-===================================================================
-RCS file: /cvs/glibc/libc/misc/sys/cdefs.h,v
-retrieving revision 1.65
-diff -u -r1.65 cdefs.h
---- misc/sys/cdefs.h	14 Jan 2006 20:14:36 -0000	1.65
-+++ misc/sys/cdefs.h	20 Mar 2006 21:52:22 -0000
-@@ -77,7 +77,8 @@
- /* For these things, GCC behaves the ANSI way normally,
-    and the non-ANSI way under -traditional.  */
- 
--#define __CONCAT(x,y)	x ## y
-+#define __CONCAT1(x,y)	x ## y
-+#define __CONCAT(x,y)	__CONCAT1(x,y)
- #define __STRING(x)	#x
- 
- /* This is not a typedef so `const __ptr_t' does the right thing.  */

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2006-04-02 08:43:15 UTC (rev 1421)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2006-04-02 19:08:12 UTC (rev 1422)
@@ -1,7 +1,7 @@
-kfreebsd-kernel-headers (0.18) unreleased; urgency=low
+kfreebsd-kernel-headers (0.18) UNRELEASED; urgency=low
+  [ Petr Salinger ]
+  * workaround glibc behaviour of __CONCAT() macro
 
-  * 
-
  -- Robert Millan <rmh at aybabtu.com>  Wed, 29 Mar 2006 20:33:38 +0200
 
 kfreebsd-kernel-headers (0.17) unreleased; urgency=low

Added: trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff	2006-04-02 08:43:15 UTC (rev 1421)
+++ trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff	2006-04-02 19:08:12 UTC (rev 1422)
@@ -0,0 +1,16 @@
+--- sys/elf_generic.h	2006-04-02 16:51:38.000000000 +0200
++++ sys/elf_generic.h	2006-04-02 16:51:38.000000000 +0200
+@@ -50,9 +50,10 @@
+ #error "Unknown byte order"
+ #endif
+ 
+-#define __elfN(x)	__CONCAT(__CONCAT(__CONCAT(elf,__ELF_WORD_SIZE),_),x)
+-#define __ElfN(x)	__CONCAT(__CONCAT(__CONCAT(Elf,__ELF_WORD_SIZE),_),x)
+-#define __ELFN(x)	__CONCAT(__CONCAT(__CONCAT(ELF,__ELF_WORD_SIZE),_),x)
++#define ___CONCAT(a,b)  __CONCAT(a,b)
++#define __elfN(x)	___CONCAT(___CONCAT(___CONCAT(elf,__ELF_WORD_SIZE),_),x)
++#define __ElfN(x)	___CONCAT(___CONCAT(___CONCAT(Elf,__ELF_WORD_SIZE),_),x)
++#define __ELFN(x)	___CONCAT(___CONCAT(___CONCAT(ELF,__ELF_WORD_SIZE),_),x)
+ #define __ElfType(x)	typedef __ElfN(x) __CONCAT(Elf_,x)
+ 
+ __ElfType(Addr);

Modified: trunk/libfreebsd/debian/control
===================================================================
--- trunk/libfreebsd/debian/control	2006-04-02 08:43:15 UTC (rev 1421)
+++ trunk/libfreebsd/debian/control	2006-04-02 19:08:12 UTC (rev 1422)
@@ -3,7 +3,7 @@
 Section: libs
 Maintainer: Debian GNU/kFreeBSD <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>
-Build-Depends: debhelper (>= 5), libc0.1-dev (>= 2.3.6-4+kbsd.r1387)
+Build-Depends: debhelper (>= 5), kfreebsd-kernel-headers (>= 0.18)
 Standards-Version: 3.6.2
 
 Package: libfreebsd0