diff options
| -rw-r--r-- | libc/debian/changelog | 6 | ||||
| -rw-r--r-- | libc/debian/control | 4 | ||||
| -rw-r--r-- | libc/debian/libc1-dev.install | 4 | ||||
| -rw-r--r-- | libc/debian/libsunavl1-dev.install | 1 | ||||
| -rw-r--r-- | libc/debian/patches/libc-nvpair.h.patch | 35 | ||||
| -rw-r--r-- | libc/debian/patches/series | 2 | ||||
| -rwxr-xr-x | libc/debian/rules | 7 |
7 files changed, 12 insertions, 47 deletions
diff --git a/libc/debian/changelog b/libc/debian/changelog index aadc67b..07326ac 100644 --- a/libc/debian/changelog +++ b/libc/debian/changelog @@ -1,3 +1,9 @@ +libc (2.10-7) unstable; urgency=low + + * Use headers from uts-dev + + -- Igor Pashev <pashev.igor@gmail.com> Mon, 07 Jan 2013 21:18:36 +0400 + libc (2.10-6) unstable; urgency=low * Fixed typo in sunld manpage diff --git a/libc/debian/control b/libc/debian/control index a4cee3b..100760f 100644 --- a/libc/debian/control +++ b/libc/debian/control @@ -15,7 +15,7 @@ Build-Depends: m4, onbld, symlinks, - unix-libc-dev ( >= 2.10-2 ), + uts-dev ( >= 2.10 ), Build-Conflicts: libelf-dev, libelf1-dev, libelfg0-dev, libavl-dev, libavl1-dev, libsunelf1-dev, libsunavl1-dev, Standards-Version: 3.9.2 @@ -92,7 +92,7 @@ Depends: ${misc:Depends}, # Until we build libm from sources: libm2-dev, libiconv2-dev, - unix-libc-dev ( >= 2.10-2 ), + uts-dev ( >= 2.10 ), libc1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}) Description: illumos C library: development files diff --git a/libc/debian/libc1-dev.install b/libc/debian/libc1-dev.install index 12325b0..dfb23a5 100644 --- a/libc/debian/libc1-dev.install +++ b/libc/debian/libc1-dev.install @@ -138,10 +138,6 @@ usr/include/string.h usr/include/strings.h usr/include/stropts.h usr/include/synch.h -usr/include/sys/md4.h -usr/include/sys/md5.h -usr/include/sys/sha1.h -usr/include/sys/sha2.h usr/include/sysexits.h usr/include/syslog.h usr/include/tar.h diff --git a/libc/debian/libsunavl1-dev.install b/libc/debian/libsunavl1-dev.install index 6a5c5d9..7a69a6c 100644 --- a/libc/debian/libsunavl1-dev.install +++ b/libc/debian/libsunavl1-dev.install @@ -1,3 +1,2 @@ -usr/include/sys/avl.h usr/lib/*/libsunavl.so usr/lib/*/libavl.so diff --git a/libc/debian/patches/libc-nvpair.h.patch b/libc/debian/patches/libc-nvpair.h.patch index f0db6fc..642e868 100644 --- a/libc/debian/patches/libc-nvpair.h.patch +++ b/libc/debian/patches/libc-nvpair.h.patch @@ -1,37 +1,21 @@ Description: don't depend on libnvpair - We only need type definitions for nvpair, so we've splitted sys/nvpair.h - into sys/nvpair_types.h and sys/nvpair.h itself. sys/nvpair_types.h is - shipped in unix-libc-dev, other nvpair headers - in libnvpair1-dev. Index: libc/usr/src/lib/libc/inc/libc.h =================================================================== --- libc.orig/usr/src/lib/libc/inc/libc.h 2012-10-08 04:25:38.000000000 +0400 -+++ libc/usr/src/lib/libc/inc/libc.h 2012-11-05 12:42:14.617652223 +0400 ++++ libc/usr/src/lib/libc/inc/libc.h 2013-01-07 20:06:29.124705085 +0400 @@ -49,7 +49,7 @@ #include <stdarg.h> #include <wchar.h> #include <wctype.h> -#include <libnvpair.h> -+#include <sys/nvpair_types.h> ++#include <sys/nvpair.h> #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/attr.h -=================================================================== ---- libc.orig/usr/src/head/attr.h 2012-10-08 04:25:37.000000000 +0400 -+++ libc/usr/src/head/attr.h 2012-11-05 12:42:14.625198872 +0400 -@@ -29,7 +29,7 @@ - #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6.1.7 */ - - #include <sys/types.h> --#include <sys/nvpair.h> -+#include <sys/nvpair_types.h> - #include <sys/attr.h> - - #ifdef __cplusplus Index: libc/usr/src/lib/libc/port/gen/attrat.c =================================================================== --- libc.orig/usr/src/lib/libc/port/gen/attrat.c 2012-10-08 04:25:38.000000000 +0400 -+++ libc/usr/src/lib/libc/port/gen/attrat.c 2012-11-05 12:54:50.170643976 +0400 ++++ libc/usr/src/lib/libc/port/gen/attrat.c 2013-01-07 20:04:33.612716187 +0400 @@ -40,6 +40,10 @@ #include <stdio.h> #include <atomic.h> @@ -43,16 +27,3 @@ Index: libc/usr/src/lib/libc/port/gen/attrat.c static int (*nvpacker)(nvlist_t *, char **, size_t *, int, int); static int (*nvsize)(nvlist_t *, size_t *, int); static int (*nvunpacker)(char *, size_t, nvlist_t **); -Index: libc/usr/src/lib/libc/port/gen/ftok.c -=================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/ftok.c 2012-10-08 04:25:38.000000000 +0400 -+++ libc/usr/src/lib/libc/port/gen/ftok.c 2012-11-05 12:56:30.421285492 +0400 -@@ -36,7 +36,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/mkdev.h> --#include <sys/nvpair.h> -+#include <sys/nvpair_types.h> - #include <fcntl.h> - #include <attr.h> - diff --git a/libc/debian/patches/series b/libc/debian/patches/series index 84fccf2..767753c 100644 --- a/libc/debian/patches/series +++ b/libc/debian/patches/series @@ -47,7 +47,7 @@ sgs-crle-multiarch.patch illumos-72-libnsl-t_error.patch libc-nvpair.h.patch libc-uadmin-kiss.patch -avl-headers.patch +#avl-headers.patch libnsl-avoid-libbsm.patch nss_files-avoid-libbsm.patch nss_nis-avoid-libbsm.patch diff --git a/libc/debian/rules b/libc/debian/rules index 92be7b4..cf15708 100755 --- a/libc/debian/rules +++ b/libc/debian/rules @@ -169,13 +169,6 @@ dirs-stamp: headers-stamp: patch-stamp dirs-stamp fix-x-stamp dh_illumos_make $(make) usr/src/head -t install_h dh_illumos_make $(make) $(libs_headers:%=usr/src/lib/%) -t install_h - cp usr/src/uts/common/sys/md[45].h \ - usr/src/uts/common/sys/sha[12].h \ - usr/src/uts/common/sys/md5_consts.h \ - usr/src/uts/common/sys/sha1_consts.h \ - usr/src/uts/common/sys/sha2_consts.h \ - usr/src/uts/common/sys/avl.h \ - debian/tmp/usr/include/sys/ touch $@ lib-stamp: headers-stamp |