summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2012-11-25 18:08:38 +0000
committerIgor Pashev <pashev.igor@gmail.com>2012-11-25 18:08:38 +0000
commit203b8298b8857d15c4d8ba273c34c4412087b75c (patch)
tree45fc830c5552b18f6c0d966c164a6351b4cc207d
parentc5d70b23d57c478fc5dc6ea5da8b4b03d123f927 (diff)
downloadtrousers-203b8298b8857d15c4d8ba273c34c4412087b75c.tar.gz
SMF on solaris
-rw-r--r--debian/control1
-rw-r--r--debian/patches/libs.patch29
2 files changed, 28 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index 74d1936..7b6cc21 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9),
libtool,
gettext,
libscf1-dev [illumos-any],
+ libbsm1-dev [illumos-any],
pkg-config
Standards-Version: 3.9.3
Homepage: http://trousers.sourceforge.net/
diff --git a/debian/patches/libs.patch b/debian/patches/libs.patch
index fd04ec2..34b3fd6 100644
--- a/debian/patches/libs.patch
+++ b/debian/patches/libs.patch
@@ -1,15 +1,40 @@
Index: trousers/configure.in
===================================================================
--- trousers.orig/configure.in 2012-11-25 16:28:00.842138403 +0000
-+++ trousers/configure.in 2012-11-25 17:31:56.653446232 +0000
-@@ -352,6 +352,10 @@
++++ trousers/configure.in 2012-11-25 18:04:49.984361424 +0000
+@@ -352,6 +352,22 @@
AC_PROG_LIBTOOL
AM_ICONV
+AC_SEARCH_LIBS([h_errno], [nsl])
+AC_SEARCH_LIBS([bind], [socket])
++AC_SEARCH_LIBS([hstrerror], [resolv])
+AC_SEARCH_LIBS([pthread_mutex_lock], [pthread])
+
++case $host in
++ *solaris*)
++ # TODO: --with-smf ?
++ AC_CHECK_HEADER([libscf.h], [],
++ [AC_MSG_ERROR([libscf.h not found])])
++ AC_CHECK_LIB([scf], [scf_simple_prop_get], [],
++ [AC_MSG_ERROR([service configuration facility library not found])])
++ AC_SUBST([libscf], [-lscf])
++ ;;
++esac
++
AC_C_BIGENDIAN([AC_DEFINE(_BIG_ENDIAN, 1, [big-endian host])])
AC_CHECK_DECL(htole32, [AC_DEFINE(HTOLE_DEFINED, 1, [htole32 function is available])])
AC_CHECK_HEADER(sys/byteorder.h, [AC_DEFINE(HAVE_BYTEORDER_H, 1, [sys/byteorder.h header])])
+Index: trousers/src/tcsd/Makefile.am
+===================================================================
+--- trousers.orig/src/tcsd/Makefile.am 2012-11-25 14:36:23.008290313 +0000
++++ trousers/src/tcsd/Makefile.am 2012-11-25 17:51:42.723539090 +0000
+@@ -1,7 +1,7 @@
+ sbin_PROGRAMS=tcsd
+
+ tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include
+-tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread @CRYPTOLIB@
++tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a @CRYPTOLIB@ @libscf@
+
+ tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c
+