diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-04-28 19:19:34 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-04-28 19:19:34 +0400 |
| commit | 07c68786ba6f4baffc38b3ff460d7d0d83845703 (patch) | |
| tree | cfdebaa20f6e07f2913685b9b36a090f0393ebea /libuutil/debian/patches | |
| parent | f6097660e0f001a38c169cd05b03174587bef113 (diff) | |
| download | illumos-packaging-07c68786ba6f4baffc38b3ff460d7d0d83845703.tar.gz | |
Fix patches mess
Diffstat (limited to 'libuutil/debian/patches')
| -rw-r--r-- | libuutil/debian/patches/libumem-use-libsunavl.patch | 14 | ||||
| -rw-r--r-- | libuutil/debian/patches/libuutil-use-libsunavl.patch | 20 | ||||
| -rw-r--r-- | libuutil/debian/patches/series | 1 |
3 files changed, 17 insertions, 18 deletions
diff --git a/libuutil/debian/patches/libumem-use-libsunavl.patch b/libuutil/debian/patches/libumem-use-libsunavl.patch deleted file mode 100644 index d11e7f4..0000000 --- a/libuutil/debian/patches/libumem-use-libsunavl.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libuutil/usr/src/lib/libuutil/common/libuutil_impl.h -=================================================================== ---- libuutil.orig/usr/src/lib/libuutil/common/libuutil_impl.h 2012-10-08 04:25:42.000000000 +0400 -+++ libuutil/usr/src/lib/libuutil/common/libuutil_impl.h 2013-04-28 18:38:19.117433503 +0400 -@@ -31,8 +31,8 @@ - - #include <libuutil.h> - #include <pthread.h> -+#include <libsunavl.h> - --#include <sys/avl_impl.h> - #include <sys/byteorder.h> - - #ifdef __cplusplus diff --git a/libuutil/debian/patches/libuutil-use-libsunavl.patch b/libuutil/debian/patches/libuutil-use-libsunavl.patch index 1a2ba0e..fe7c487 100644 --- a/libuutil/debian/patches/libuutil-use-libsunavl.patch +++ b/libuutil/debian/patches/libuutil-use-libsunavl.patch @@ -1,7 +1,7 @@ -Index: illumos-corelibs/usr/src/lib/libuutil/Makefile.com +Index: libuutil/usr/src/lib/libuutil/Makefile.com =================================================================== ---- illumos-corelibs.orig/usr/src/lib/libuutil/Makefile.com 2012-10-08 04:25:42.000000000 +0400 -+++ illumos-corelibs/usr/src/lib/libuutil/Makefile.com 2012-10-24 00:38:45.302329088 +0400 +--- libuutil.orig/usr/src/lib/libuutil/Makefile.com 2012-10-08 04:25:42.000000000 +0400 ++++ libuutil/usr/src/lib/libuutil/Makefile.com 2013-04-28 18:42:44.126625182 +0400 @@ -26,7 +26,6 @@ VERS = .1 @@ -27,3 +27,17 @@ Index: illumos-corelibs/usr/src/lib/libuutil/Makefile.com AVLDIR = ../../../common/avl +Index: libuutil/usr/src/lib/libuutil/common/libuutil_impl.h +=================================================================== +--- libuutil.orig/usr/src/lib/libuutil/common/libuutil_impl.h 2013-04-28 19:17:38.149387524 +0400 ++++ libuutil/usr/src/lib/libuutil/common/libuutil_impl.h 2013-04-28 19:17:53.629071714 +0400 +@@ -31,8 +31,8 @@ + + #include <libuutil.h> + #include <pthread.h> ++#include <libsunavl.h> + +-#include <sys/avl_impl.h> + #include <sys/byteorder.h> + + #ifdef __cplusplus diff --git a/libuutil/debian/patches/series b/libuutil/debian/patches/series index e4b91c7..fbcebda 100644 --- a/libuutil/debian/patches/series +++ b/libuutil/debian/patches/series @@ -1,2 +1 @@ libuutil-use-libsunavl.patch -libumem-use-libsunavl.patch |