Solaris 10 SuperServer with Sfio support

builds/install/arch-specific/solaris/CS/gds_db-tcp.xml

@@ -0,0 +1,72 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<!--
+    Service manifest for the firebird gds_db service.
+-->
+
+<service_bundle type='manifest' name='inetconv:gds_db'>
+
+<service
+	name='network/gds_db/tcp'
+	type='service'
+	version='1'>
+
+	<create_default_instance enabled='true'/>
+
+	<restarter>
+		<service_fmri value='svc:/network/inetd:default' />
+	</restarter>
+
+	<exec_method
+		type='method'
+		name='inetd_start'
+		exec='/opt/firebird/bin/fb_inet_server'
+		timeout_seconds='0'>
+		<method_context>
+			<method_credential user='firebird' group='firebird' />
+		</method_context>
+	</exec_method>
+
+	<!--
+	    Use inetd's built-in kill support to disable services.
+	-->
+	<exec_method
+		type='method'
+		name='inetd_disable'
+		exec=':kill'
+		timeout_seconds='0'>
+	</exec_method>
+
+	<!--
+	    This property group is used to record information about
+	    how this manifest was created.  It is an implementation
+	    detail which should not be modified or deleted.
+	-->
+	<property_group name='inetconv' type='framework'>
+		<propval name='converted' type='boolean' value='true' />
+		<propval name='version' type='integer' value='1' />
+		<propval name='source_line' type='astring' value=
+'gds_db stream tcp nowait firebird /opt/firebird/bin/fb_inet_server fb_inet_server'
+		/>
+	</property_group>
+
+	<property_group name='inetd' type='framework'>
+		<propval name='name' type='astring' value='gds_db' />
+		<propval name='endpoint_type' type='astring' value='stream' />
+		<propval name='proto' type='astring' value='tcp' />
+		<propval name='wait' type='boolean' value='false' />
+		<propval name='isrpc' type='boolean' value='false' />
+	</property_group>
+
+	<stability value='External' />
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>
+gds_db
+			</loctext>
+		</common_name>
+	</template>
+</service>
+
+</service_bundle>

builds/install/arch-specific/solaris/Makefile.in

@@ -40,9 +40,9 @@ include     $(ROOT)/gen/make.shared.variables
 
 
 PGK_FILES=pkginfo prototype preinstall postinstall postremove
-PKG_DIR=$(RealFirebirdPath)/../install
+PKG_DIR=$(RealFirebirdPath)/install
-PKG_NAME=Firebird@ARCH_TYPE_SUFFIX@-$(FirebirdVersion).$(BuildNum)-$(PackageVersion)-Solaris-@CPU_TYPE@.pkg
+PKG_NAME=Firebird@ARCH_TYPE_SUFFIX@-$(FirebirdVersion).$(BuildNum)-$(PackageVersion)-Solaris10-@CPU_TYPE@.pkg
-LGCC_PKG_NAME=LibGCC-3.x.FB-runtime-@CPU_TYPE@.pkg
+GCC_PKG_NAME=Firebird-libgcc-Solaris10-@CPU_TYPE@.pkg
 
 install package packages dist:
 	@echo Making Solaris @CPU_TYPE@ package...
@@ -51,13 +51,13 @@ install package packages dist:
 	(cd $(PKG_DIR); pkgmk -o  -d $(PKG_DIR))
 	pkgtrans -s $(PKG_DIR) $(PKG_DIR)/$(PKG_NAME) Firebird2
 libs:
-	@echo Making Solaris @CPU_TYPE@ LIBGCC package...
+	@echo Making Solaris @CPU_TYPE@ libgcc package...
-	rm -rf $(PKG_DIR)/FBLIBGCC
+	rm -rf $(PKG_DIR)/libgcc
 	-mkdir -p $(PKG_DIR)
 	(cd $(PKG_DIR); pkgmk -o -f prototypelg -d $(PKG_DIR))
-	pkgtrans -s $(PKG_DIR) $(PKG_DIR)/$(LGCC_PKG_NAME) FBLIBGCC
+	pkgtrans -s $(PKG_DIR) $(PKG_DIR)/$(GCC_PKG_NAME) Firebird-libgcc 
 	
 clean clobber:
 	rm -rf $(PKG_DIR)/Firebird2
-	rm -rf $(PKG_DIR)/FBLIBGCC
+	rm -rf $(PKG_DIR)/libgcc
 	rm -f $(PKG_DIR)/$(PKG_NAME)

configure.in

@@ -834,6 +834,7 @@ case "$PLATFORM" in
       SFIO_DIR="$ac_cv_use_sfio"
       SFIO_FLAGS="-DSFIO -I$ac_cv_use_sfio/include"
       SFIO_LDFLAGS="-L$ac_cv_use_sfio/lib"
+      SFIO_EXAMPLES="Y"
     fi
     ;;
 
@@ -879,6 +880,7 @@ dnl ##################### DO NOT ADD ANY TESTS BELOW ###########################
 AC_SUBST(SFIO_DIR)
 AC_SUBST(SFIO_FLAGS)
 AC_SUBST(SFIO_LDFLAGS)
+AC_SUBST(SFIO_EXAMPLES)
 
 dnl The following file defines the version number strings. Specially for install/uninstall routines
 . ./src/misc/writeBuildNum.sh
@@ -1187,14 +1189,14 @@ case "$PLATFORM" in
     ;;
 
   solx86|SOLARIS)
-    AC_CONFIG_FILES([gen/install/Pkginfo:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/pkginfo.in
+    AC_CONFIG_FILES([gen/firebird/install/Pkginfo:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/pkginfo.in
-                     gen/install/Prototype:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/prototype.in
+                     gen/firebird/install/Prototype:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/prototype.in
-                     gen/install/Preinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/preinstall.in
+                     gen/firebird/install/Preinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/preinstall.in
-                     gen/install/Postinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postinstall.in
+                     gen/firebird/install/Postinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postinstall.in
-                     gen/install/Postremove:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postremove.in
+                     gen/firebird/install/Postremove:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postremove.in
-		     gen/install/prototypelg:builds/install/arch-specific/solaris/libgcc/prototypelg.in
+		     gen/firebird/install/prototypelg:builds/install/arch-specific/solaris/libgcc/prototypelg.in
-		     gen/install/pkginfolg:builds/install/arch-specific/solaris/libgcc/pkginfolg.in
+		     gen/firebird/install/pkginfolg:builds/install/arch-specific/solaris/libgcc/pkginfolg.in
-      ],[chmod a+x gen/install/Pre* gen/install/Post* 2>/dev/null])
+      ],[chmod a+x gen/firebird/install/Pre* gen/install/Post* 2>/dev/null])
     ;;
 
   DARWIN)
@@ -1262,6 +1264,13 @@ if test "$STD_ICU" = "false"; then
   AC_CONFIG_FILES(gen/Makefile.extern.icu:${MAKE_SRC_DIR}/Makefile.in.extern.icu)
 fi
 
+case "$PLATFORM" in
+  SOLARIS | solx86 )
+AC_CONFIG_FILES(
+gen/make.platform.solaris.examples:${MAKE_SRC_DIR}/make.platform.solaris.examples
+)
+;;
+esac
 
 
 if test "$PROD_BUILD_FLG" = N; then