SOURCES: device-mapper-klibc.patch - don't include locale headers ...

[sparky]

Author: sparky                       Date: Wed Sep 27 18:26:23 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- don't include locale headers when building with klibc

---- Files affected:
SOURCES:
   device-mapper-klibc.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/device-mapper-klibc.patch
diff -u SOURCES/device-mapper-klibc.patch:1.5 SOURCES/device-mapper-klibc.patch:1.6
--- SOURCES/device-mapper-klibc.patch:1.5	Tue Aug 22 22:55:55 2006
+++ SOURCES/device-mapper-klibc.patch	Wed Sep 27 20:26:18 2006
@@ -1,7 +1,6 @@
-diff -urN device-mapper.1.02.05.org/configure.in device-mapper.1.02.05/configure.in
---- device-mapper.1.02.05.org/configure.in	2006-04-19 18:38:56.000000000 +0200
-+++ device-mapper.1.02.05/configure.in	2006-04-22 20:55:32.442643250 +0200
-@@ -66,7 +66,7 @@
+--- device-mapper.1.02.09.orig/configure.in	2006-09-27 18:22:22.000000000 +0000
++++ device-mapper.1.02.09.klibc/configure.in	2006-09-27 18:22:22.000000000 +0000
+@@ -69,7 +69,7 @@
  AC_HEADER_STDC
  AC_HEADER_TIME
  
@@ -10,9 +9,9 @@
  
  AC_CHECK_HEADERS(termios.h)
  ################################################################################
---- device-mapper.1.02.09/dmsetup/dmsetup.c.orig	2006-08-10 22:53:21.000000000 +0200
-+++ device-mapper.1.02.09/dmsetup/dmsetup.c	2006-08-22 22:47:12.862554000 +0200
-@@ -31,7 +31,6 @@
+--- device-mapper.1.02.09.orig/dmsetup/dmsetup.c	2006-08-10 20:53:21.000000000 +0000
++++ device-mapper.1.02.09.klibc/dmsetup/dmsetup.c	2006-09-27 18:22:58.000000000 +0000
+@@ -31,12 +31,13 @@
  #include <dirent.h>
  #include <errno.h>
  #include <unistd.h>
@@ -20,7 +19,14 @@
  #include <sys/wait.h>
  #include <unistd.h>
  #include <sys/param.h>
-@@ -1547,9 +1546,11 @@
++#ifndef __KLIBC__
+ #include <locale.h>
+ #include <langinfo.h>
++#endif
+ 
+ #ifdef HAVE_SYS_IOCTL_H
+ #  include <sys/ioctl.h>
+@@ -1547,9 +1548,11 @@
  	int len;
  
  	/* Symbol set default */
@@ -32,7 +38,7 @@
  		_tsym = &_tsym_ascii;
  
  	/* Default */
-@@ -1647,7 +1648,9 @@
+@@ -1647,7 +1650,9 @@
  	memset(&_values, 0, sizeof(_values));
  
  	namebase = strdup((*argv)[0]);
@@ -43,7 +49,7 @@
  
  	if (!strcmp(base, "devmap_name")) {
  		free(namebase);
-@@ -1783,7 +1786,9 @@
+@@ -1783,7 +1788,9 @@
  	struct command *c;
  	int r = 1;
  
@@ -53,9 +59,8 @@
  
  	if (!_process_switches(&argc, &argv)) {
  		fprintf(stderr, "Couldn't process command line.\n");
-diff -urN device-mapper.1.02.05.org/lib/ioctl/libdm-iface.c device-mapper.1.02.05/lib/ioctl/libdm-iface.c
---- device-mapper.1.02.05.org/lib/ioctl/libdm-iface.c	2006-04-03 17:56:02.000000000 +0200
-+++ device-mapper.1.02.05/lib/ioctl/libdm-iface.c	2006-04-22 20:55:32.442643250 +0200
+--- device-mapper.1.02.09.orig/lib/ioctl/libdm-iface.c	2006-08-08 21:22:31.000000000 +0000
++++ device-mapper.1.02.09.klibc/lib/ioctl/libdm-iface.c	2006-09-27 18:22:22.000000000 +0000
 @@ -135,17 +135,25 @@
  			    uint32_t *number)
  {
@@ -99,9 +104,8 @@
  	fclose(fl);
  
  	if (number) {
-diff -urN device-mapper.1.02.05.org/lib/libdm-file.c device-mapper.1.02.05/lib/libdm-file.c
---- device-mapper.1.02.05.org/lib/libdm-file.c	2006-01-31 15:50:37.000000000 +0100
-+++ device-mapper.1.02.05/lib/libdm-file.c	2006-04-22 20:55:32.446643500 +0200
+--- device-mapper.1.02.09.orig/lib/libdm-file.c	2006-05-10 16:23:41.000000000 +0000
++++ device-mapper.1.02.09.klibc/lib/libdm-file.c	2006-09-27 18:22:22.000000000 +0000
 @@ -16,10 +16,16 @@
  #include "lib.h"
  #include "libdm-file.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/device-mapper-klibc.patch?r1=1.5&r2=1.6&f=u