[Glibc-bsd-commits] r4267 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-05-19 13:45:03 +0000 (Sat, 19 May 2012)
New Revision: 4267

Added:
   trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/patches/series
Log:
kvm_size_t_kludge.diff: Temporary kludge to define size_t (requires kfreebsd-kernel-headers >= 0.81).  (Closes: #673431)

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2012-05-19 13:39:10 UTC (rev 4266)
+++ trunk/freebsd-libs/debian/changelog	2012-05-19 13:45:03 UTC (rev 4267)
@@ -4,6 +4,8 @@
   * 04_libkvm.diff: Remove struct loadavg kludge, B-D on libc0.1-dev (>=
     2.13-31) instead.
   * Fix a pair of typos in debian/control.
+  * kvm_size_t_kludge.diff: Temporary kludge to define size_t (requires
+    kfreebsd-kernel-headers >= 0.81).  (Closes: #673431)
 
   [ Guillem Jover ]
   * Remove Debian revisions from versions in libmemstat3, libsbuf6 and libcam6

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2012-05-19 13:39:10 UTC (rev 4266)
+++ trunk/freebsd-libs/debian/control	2012-05-19 13:45:03 UTC (rev 4267)
@@ -8,7 +8,7 @@
  libbsd-dev (>= 0.3.0),
  libc0.1-dev (>= 2.13-31) [kfreebsd-any],
  libgdbm-dev [kfreebsd-any],
- kfreebsd-kernel-headers (>= 0.73) [kfreebsd-any],
+ kfreebsd-kernel-headers (>= 0.81) [kfreebsd-any],
 # libexpat-dev: aka bsdxml. needed by libgeom
  libexpat-dev [kfreebsd-any],
 # libncurses5-dev: needed by libalias
@@ -158,7 +158,8 @@
 Package: libkvm-dev
 Section: libdevel
 Architecture: kfreebsd-any
-Depends: libkvm0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev
+Depends: libkvm0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev,
+ kfreebsd-kernel-headers (>= 0.81),
 Description: Development files for libkvm
  This package contains the header files and static library needed to
  compile applications that use libkvm.

Added: trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/kvm_size_t_kludge.diff	2012-05-19 13:45:03 UTC (rev 4267)
@@ -0,0 +1,11 @@
+--- a/lib/libkvm/kvm.h
++++ b/lib/libkvm/kvm.h
+@@ -42,7 +42,7 @@
+ #define	VRS_KEY		"VERSION"
+ 
+ #ifndef _SIZE_T_DECLARED
+-typedef	__size_t	size_t;
++typedef	__this_is_a_temporary_kludge__size_t	size_t;
+ #define	_SIZE_T_DECLARED
+ #endif
+ 

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2012-05-19 13:39:10 UTC (rev 4266)
+++ trunk/freebsd-libs/debian/patches/series	2012-05-19 13:45:03 UTC (rev 4267)
@@ -17,3 +17,4 @@
 sysconf_cpuset_size.diff
 libusb_backward.diff
 libbsd_nlist.diff
+kvm_size_t_kludge.diff