summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2012-12-25 23:17:00 +0400
committerIgor Pashev <pashev.igor@gmail.com>2012-12-25 23:17:00 +0400
commit019ae7f6a5a7bcf52370e3356b9d3781d612e7c8 (patch)
treeccf0c095599015011cf97e6cb6d8f0bd22b45507
parent16329521cc42e16405e29a9b0c1d2468caa3f48b (diff)
downloadillumos-packaging-019ae7f6a5a7bcf52370e3356b9d3781d612e7c8.tar.gz
libumem (2.10-2) unstable; urgency=low
* Remove patch libumem-amd64-no-msave-args.patch. Use SAVEARGS environment variable instead * Do not build standalone library (libstandumem)
-rw-r--r--libumem/debian/changelog8
-rw-r--r--libumem/debian/patches/libumem-amd64-no-msave-args.patch16
-rw-r--r--libumem/debian/patches/series1
-rwxr-xr-xlibumem/debian/rules6
4 files changed, 14 insertions, 17 deletions
diff --git a/libumem/debian/changelog b/libumem/debian/changelog
index bae5b5c..e0ca5f6 100644
--- a/libumem/debian/changelog
+++ b/libumem/debian/changelog
@@ -1,3 +1,11 @@
+libumem (2.10-2) unstable; urgency=low
+
+ * Remove patch libumem-amd64-no-msave-args.patch.
+ Use SAVEARGS environment variable instead
+ * Do not build standaloe library (libstandumem)
+
+ -- Igor Pashev <pashev.igor@gmail.com> Tue, 25 Dec 2012 23:16:47 +0400
+
libumem (2.10-1) unstable; urgency=low
* Initial release.
diff --git a/libumem/debian/patches/libumem-amd64-no-msave-args.patch b/libumem/debian/patches/libumem-amd64-no-msave-args.patch
deleted file mode 100644
index f435105..0000000
--- a/libumem/debian/patches/libumem-amd64-no-msave-args.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: drop -msave-args from amd64
- while GCC does not support it.
- This option is used only for libstandumem.so.
-Index: corelibs/usr/src/lib/libumem/amd64/Makefile
-===================================================================
---- corelibs.orig/usr/src/lib/libumem/amd64/Makefile 2012-10-08 04:25:42.000000000 +0400
-+++ corelibs/usr/src/lib/libumem/amd64/Makefile 2012-10-26 01:58:19.157870426 +0400
-@@ -32,7 +32,7 @@
- include ../../Makefile.lib.64
-
- TYPES=library standalone
--
-+SAVEARGS =
- INSTALL_DEPS_library = $(ROOTLINKS64) $(ROOTLINT64) $(ROOTLIBS64)
-
- include ../Makefile.targ
diff --git a/libumem/debian/patches/series b/libumem/debian/patches/series
index c9db37d..e0b0295 100644
--- a/libumem/debian/patches/series
+++ b/libumem/debian/patches/series
@@ -1,2 +1 @@
libumem-gnumake-patsubst.patch
-libumem-amd64-no-msave-args.patch
diff --git a/libumem/debian/rules b/libumem/debian/rules
index 10eaf4e..8768d73 100755
--- a/libumem/debian/rules
+++ b/libumem/debian/rules
@@ -18,6 +18,12 @@ unpack-stamp:
dh_illumos_gate --build \
$(libs:%=usr/src/lib/%) \
+ # GCC does not support -msave-args for a while:
+ echo 'export SAVEARGS=' >> usr/env.sh
+
+ # Build only user-space library. no standalone (which is for kmdb only)
+ echo 'export TYPE=library' >> usr/env.sh
+
# Not used and buggy:
echo > usr/src/Makefile.msg.targ
touch $@