[Glibc-bsd-commits] r2845 - in trunk/freebsd-libs/debian: . patches
Petr Salinger
ps-guest at alioth.debian.org
Mon Nov 16 18:49:11 UTC 2009
Author: ps-guest
Date: 2009-11-16 18:49:11 +0000 (Mon, 16 Nov 2009)
New Revision: 2845
Added:
trunk/freebsd-libs/debian/libmemstat-dev.install
trunk/freebsd-libs/debian/libmemstat3.install
trunk/freebsd-libs/debian/patches/10_memstat.diff
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/patches/series
trunk/freebsd-libs/debian/rules
Log:
* add libmemstat3 and libmemstat-dev packages,
will be needed by netstat binary
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2009-11-16 12:51:03 UTC (rev 2844)
+++ trunk/freebsd-libs/debian/changelog 2009-11-16 18:49:11 UTC (rev 2845)
@@ -2,10 +2,11 @@
[ Petr Salinger ]
* based on FreeBSD 8.0
- * Change packages name to reflect SONAME changes:
+ * change packages name to reflect SONAME changes:
- libusbhid3 -> libusbhid4
- libkiconv3 -> libkiconv4
- libdevstat6 -> libdevstat7
+ * add libmemstat3 and libmemstat-dev packages
-- Aurelien Jarno <aurel32 at debian.org> Sat, 14 Nov 2009 10:41:06 +0100
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2009-11-16 12:51:03 UTC (rev 2844)
+++ trunk/freebsd-libs/debian/control 2009-11-16 18:49:11 UTC (rev 2845)
@@ -107,6 +107,22 @@
This package contains the header files and static library needed to
compile applications that use libdevstat.
+Package: libmemstat3
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}
+Description: FreeBSD memstat (kernel interface) library
+ The memstat library provides a uniform interface for accessing kernel memstat
+ interface.
+
+Package: libmemstat-dev
+Section: libdevel
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Depends: libmemstat3 (= ${binary:Version}), libkvm-dev, libc0.1-dev | libc-dev,
+ libbsd-dev
+Description: Development files for libmemstat
+ This package contains the header files and static library needed to
+ compile applications that use libmemstat.
+
Package: libipx2
Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}
Added: trunk/freebsd-libs/debian/libmemstat-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libmemstat-dev.install (rev 0)
+++ trunk/freebsd-libs/debian/libmemstat-dev.install 2009-11-16 18:49:11 UTC (rev 2845)
@@ -0,0 +1,5 @@
+usr/include/memstat.h
+usr/lib/libmemstat*.a
+usr/lib/libmemstat*.so
+usr/share/man/man3/libmemstat.3.gz
+usr/share/man/man3/memstat*3.gz
Added: trunk/freebsd-libs/debian/libmemstat3.install
===================================================================
--- trunk/freebsd-libs/debian/libmemstat3.install (rev 0)
+++ trunk/freebsd-libs/debian/libmemstat3.install 2009-11-16 18:49:11 UTC (rev 2845)
@@ -0,0 +1 @@
+usr/lib/libmemstat*.so.*
Added: trunk/freebsd-libs/debian/patches/10_memstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/10_memstat.diff (rev 0)
+++ trunk/freebsd-libs/debian/patches/10_memstat.diff 2009-11-16 18:49:11 UTC (rev 2845)
@@ -0,0 +1,92 @@
+Index: freebsd-libs/lib/libmemstat/memstat_internal.h
+===================================================================
+--- freebsd-libs.orig/lib/libmemstat/memstat_internal.h 2009-11-16 16:54:58.000000000 +0000
++++ freebsd-libs/lib/libmemstat/memstat_internal.h 2009-11-16 16:58:21.000000000 +0000
+@@ -29,7 +29,7 @@
+ #ifndef _MEMSTAT_INTERNAL_H_
+ #define _MEMSTAT_INTERNAL_H_
+
+-
++#include <sys/queue.h>
+
+ /*
+ * memstat maintains its own internal notion of statistics on each memory
+Index: freebsd-libs/lib/libmemstat/memstat.h
+===================================================================
+--- freebsd-libs.orig/lib/libmemstat/memstat.h 2009-11-16 16:54:58.000000000 +0000
++++ freebsd-libs/lib/libmemstat/memstat.h 2009-11-16 16:58:21.000000000 +0000
+@@ -29,6 +29,8 @@
+ #ifndef _MEMSTAT_H_
+ #define _MEMSTAT_H_
+
++#include <stdint.h>
++
+ /*
+ * Number of CPU slots in library-internal data structures. This should be
+ * at least the value of MAXCPU from param.h.
+Index: freebsd-libs/lib/libmemstat/memstat_malloc.c
+===================================================================
+--- freebsd-libs.orig/lib/libmemstat/memstat_malloc.c 2009-11-16 16:54:58.000000000 +0000
++++ freebsd-libs/lib/libmemstat/memstat_malloc.c 2009-11-16 16:58:21.000000000 +0000
+@@ -44,10 +44,10 @@
+
+ static struct nlist namelist[] = {
+ #define X_KMEMSTATISTICS 0
+- { .n_name = "_kmemstatistics" },
++ {{ .n_name = "_kmemstatistics" }},
+ #define X_MP_MAXCPUS 1
+- { .n_name = "_mp_maxcpus" },
+- { .n_name = "" },
++ {{ .n_name = "_mp_maxcpus" }},
++ {{ .n_name = "" }},
+ };
+
+ /*
+@@ -253,6 +253,10 @@
+ return (0);
+ }
+
++#ifndef __DECONST
++#define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var))
++#endif
++
+ static int
+ kread_string(kvm_t *kvm, const void *kvm_pointer, char *buffer, int buflen)
+ {
+Index: freebsd-libs/lib/libmemstat/memstat_uma.c
+===================================================================
+--- freebsd-libs.orig/lib/libmemstat/memstat_uma.c 2009-11-16 16:54:58.000000000 +0000
++++ freebsd-libs/lib/libmemstat/memstat_uma.c 2009-11-16 16:58:21.000000000 +0000
+@@ -50,12 +50,12 @@
+
+ static struct nlist namelist[] = {
+ #define X_UMA_KEGS 0
+- { .n_name = "_uma_kegs" },
++ {{ .n_name = "_uma_kegs" }},
+ #define X_MP_MAXID 1
+- { .n_name = "_mp_maxid" },
++ {{ .n_name = "_mp_maxid" }},
+ #define X_ALL_CPUS 2
+- { .n_name = "_all_cpus" },
+- { .n_name = "" },
++ {{ .n_name = "_all_cpus" }},
++ {{ .n_name = "" }},
+ };
+
+ /*
+Index: freebsd-libs/lib/libmemstat/Makefile
+===================================================================
+--- freebsd-libs.orig/lib/libmemstat/Makefile 2009-11-16 16:59:54.000000000 +0000
++++ freebsd-libs/lib/libmemstat/Makefile 2009-11-16 17:00:59.000000000 +0000
+@@ -3,8 +3,9 @@
+ WARNS?= 3
+ LIB= memstat
+ SHLIB_MAJOR= 3
+-DPADD= ${LIBKVM}
+-LDADD= -lkvm
++LDADD= -lbsd ../libkvm/libkvm.so.0
++CFLAGS+=-I. -I../libkvm
++
+ SRCS+= memstat.c
+ SRCS+= memstat_all.c
+ SRCS+= memstat_malloc.c
Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series 2009-11-16 12:51:03 UTC (rev 2844)
+++ trunk/freebsd-libs/debian/patches/series 2009-11-16 18:49:11 UTC (rev 2845)
@@ -6,3 +6,4 @@
07_libkiconv.diff
08_libdevstat.diff
09_libusbhid.diff
+10_memstat.diff
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2009-11-16 12:51:03 UTC (rev 2844)
+++ trunk/freebsd-libs/debian/rules 2009-11-16 18:49:11 UTC (rev 2845)
@@ -49,7 +49,7 @@
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
touch $@
-build-arch: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-devstat
+build-arch: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-devstat build-memstat
build-cam: build-cam-stamp
build-cam-stamp: patch build-sbuf
@@ -81,6 +81,11 @@
$(PMAKE) -C $(CURDIR)/lib/libdevstat
touch $@
+build-memstat: build-memstat-stamp
+build-memstat-stamp: patch build-kvm
+ $(PMAKE) -C $(CURDIR)/lib/libmemstat
+ touch $@
+
build-sbuf: build-sbuf-stamp
build-sbuf-stamp: patch
$(PMAKE) -C $(CURDIR)/lib/libsbuf
@@ -100,6 +105,7 @@
dh_testroot
$(PMAKE) -C $(CURDIR)/lib/libcam clean
$(PMAKE) -C $(CURDIR)/lib/libdevstat clean
+ $(PMAKE) -C $(CURDIR)/lib/libmemstat clean
$(PMAKE) -C $(CURDIR)/lib/libgeom clean
$(PMAKE) -C $(CURDIR)/lib/libipx clean
$(PMAKE) -C $(CURDIR)/lib/libkiconv clean
@@ -128,6 +134,7 @@
$(PMAKE) -C $(CURDIR)/lib/libkiconv install
$(PMAKE) -C $(CURDIR)/lib/libkvm install
$(PMAKE) -C $(CURDIR)/lib/libdevstat install
+ $(PMAKE) -C $(CURDIR)/lib/libmemstat install
$(PMAKE) -C $(CURDIR)/lib/libusbhid install
dh_install -s --list-missing --sourcedir=debian/tmp
More information about the Glibc-bsd-commits
mailing list