From 2ee7f821c15df0c8d08b9d9cddd7d02c0ea9f50c Mon Sep 17 00:00:00 2001 From: paulbeach Date: Fri, 31 Aug 2007 08:51:52 +0000 Subject: [PATCH] Solaris Port --- .../arch-specific/solaris/CS/pkginfo.in | 8 +- .../arch-specific/solaris/CS/postinstall.in | 4 +- .../arch-specific/solaris/CS/prototype.in | 168 ++++++++++-------- .../install/arch-specific/solaris/Makefile.in | 18 +- .../install/arch-specific/solx86/Makefile.in | 4 +- configure.in | 20 +-- extern/icu/source/config/mh-solaris-gcc | 5 +- 7 files changed, 119 insertions(+), 108 deletions(-) diff --git a/builds/install/arch-specific/solaris/CS/pkginfo.in b/builds/install/arch-specific/solaris/CS/pkginfo.in index e72c948bc1..a8ad6cc375 100644 --- a/builds/install/arch-specific/solaris/CS/pkginfo.in +++ b/builds/install/arch-specific/solaris/CS/pkginfo.in @@ -1,9 +1,9 @@ -PKG="FB2SI" +PKG="Firebird2" NAME="Firebird2 Relational Database Server @ARCH_TYPE_SUFFIX@" -ARCH="i386" +ARCH="@CPU_TYPE@" VERSION="@FIREBIRD_VERSION@" LOAD="@FIREBIRD_PACKAGE_VERSION@" CATEGORY="application" -VENDOR="WWW.FireBirdSQL.org" +VENDOR="www.firebirdsql.org" BASEDIR=/usr/local -EMAIL= "WHO IT WANT" at users.sf.net +EMAIL=pbeach at ibphoenix.com diff --git a/builds/install/arch-specific/solaris/CS/postinstall.in b/builds/install/arch-specific/solaris/CS/postinstall.in index 385948ced3..9fcfea66d6 100644 --- a/builds/install/arch-specific/solaris/CS/postinstall.in +++ b/builds/install/arch-specific/solaris/CS/postinstall.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solaris/CS/postinstall.in,v 1.2 2005-05-27 22:15:24 asfernandes Exp $ +# $Header: /home/job/firebird/cvs-backup/firebird2/builds/install/arch-specific/solaris/CS/postinstall.in,v 1.3 2007-08-31 08:51:37 paulbeach Exp $ #------------------------------------------------------------------------------ # $Copyright: # Copyright (C) Siemens Nixdorf Informationssysteme AG 1994 - 1998 @@ -42,7 +42,7 @@ if [ -f /etc/inet/inetd.conf ]; then echo "Patching /etc/inet/inetd.conf..." echo "" >> /etc/inet/inetd.conf echo "# Firebird2 Database Remote Server" >> /etc/inet/inetd.conf - echo "@FB_SERVICE_NAME@ stream tcp nowait.30000 root $FIREBIRD/bin/fb_inet_server fb_inet_server" >>/etc/inet/inetd.conf + echo "@FB_SERVICE_NAME@ stream tcp nowait root $FIREBIRD/bin/fb_inet_server fb_inet_server" >>/etc/inet/inetd.conf echo "Restarting inetd..." kill -HUP `ps -e | grep inetd | awk '{print $1}'` fi diff --git a/builds/install/arch-specific/solaris/CS/prototype.in b/builds/install/arch-specific/solaris/CS/prototype.in index d275973d36..975eaa7fa9 100644 --- a/builds/install/arch-specific/solaris/CS/prototype.in +++ b/builds/install/arch-specific/solaris/CS/prototype.in @@ -17,39 +17,22 @@ d none @prefix@ 0755 root root v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0666 root root v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0644 root root -#f none @prefix@/firebird.init.d.example=$SRCDIR/../../builds/install/misc/firebird.init.d.Solaris.in 0755 root root v CONFIG.prsv @prefix@/aliases.conf=$SRCDIR/../../builds/install/misc/aliases.conf.in 0644 root root +v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 root root d none @prefix@/bin 0755 root root #f none @prefix@/bin/CSchangeRunUser.sh=$SRCDIR/bin/CSchangeRunUser.sh 0555 root root #f none @prefix@/bin/CSrestoreRootRunUser.sh=$SRCDIR/bin/CSrestoreRootRunUser.sh 0555 root root -#f none @prefix@/bin/build_file=$SRCDIR/bin/build_file 0755 root root #f none @prefix@/bin/changeDBAPassword.sh=$SRCDIR/bin/changeDBAPassword.sh 0555 root root -#f none @prefix@/bin/change_messages=$SRCDIR/bin/change_messages 0755 root root -#f none @prefix@/bin/check_messages=$SRCDIR/bin/check_messages 0755 root root -#f none @prefix@/bin/create_db=$SRCDIR/bin/create_db 0755 root root -#f none @prefix@/bin/enter_messages=$SRCDIR/bin/enter_messages 0755 root root - - - - - #/usr/lib synlinks for compability with external tools -#s none /usr/lib/libgds.so=@prefix@/lib/libfbembed.so -#s none /usr/lib/libfbembed.so=@prefix@/lib/libfbembed.so -#s none /usr/lib/libgds.so.1=@prefix@/lib/libfbembed.so.1 +s none /usr/lib/libfbembed.so=@prefix@/lib/libfbembed.so s none /usr/lib/libfbclient.so=@prefix@/lib/libfbclient.so -s none /usr/lib/libgds.so=@prefix@/lib/libfbclient.so -s none /usr/lib/libgdsmt.so=@prefix@/lib/libfbclient.so - - d none @prefix@ 0755 root root - d none @prefix@/include 0755 root root f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0644 root root f none @prefix@/include/perf.h=$SRCDIR/include/perf.h 0644 root root @@ -57,26 +40,15 @@ f none @prefix@/include/blr.h=$SRCDIR/include/blr.h 0644 root root f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h 0644 root root f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h 0644 root root - d none @prefix@/intl 0755 root root f none @prefix@/intl/libfbintl.so=$SRCDIR/intl/libfbintl.so 0755 root root - +s none @prefix@/intl/fbintl=@prefix@/intl/libfbintl.so d none @prefix@/UDF 0755 root root f none @prefix@/UDF/ib_udf.so=$SRCDIR/UDF/ib_udf.so 0755 root root f none @prefix@/UDF/fbudf.so=$SRCDIR/UDF/fbudf.so 0755 root root - d none @prefix@/bin 0755 root root -#f none @prefix@/bin/gpre_boot=$SRCDIR/bin/gpre_boot 0755 root root -#s none @prefix@/bin/gpre_current=$SRCDIR/gpre_static -#f none @prefix@/bin/blrtable=$SRCDIR/bin/blrtable 0755 root root -#f none @prefix@/bin/gpre_static=$SRCDIR/bin/gpre_static 0755 root root -#f none @prefix@/bin/create_db=$SRCDIR/bin/create_db 0755 root root -#f none @prefix@/bin/gbak_static=$SRCDIR/bin/gbak_static 0755 root root -#f none @prefix@/bin/isql_static=$SRCDIR/bin/isql_static 0755 root root -#f none @prefix@/bin/build_file=$SRCDIR/bin/build_file 0777 root root -#f none @prefix@/bin/codes=$SRCDIR/bin/codes 0755 root root f none @prefix@/bin/fb_inet_server=$SRCDIR/bin/fb_inet_server 0755 root root f none @prefix@/bin/gfix=$SRCDIR/bin/gfix 0755 root root f none @prefix@/bin/gbak=$SRCDIR/bin/gbak 0755 root root @@ -87,14 +59,13 @@ f none @prefix@/bin/gpre=$SRCDIR/bin/gpre 0755 root root f none @prefix@/bin/gds_drop=$SRCDIR/bin/gds_drop 0755 root root f none @prefix@/bin/gds_relay=$SRCDIR/bin/gds_relay 0755 root root f none @prefix@/bin/gstat=$SRCDIR/bin/gstat 0755 root root -# f none @prefix@/bin/fbguard=$SRCDIR/bin/fbguard 0755 root root -# f none @prefix@/bin/fbmgr.bin=$SRCDIR/bin/fbmgr.bin 0755 root root -f none @prefix@/bin/nbackup=$SRCDIR/bin/nbackup 0755 root root +#f none @prefix@/bin/fbguard=$SRCDIR/bin/fbguard 0755 root root +#f none @prefix@/bin/fbmgr.bin=$SRCDIR/bin/fbmgr.bin 0755 root root f none @prefix@/bin/fb_lock_print=$SRCDIR/bin/fb_lock_print 0755 root root f none @prefix@/bin/gdef=$SRCDIR/bin/gdef 0755 root root f none @prefix@/bin/qli=$SRCDIR/bin/qli 6777 root root - - +# from 2.0 +f none @prefix@/bin/nbackup=$SRCDIR/bin/nbackup 6777 root root d none @prefix@/examples 0755 root root d none @prefix@/examples/api 0755 root root @@ -123,21 +94,7 @@ f none @prefix@/examples/api/example.def=$SRCDIR/examples/api/example.def 0644 r f none @prefix@/examples/api/winevent.c=$SRCDIR/examples/api/winevent.c 0644 root root f none @prefix@/examples/api/winevent.def=$SRCDIR/examples/api/winevent.def 0644 root root f none @prefix@/examples/api/winevent.rc=$SRCDIR/examples/api/winevent.rc 0644 root root -d none @prefix@/examples/build_win32 0755 root root -f none @prefix@/examples/build_win32/clean_all.bat=$SRCDIR/examples/build_win32/clean_all.bat 0644 root root -f none @prefix@/examples/build_win32/clean_api.bat=$SRCDIR/examples/build_win32/clean_api.bat 0644 root root -f none @prefix@/examples/build_win32/clean_dyn.bat=$SRCDIR/examples/build_win32/clean_dyn.bat 0644 root root -f none @prefix@/examples/build_win32/clean_stat.bat=$SRCDIR/examples/build_win32/clean_stat.bat 0644 root root -f none @prefix@/examples/build_win32/clean_udf.bat=$SRCDIR/examples/build_win32/clean_udf.bat 0644 root root -f none @prefix@/examples/build_win32/make_all.bat=$SRCDIR/examples/build_win32/make_all.bat 0644 root root -f none @prefix@/examples/build_win32/make_api.bat=$SRCDIR/examples/build_win32/make_api.bat 0644 root root -f none @prefix@/examples/build_win32/make_dyn.bat=$SRCDIR/examples/build_win32/make_dyn.bat 0644 root root -f none @prefix@/examples/build_win32/make_stat.bat=$SRCDIR/examples/build_win32/make_stat.bat 0644 root root -f none @prefix@/examples/build_win32/make_udf.bat=$SRCDIR/examples/build_win32/make_udf.bat 0644 root root -f none @prefix@/examples/build_win32/setenvvar.bat=$SRCDIR/examples/build_win32/setenvvar.bat 0644 root root -d none @prefix@/examples/build_unix 0755 root root -f none @prefix@/examples/build_unix/Makefile.in.example5=$SRCDIR/examples/build_unix/Makefile.in.example5 0644 root root -f none @prefix@/examples/build_unix/Makefile.in.v5_examples=$SRCDIR/examples/build_unix/Makefile.in.v5_examples 0644 root root + d none @prefix@/examples/dyn 0755 root root f none @prefix@/examples/dyn/dyn1.e=$SRCDIR/examples/dyn/dyn1.e 0644 root root f none @prefix@/examples/dyn/dyn2.e=$SRCDIR/examples/dyn/dyn2.e 0644 root root @@ -145,12 +102,15 @@ f none @prefix@/examples/dyn/dyn3.e=$SRCDIR/examples/dyn/dyn3.e 0644 root root f none @prefix@/examples/dyn/dyn4.e=$SRCDIR/examples/dyn/dyn4.e 0644 root root f none @prefix@/examples/dyn/dyn5.e=$SRCDIR/examples/dyn/dyn5.e 0644 root root f none @prefix@/examples/dyn/dynfull.e=$SRCDIR/examples/dyn/dynfull.e 0644 root root + d none @prefix@/examples/empbuild 0755 root root f none @prefix@/examples/empbuild/employee.fdb=$SRCDIR/examples/empbuild/employee.fdb 0644 root root -f none @prefix@/examples/empbuild/employe2.sql=$SRCDIR/examples/empbuild/employe2.sql 0644 root root +#f none @prefix@/examples/empbuild/employe2.sql=$SRCDIR/examples/empbuild/employe2.sql 0644 root root + d none @prefix@/examples/include 0755 root root f none @prefix@/examples/include/align.h=$SRCDIR/examples/include/align.h 0644 root root f none @prefix@/examples/include/example.h=$SRCDIR/examples/include/example.h 0644 root root + d none @prefix@/examples/stat 0755 root root f none @prefix@/examples/stat/stat1.e=$SRCDIR/examples/stat/stat1.e 0644 root root f none @prefix@/examples/stat/stat10.e=$SRCDIR/examples/stat/stat10.e 0644 root root @@ -165,55 +125,105 @@ f none @prefix@/examples/stat/stat6.e=$SRCDIR/examples/stat/stat6.e 0644 root ro f none @prefix@/examples/stat/stat7.e=$SRCDIR/examples/stat/stat7.e 0644 root root f none @prefix@/examples/stat/stat8.e=$SRCDIR/examples/stat/stat8.e 0644 root root f none @prefix@/examples/stat/stat9.e=$SRCDIR/examples/stat/stat9.e 0644 root root + + d none @prefix@/examples/udf 0755 root root f none @prefix@/examples/udf/udf.sql=$SRCDIR/examples/udf/udf.sql 0644 root root f none @prefix@/examples/udf/udflib.c=$SRCDIR/examples/udf/udflib.c 0644 root root f none @prefix@/examples/udf/udflib.def=$SRCDIR/examples/udf/udflib.def 0644 root root + + f none @prefix@/examples/README=$SRCDIR/examples/README 0644 root root + f none @prefix@/examples/functions.c=$SRCDIR/examples/functions.c 0644 root root - - - d none @prefix@/lib 0755 root root -#f none @prefix@/lib/libfbembed.so.1.5.1=$SRCDIR/lib/libfbembed.so.@FIREBIRD_VERSION@ 0755 root root -#s none @prefix@/lib/libfbembed.so.1=@prefix@/lib/libfbembed.so.@FIREBIRD_VERSION@ -#s none @prefix@/lib/libfbembed.so=@prefix@/lib/libfbembed.so.1 -#f none @prefix@/lib/libfbstatic.a=$SRCDIR/lib/libfbstatic.a 0644 root root -#s none @prefix@/lib/libgds.so.1=@prefix@/lib/libfbembed.so.1 -#s none @prefix@/lib/libgds.so=@prefix@/lib/libfbembed.so - f none @prefix@/lib/libfbclient.so.@FIREBIRD_VERSION@=$SRCDIR/lib/libfbclient.so.@FIREBIRD_VERSION@ 0755 root root -s none @prefix@/lib/libfbclient.so.1=@prefix@/lib/libfbclient.so.@FIREBIRD_VERSION@ +s none @prefix@/lib/libfbclient.so.2=@prefix@/lib/libfbclient.so.@FIREBIRD_VERSION@ s none @prefix@/lib/libfbclient.so=@prefix@/lib/libfbclient.so.1 f none @prefix@/lib/libfbembed.so.@FIREBIRD_VERSION@=$SRCDIR/lib/libfbembed.so.@FIREBIRD_VERSION@ 0755 root root -s none @prefix@/lib/libfbembed.so.2=$SRCDIR/lib/libfbembed.so.@FIREBIRD_VERSION@ -s none @prefix@/lib/libfbembed.so=$SRCDIR/lib/libfbembed.so.2 +s none @prefix@/lib/libfbembed.so.2=@prefix@/lib/libfbembed.so.@FIREBIRD_VERSION@ +s none @prefix@/lib/libfbembed.so=@prefix@/lib/libfbembed.so.2 - - -#f none @prefix@/lib/libeditline.a=$SRCDIR/lib/libeditline.a 0644 root root -#f none @prefix@/lib/libfbcommon.a=$SRCDIR/lib/libfbcommon.a 0666 root root -#f none @prefix@/lib/libfbstatic.a=$SRCDIR/lib/libfbstatic.a 0666 root root f none @prefix@/lib/libib_util.so=$SRCDIR/lib/libib_util.so 0755 root root -s none @prefix@/lib/libfbclient.so.2=$SRCDIR/libfbclient.so.@FIREBIRD_VERSION@ +#ICU +f none @prefix@/lib/libicudata.so.30.0=$SRCDIR/lib/libicudata.so.30.0 0755 root root +s none @prefix@/lib/libicudata.so.30=@prefix@/lib/libicudata.so.30.0 +s none @prefix@/lib/libicudata.so=@prefix@/lib/libicudata.so.30 -d none @prefix@/misc 0755 root root -f none @prefix@/misc/firebird.conf=$SRCDIR/misc/firebird.conf 0644 root root +f none @prefix@/lib/libicui18n.so.30.0=$SRCDIR/lib/libicui18n.so.30.0 0755 root root +s none @prefix@/lib/libicui18n.so.30=@prefix@/lib/libicui18n.so.30.0 +s none @prefix@/lib/libicui18n.so=@prefix@/lib/libicui18n.so.30 +f none @prefix@/lib/libicuuc.so.30.0=$SRCDIR/lib/libicuuc.so.30.0 0755 root root +s none @prefix@/lib/libicuuc.so.30=@prefix@/lib/libicuuc.so.30.0 +s none @prefix@/lib/libicuuc.so=@prefix@/lib/libicuuc.so.30 d none @prefix@/help 0755 root root f none @prefix@/help/help.fdb=$SRCDIR/help/help.fdb 0444 root root -#f none @prefix@/isc_lock1.Solx8626V=$SRCDIR/isc_lock1.Solx8626V 0666 root root -#f none @prefix@/isc_init1.Solx8626V=$SRCDIR/isc_init1.Solx8626V 0666 root root -#f none @prefix@/fbsrvreport.txt=$SRCDIR/fbsrvreport.txt 0644 root root - -#f none @prefix@/security2.fdb=$SRCDIR/security2.fdb 0644 root root f none @prefix@/firebird.msg=$SRCDIR/firebird.msg 0666 root root f none @prefix@/fr_FR.msg=$SRCDIR/fr_FR.msg 0666 root root f none @prefix@/de_DE.msg=$SRCDIR/de_DE.msg 0666 root root -#f none @prefix@/firebird.conf=$SRCDIR/firebird.conf 0644 root root + +d none @prefix@/doc 0755 root root +d none @prefix@/doc/sql.extensions 0755 root root +f none @prefix@/doc/sql.extensions/README.PSQL_stack_trace=$SRCDIR/../../doc/sql.extensions/README.PSQL_stack_trace.txt 0644 root root +f none @prefix@/doc/sql.extensions/README.aggregate_tracking=$SRCDIR/../../doc/sql.extensions/README.aggregate_tracking 0644 root root +f none @prefix@/doc/sql.extensions/README.case=$SRCDIR/../../doc/sql.extensions/README.case 0644 root root +f none @prefix@/doc/sql.extensions/README.coalesce=$SRCDIR/../../doc/sql.extensions/README.coalesce 0644 root root +f none @prefix@/doc/sql.extensions/README.context_variables=$SRCDIR/../../doc/sql.extensions/README.context_variables 0644 root root +f none @prefix@/doc/sql.extensions/README.context_variables2=$SRCDIR/../../doc/sql.extensions/README.context_variables2 0644 root root +f none @prefix@/doc/sql.extensions/README.current_time=$SRCDIR/../../doc/sql.extensions/README.current_time 0644 root root +f none @prefix@/doc/sql.extensions/README.cursors=$SRCDIR/../../doc/sql.extensions/README.cursors 0644 root root +f none @prefix@/doc/sql.extensions/README.data_type_results_of_aggregations=$SRCDIR/../../doc/sql.extensions/README.data_type_results_of_aggregations.txt 0644 root root +f none @prefix@/doc/sql.extensions/README.data_types=$SRCDIR/../../doc/sql.extensions/README.data_types 0644 root root +f none @prefix@/doc/sql.extensions/README.ddl=$SRCDIR/../../doc/sql.extensions/README.ddl.txt 0644 root root +f none @prefix@/doc/sql.extensions/README.default_parameters=$SRCDIR/../../doc/sql.extensions/README.default_parameters 0644 root root +f none @prefix@/doc/sql.extensions/README.derived_tables=$SRCDIR/../../doc/sql.extensions/README.derived_tables.txt 0644 root root +f none @prefix@/doc/sql.extensions/README.distinct=$SRCDIR/../../doc/sql.extensions/README.distinct 0644 root root +f none @prefix@/doc/sql.extensions/README.exception_handling=$SRCDIR/../../doc/sql.extensions/README.exception_handling 0644 root root +f none @prefix@/doc/sql.extensions/README.execute_block=$SRCDIR/../../doc/sql.extensions/README.execute_block 0644 root root +f none @prefix@/doc/sql.extensions/README.execute_statement=$SRCDIR/../../doc/sql.extensions/README.execute_statement 0644 root root +f none @prefix@/doc/sql.extensions/README.explicit_locks=$SRCDIR/../../doc/sql.extensions/README.explicit_locks 0644 root root +f none @prefix@/doc/sql.extensions/README.expression_indices=$SRCDIR/../../doc/sql.extensions/README.expression_indices 0644 root root +f none @prefix@/doc/sql.extensions/README.iif=$SRCDIR/../../doc/sql.extensions/README.iif 0644 root root +f none @prefix@/doc/sql.extensions/README.isc_info_xxx=$SRCDIR/../../doc/sql.extensions/README.isc_info_xxx 0644 root root +f none @prefix@/doc/sql.extensions/README.keywords=$SRCDIR/../../doc/sql.extensions/README.keywords 0644 root root +f none @prefix@/doc/sql.extensions/README.leave_labels=$SRCDIR/../../doc/sql.extensions/README.leave_labels 0644 root root +f none @prefix@/doc/sql.extensions/README.length=$SRCDIR/../../doc/sql.extensions/README.length 0644 root root +f none @prefix@/doc/sql.extensions/README.null_value=$SRCDIR/../../doc/sql.extensions/README.null_value 0644 root root +f none @prefix@/doc/sql.extensions/README.nullif=$SRCDIR/../../doc/sql.extensions/README.nullif 0644 root root +f none @prefix@/doc/sql.extensions/README.order_by_expressions_nulls=$SRCDIR/../../doc/sql.extensions/README.order_by_expressions_nulls 0644 root root +f none @prefix@/doc/sql.extensions/README.plan=$SRCDIR/../../doc/sql.extensions/README.plan 0644 root root +f none @prefix@/doc/sql.extensions/README.returning=$SRCDIR/../../doc/sql.extensions/README.returning 0644 root root +f none @prefix@/doc/sql.extensions/README.rows=$SRCDIR/../../doc/sql.extensions/README.rows 0644 root root +f none @prefix@/doc/sql.extensions/README.savepoints=$SRCDIR/../../doc/sql.extensions/README.savepoints 0644 root root +f none @prefix@/doc/sql.extensions/README.select_expressions=$SRCDIR/../../doc/sql.extensions/README.select_expressions 0644 root root +f none @prefix@/doc/sql.extensions/README.sequence_generators=$SRCDIR/../../doc/sql.extensions/README.sequence_generators 0644 root root +f none @prefix@/doc/sql.extensions/README.set_transaction=$SRCDIR/../../doc/sql.extensions/README.set_transaction.txt +f none @prefix@/doc/sql.extensions/README.trim=$SRCDIR/../../doc/sql.extensions/README.trim 0644 root root +f none @prefix@/doc/sql.extensions/README.universal_triggers=$SRCDIR/../../doc/sql.extensions/README.universal_triggers 0644 root root +f none @prefix@/doc/sql.extensions/README.view_updates=$SRCDIR/../../doc/sql.extensions/README.view_updates 0644 root root +f none @prefix@/doc/Firebird-2.0-QuickStart.pdf=$SRCDIR/../../doc/Firebird-2.0-QuickStart.pdf 0644 root root +f none @prefix@/doc/ReleaseNotes.pdf=$SRCDIR/../../doc/ReleaseNotes.pdf 0644 root root +f none @prefix@/doc/README.NTSecurity=$SRCDIR/../../doc/README.NTSecurity 0644 root root +f none @prefix@/doc/README.optimizer=$SRCDIR/../../doc/README.Optimizer.txt 0644 root root +f none @prefix@/doc/README.Win32LibraryInstallation=$SRCDIR/../../doc/README.Win32LibraryInstallation.txt 0644 root root +f none @prefix@/doc/README.build.mingw.html=$SRCDIR/../../doc/README.build.mingw.html 0644 root root +f none @prefix@/doc/README.build.msvc.html=$SRCDIR/../../doc/README.build.msvc.html 0644 root root +f none @prefix@/doc/README.coding_style=$SRCDIR/../../doc/README.coding.style 0644 root root +f none @prefix@/doc/README.garbage_collector=$SRCDIR/../../doc/README.garbage_collector 0644 root root +f none @prefix@/doc/README.incompatibilities=$SRCDIR/../../doc/README.incompatibilities.txt 0644 root root +f none @prefix@/doc/README.instsvc=$SRCDIR/../../doc/README.instsvc 0644 root root +f none @prefix@/doc/README.intl=$SRCDIR/../../doc/README.intl 0644 root root +f none @prefix@/doc/README.isql_enhancements=$SRCDIR/../../doc/README.isql_enhancements.txt 0644 root root +f none @prefix@/doc/README.makefiles=$SRCDIR/../../doc/README.makefiles 0644 root root +f none @prefix@/doc/README.sha1=$SRCDIR/../../doc/README.sha1 0644 root root +f none @prefix@/doc/README.user=$SRCDIR/../../doc/README.user 0644 root root +f none @prefix@/doc/README.user.embedded=$SRCDIR/../../doc/README.user.embedded 0644 root root +f none @prefix@/doc/README.user.troubleshooting=$SRCDIR/../../doc/README.user.troubleshooting 0644 root root +f none @prefix@/doc/README.xnet=$SRCDIR/../../doc/README.xnet 0644 root root diff --git a/builds/install/arch-specific/solaris/Makefile.in b/builds/install/arch-specific/solaris/Makefile.in index 3cfcfc044d..b196ce34ea 100644 --- a/builds/install/arch-specific/solaris/Makefile.in +++ b/builds/install/arch-specific/solaris/Makefile.in @@ -25,9 +25,9 @@ # Created by: Erik Kunze # # Contributor(s): +# Paul Beach - Firebird 2.x # -# -# $Id: Makefile.in,v 1.3 2005-05-27 22:15:21 asfernandes Exp $ +# $Id: Makefile.in,v 1.4 2007-08-31 08:51:42 paulbeach Exp $ # ROOT=.. @@ -42,23 +42,23 @@ include $(ROOT)/gen/make.shared.variables PGK_FILES=pkginfo prototype preinstall postinstall postremove PKG_DIR=$(RealFirebirdPath)/../install -PKG_NAME=Firebird-@ARCH_TYPE_SUFFIX@-$(FirebirdVersion).$(BuildNum)-$(PackageVersion)-SolX86.pkg -LGCC_PKG_NAME=LibGCC-3.x.FB-runtime-SolX86.pkg +PKG_NAME=Firebird@ARCH_TYPE_SUFFIX@-$(FirebirdVersion).$(BuildNum)-$(PackageVersion)-Solaris-@CPU_TYPE@.pkg +LGCC_PKG_NAME=LibGCC-3.x.FB-runtime-@CPU_TYPE@.pkg install package packages dist: - @echo Making Solaris x86 package... - rm -rf $(PKG_DIR)/FB2SI + @echo Making Solaris @CPU_TYPE@ package... + rm -rf $(PKG_DIR)/Firebird2 -mkdir -p $(PKG_DIR) (cd $(PKG_DIR); pkgmk -o -d $(PKG_DIR)) - pkgtrans -s $(PKG_DIR) $(PKG_DIR)/$(PKG_NAME) FB2SI + pkgtrans -s $(PKG_DIR) $(PKG_DIR)/$(PKG_NAME) Firebird2 libs: - @echo Making Solaris x86 LIBGCC package... + @echo Making Solaris @CPU_TYPE@ LIBGCC package... rm -rf $(PKG_DIR)/FBLIBGCC -mkdir -p $(PKG_DIR) (cd $(PKG_DIR); pkgmk -o -f prototypelg -d $(PKG_DIR)) pkgtrans -s $(PKG_DIR) $(PKG_DIR)/$(LGCC_PKG_NAME) FBLIBGCC clean clobber: - rm -rf $(PKG_DIR)/FB2SI + rm -rf $(PKG_DIR)/Firebird2 rm -rf $(PKG_DIR)/FBLIBGCC rm -f $(PKG_DIR)/$(PKG_NAME) diff --git a/builds/install/arch-specific/solx86/Makefile.in b/builds/install/arch-specific/solx86/Makefile.in index 2a496f1591..0077c4ff5f 100644 --- a/builds/install/arch-specific/solx86/Makefile.in +++ b/builds/install/arch-specific/solx86/Makefile.in @@ -1 +1,3 @@ -# to be done but configure requires it or fails +# Stub - required for configure.in. However gcc builds of +# Firebird for Solaris use the install information from the +# solaris directory diff --git a/configure.in b/configure.in index e2287553e0..8107a4767c 100644 --- a/configure.in +++ b/configure.in @@ -170,11 +170,11 @@ case "$target" in i386-pc-solaris*) MAKEFILE_PREFIX=solx86gcc - INSTALL_PREFIX=solx86gcc + INSTALL_PREFIX=solaris PLATFORM=solx86 AC_DEFINE(solx86, 1, [Define this if OS is Solarix x86]) LOCK_MANAGER_FLG=N - EDITLINE_FLG=N + EDITLINE_FLG=Y SHRLIB_EXT=so PTHREAD_CFLAGS=-threads PTHREAD_LIBS=-lthread @@ -185,7 +185,7 @@ case "$target" in sparc-sun-solaris*) MAKEFILE_PREFIX=solaris - INSTALL_PREFIX=solx86gcc + INSTALL_PREFIX=solaris PLATFORM=SOLARIS AC_DEFINE(SOLARIS, 1, [Define this if OS is Solaris Sparc]) LOCK_MANAGER_FLG=N @@ -1038,13 +1038,13 @@ case "$PLATFORM" in ;; solx86|SOLARIS) - AC_CONFIG_FILES([gen/install/Pkginfo:builds/install/arch-specific/solx86gcc/${ARCH_TYPE_SUFFIX}/pkginfo.in - gen/install/Prototype:builds/install/arch-specific/solx86gcc/${ARCH_TYPE_SUFFIX}/prototype.in - gen/install/Preinstall:builds/install/arch-specific/solx86gcc/${ARCH_TYPE_SUFFIX}/preinstall.in - gen/install/Postinstall:builds/install/arch-specific/solx86gcc/${ARCH_TYPE_SUFFIX}/postinstall.in - gen/install/Postremove:builds/install/arch-specific/solx86gcc/${ARCH_TYPE_SUFFIX}/postremove.in - gen/install/prototypelg:builds/install/arch-specific/solx86gcc/LIBGCC/prototypelg.in - gen/install/pkginfolg:builds/install/arch-specific/solx86gcc/LIBGCC/pkginfolg.in + AC_CONFIG_FILES([gen/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/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/install/Postremove:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postremove.in + gen/install/prototypelg:builds/install/arch-specific/solaris/libgcc/prototypelg.in + gen/install/pkginfolg:builds/install/arch-specific/solaris/libgcc/pkginfolg.in ],[chmod a+x gen/install/Pre* gen/install/Post* 2>/dev/null]) ;; diff --git a/extern/icu/source/config/mh-solaris-gcc b/extern/icu/source/config/mh-solaris-gcc index c0387ec1ab..3e549c436a 100644 --- a/extern/icu/source/config/mh-solaris-gcc +++ b/extern/icu/source/config/mh-solaris-gcc @@ -6,11 +6,10 @@ ## Flags for position independent code SHAREDLIBCFLAGS = -fPIC SHAREDLIBCXXFLAGS = -fPIC -SHAREDLIBCPPFLAGS = -DPIC -THREADSCFLAGS += -threads -DSOLARIS_MT -THREADSCXXFLAGS += -threads -DSOLARIS_MT +THREADSCFLAGS += -threads +THREADSCXXFLAGS += -threads ## Commands to generate dependency files