firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 21:23:04 +01:00
Code Issues

HPUX port

Browse Source
This commit is contained in:
alexpeshkoff 2008-12-11 10:59:26 +00:00
parent 3d31835554
commit 017a5b6759
9 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builds/install/arch-specific/hpux/Makefile.in
View File

@ -27,7 +27,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in,v 1.3 2008-01-10 11:26:51 paulbeach Exp $ # $Id: Makefile.in,v 1.4 2008-12-11 10:59:21 alexpeshkoff Exp $
# #
ROOT=.. ROOT=..
@ -91,11 +91,11 @@ TarInstallDir=$(GEN_ROOT)/install
dist : packages dist : packages
packages: depotfile tarfile debugfile packages: tarfile debugfile depotfile
depotfile: $(DepotFile) depotfile: $(DepotFile)
$(DepotFile): buildDepot $(DepotFile): buildDepot
(cd $(GEN_ROOT); swpackage -d "| gzip -c > $(DepotFile).gz" -x media_type=tape -s $(psfFile)) (cd $(GEN_ROOT); /usr/sbin/swpackage -d "| gzip -c > $(DepotFile).gz" -x media_type=tape -s $(psfFile))
tarfile: $(TarFile) tarfile: $(TarFile)
@ -162,7 +162,7 @@ buildTarDir: buildImageDir
cp -r $(GEN_ROOT)/install/scripts $(GEN_ROOT)/$(TarDir) cp -r $(GEN_ROOT)/install/scripts $(GEN_ROOT)/$(TarDir)
cp -r $(GEN_ROOT)/install/scripts/tarmainInstall.sh $(GEN_ROOT)/$(TarDir)/install.sh cp -r $(GEN_ROOT)/install/scripts/tarmainInstall.sh $(GEN_ROOT)/$(TarDir)/install.sh
chmod a+x $(GEN_ROOT)/$(TarDir)/install.sh $(GEN_ROOT)/$(TarDir)/scripts/*sh chmod a+x $(GEN_ROOT)/$(TarDir)/install.sh $(GEN_ROOT)/$(TarDir)/scripts/*sh
(cd $(GEN_ROOT)/buildroot; tar -cvf buildroot.tar usr opt ) (cd $(GEN_ROOT)/buildroot; rm -f buildroot.tar manifest.txt; tar -cvf buildroot.tar * )
(cd $(GEN_ROOT)/buildroot; tar -tvf buildroot.tar > manifest.txt ) (cd $(GEN_ROOT)/buildroot; tar -tvf buildroot.tar > manifest.txt )
(cd $(GEN_ROOT)/buildroot; cp buildroot.tar ../$(TarDir)/buildroot.tar ) (cd $(GEN_ROOT)/buildroot; cp buildroot.tar ../$(TarDir)/buildroot.tar )
(cd $(GEN_ROOT)/buildroot; cp manifest.txt ../$(TarDir)/manifest.txt ) (cd $(GEN_ROOT)/buildroot; cp manifest.txt ../$(TarDir)/manifest.txt )

49
builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in
View File

@ -30,7 +30,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: makeinstallImage.sh.in,v 1.2 2008-01-07 12:25:43 paulbeach Exp $ # $Id: makeinstallImage.sh.in,v 1.3 2008-12-11 10:59:22 alexpeshkoff Exp $
# #
# Script to copy install files from the build/transport area # Script to copy install files from the build/transport area
@ -57,10 +57,12 @@ DestDir=$TargetDir/$FBRootDir
# Place it to target directory # Place it to target directory
addLibs() { addLibs() {
libTmp=/tmp/fbbuildsh
libSdir=$1 libSdir=$1
libScript=$2 libScript=$2
libTdir=$3 libTdir=$3
libTarget=$libTdir/$libScript libTarget=$libTmp
finalTarget=$libTdir/$libScript
rm -f $libTarget rm -f $libTarget
touch $libTarget touch $libTarget
@ -71,6 +73,7 @@ addLibs() {
echo "" >>$libTarget # avoid missing linefeed echo "" >>$libTarget # avoid missing linefeed
done done
cat $libSdir/$libScript >>$libTarget cat $libSdir/$libScript >>$libTarget
mv $libTarget $finalTarget
} }
@ -145,26 +148,26 @@ copyFiles() {
cp $BuiltFBDir/bin/qli $DestDir/bin/qli cp $BuiltFBDir/bin/qli $DestDir/bin/qli
# Append libraries to scripts # Append libraries to scripts
addLibs $BuildRootDir/gen/firebird/bin changeRunUser.sh $BuildRootDir/gen/install/bin addLibs $BuildRootDir/gen/firebird/bin changeRunUser.sh $BuildRootDir/gen/firebird/bin
addLibs $BuildRootDir/gen/firebird/bin restoreRootRunUser.sh $BuildRootDir/gen/install/bin addLibs $BuildRootDir/gen/firebird/bin restoreRootRunUser.sh $BuildRootDir/gen/firebird/bin
addLibs $BuildRootDir/gen/firebird/bin changedbaPassword.sh $BuildRootDir/gen/install/bin addLibs $BuildRootDir/gen/firebird/bin changedbaPassword.sh $BuildRootDir/gen/firebird/bin
addLibs $BuiltFBDir/bin changegdslibrarycompatibleLink.sh $BuildRootDir/gen/install/bin addLibs $BuiltFBDir/bin changegdslibrarycompatibleLink.sh $BuildRootDir/gen/firebird/bin
addLibs $BuildRootDir/gen/firebird/bin tarmainInstall.sh $BuildRootDir/gen/install/scripts
addLibs $BuildRootDir/gen/firebird/bin tarInstall.sh $BuildRootDir/gen/install/scripts cp $BuildRootDir/gen/firebird/bin/*Library.sh $BuildRootDir/gen/install/scripts
addLibs $BuildRootDir/gen/firebird/bin preInstall.sh $BuildRootDir/gen/install/scripts
addLibs $BuildRootDir/gen/firebird/bin postInstall.sh $BuildRootDir/gen/install/scripts addLibs $BuildRootDir/gen/install/scripts tarmainInstall.sh $BuildRootDir/gen/install/scripts
addLibs $BuildRootDir/gen/firebird/bin preUninstall.sh $BuildRootDir/gen/install/scripts addLibs $BuildRootDir/gen/install/scripts tarInstall.sh $BuildRootDir/gen/install/scripts
addLibs $BuildRootDir/gen/firebird/bin postUninstall.sh $BuildRootDir/gen//install/scripts addLibs $BuildRootDir/gen/install/scripts preInstall.sh $BuildRootDir/gen/install/scripts
addLibs $BuildRootDir/gen/firebird/bin tarUninstall.sh $BuildRootDir/gen/install/scripts addLibs $BuildRootDir/gen/install/scripts postInstall.sh $BuildRootDir/gen/install/scripts
addLibs $BuildRootDir/gen/firebird/bin tarmainUninstall.sh $BuildRootDir/gen/install/scripts addLibs $BuildRootDir/gen/install/scripts preUninstall.sh $BuildRootDir/gen/install/scripts
mv $BuildRootDir/gen/install/scripts/tarmainUninstall.sh $BuildRootDir/gen/install/scripts/tarMainUninstall.sh addLibs $BuildRootDir/gen/install/scripts postUninstall.sh $BuildRootDir/gen//install/scripts
cp $BuildRootDir/gen/firebird/bin/createaliasDB.sh $BuildRootDir/gen/install/bin/createaliasDB.sh addLibs $BuildRootDir/gen/install/scripts tarUninstall.sh $BuildRootDir/gen/install/scripts
rm $BuildRootDir/gen/firebird/bin/*.sh addLibs $BuildRootDir/gen/install/scripts tarmainUninstall.sh $BuildRootDir/gen/install/scripts
cp $BuildRootDir/gen/install/bin/changeRunUser.sh $DestDir/bin cp $BuildRootDir/gen/firebird/bin/changeRunUser.sh $DestDir/bin
cp $BuildRootDir/gen/install/bin/restoreRootRunUser.sh $DestDir/bin cp $BuildRootDir/gen/firebird/bin/restoreRootRunUser.sh $DestDir/bin
cp $BuildRootDir/gen/install/bin/changedbaPassword.sh $DestDir/bin cp $BuildRootDir/gen/firebird/bin/changedbaPassword.sh $DestDir/bin
cp $BuildRootDir/gen/install/bin/changegdslibrarycompatibleLink.sh $DestDir/bin cp $BuildRootDir/gen/firebird/bin/changegdslibrarycompatibleLink.sh $DestDir/bin
cp $BuildRootDir/gen/install/bin/createaliasDB.sh $DestDir/bin cp $BuildRootDir/gen/firebird/bin/createaliasDB.sh $DestDir/bin
# These scripts do not need libraries # These scripts do not need libraries
cp $BuiltFBDir/bin/fb_config $DestDir/bin cp $BuiltFBDir/bin/fb_config $DestDir/bin
cp $BuildRootDir/gen/install/misc/firebird.init.d.hpux $DestDir/misc cp $BuildRootDir/gen/install/misc/firebird.init.d.hpux $DestDir/misc
@ -218,7 +221,7 @@ cp $BuildRootDir/gen/install/bin/createaliasDB.sh $DestDir/bin
cp $BuildRootDir/doc/README.user $DestDir/README cp $BuildRootDir/doc/README.user $DestDir/README
# Misc config files # Misc config files
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/firebird.conf cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/
cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/ cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/
cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/ cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/

2
builds/posix/Makefile.in.firebird
View File

@ -559,6 +559,8 @@ clean_icu:
-make -C $(ROOT)/extern/icu/source clean -make -C $(ROOT)/extern/icu/source clean
clean_objects: clean_objects:
$(RM) `find $(ROOT)/extern/ -type f -name '*.lo' -print`
$(RM) `find $(ROOT)/extern/ -type f -name '*.lo' -print`
$(RM) `find $(TMP_ROOT)/ -type f -name '*.o' -print` $(RM) `find $(TMP_ROOT)/ -type f -name '*.o' -print`
clean_extern_objects: clean_extern_objects:

1
builds/posix/firebird.hpux.vers
View File

@ -108,7 +108,6 @@
+e gds__start_multiple +e gds__start_multiple
+e gds__start_request +e gds__start_request
+e gds__start_transaction +e gds__start_transaction
+e gds__temp_dir
+e gds__temp_file +e gds__temp_file
+e gds__thread_enable +e gds__thread_enable
+e gds__thread_enter +e gds__thread_enter

16
configure.in
View File

@ -1126,14 +1126,14 @@ case "$PLATFORM" in
HP_INSTALL_SRC_DIR=builds/install/arch-specific/hpux/${FIREBIRD_ARCH_TYPE} HP_INSTALL_SRC_DIR=builds/install/arch-specific/hpux/${FIREBIRD_ARCH_TYPE}
AC_CONFIG_FILES([gen/install/makeinstallImage.sh:${HP_INSTALL_SRC_DIR}/makeinstallImage.sh.in AC_CONFIG_FILES([gen/install/makeinstallImage.sh:${HP_INSTALL_SRC_DIR}/makeinstallImage.sh.in
gen/firebirdCS.psf:${HP_INSTALL_SRC_DIR}/firebirdCS.psf.in gen/firebirdCS.psf:${HP_INSTALL_SRC_DIR}/firebirdCS.psf.in
gen/firebird/bin/preInstall.sh:${HP_INSTALL_SRC_DIR}/preInstall.sh.in gen/install/scripts/preInstall.sh:${HP_INSTALL_SRC_DIR}/preInstall.sh.in
gen/firebird/bin/tarInstall.sh:${HP_INSTALL_SRC_DIR}/tarInstall.sh.in gen/install/scripts/tarInstall.sh:${HP_INSTALL_SRC_DIR}/tarInstall.sh.in
gen/firebird/bin/tarmainInstall.sh:${HP_INSTALL_SRC_DIR}/tarmainInstall.sh.in gen/install/scripts/tarmainInstall.sh:${HP_INSTALL_SRC_DIR}/tarmainInstall.sh.in
gen/firebird/bin/tarUninstall.sh:${HP_INSTALL_SRC_DIR}/tarUninstall.sh.in gen/install/scripts/tarUninstall.sh:${HP_INSTALL_SRC_DIR}/tarUninstall.sh.in
gen/firebird/bin/tarmainUninstall.sh:${HP_INSTALL_SRC_DIR}/tarmainUninstall.sh.in gen/install/scripts/tarmainUninstall.sh:${HP_INSTALL_SRC_DIR}/tarmainUninstall.sh.in
gen/firebird/bin/postInstall.sh:${HP_INSTALL_SRC_DIR}/postInstall.sh.in gen/install/scripts/postInstall.sh:${HP_INSTALL_SRC_DIR}/postInstall.sh.in
gen/firebird/bin/preUninstall.sh:${HP_INSTALL_SRC_DIR}/preUninstall.sh.in gen/install/scripts/preUninstall.sh:${HP_INSTALL_SRC_DIR}/preUninstall.sh.in
gen/firebird/bin/postUninstall.sh:${HP_INSTALL_SRC_DIR}/postUninstall.sh.in gen/install/scripts/postUninstall.sh:${HP_INSTALL_SRC_DIR}/postUninstall.sh.in
gen/install/misc/firebird.init.d.hpux:builds/install/arch-specific/hpux/misc/firebird.init.d.hpux.in gen/install/misc/firebird.init.d.hpux:builds/install/arch-specific/hpux/misc/firebird.init.d.hpux.in
gen/install/misc/rc.config.firebird.hpux:builds/install/arch-specific/hpux/misc/rc.config.firebird.hpux.in gen/install/misc/rc.config.firebird.hpux:builds/install/arch-specific/hpux/misc/rc.config.firebird.hpux.in
gen/firebird/bin/changedbaPassword.sh:builds/install/arch-specific/hpux/misc/changedbaPassword.sh.in gen/firebird/bin/changedbaPassword.sh:builds/install/arch-specific/hpux/misc/changedbaPassword.sh.in

9
extern/icu/source/common/putil.c vendored
View File

@ -55,6 +55,7 @@ on Leopard (MacOS 10.5). Due to UNIX2003 support included
in MacOS 10.5 */ in MacOS 10.5 */
#undef _XOPEN_SOURCE #undef _XOPEN_SOURCE
#endif #endif
/* Define __USE_POSIX and __USE_XOPEN for Linux and glibc. */ /* Define __USE_POSIX and __USE_XOPEN for Linux and glibc. */
#ifndef __USE_POSIX #ifndef __USE_POSIX
#define __USE_POSIX #define __USE_POSIX
@ -203,6 +204,14 @@ static double * const fgInf = &gInf;
#include <langinfo.h> #include <langinfo.h>
#endif #endif
#if defined(U_HPUX)
/* This 2 symbols are defined as empty strings for this platform */
/* Have to undefine them to avoid syntax errors */
#undef U_TZSET
#undef U_TZNAME
#endif
/* Utilities to get the bits from a double */ /* Utilities to get the bits from a double */
static char* static char*
u_topNBytesOfDouble(double* d, int n) u_topNBytesOfDouble(double* d, int n)

6
src/common/classes/locks.h
View File

@ -247,7 +247,7 @@ public:
static void initMutexes(); static void initMutexes();
}; };
#ifndef DARWIN #if !(defined(DARWIN) || defined(HPUX))
class Spinlock class Spinlock
{ {
private: private:
@ -279,7 +279,9 @@ public:
system_call_failed::raise("pthread_spin_unlock"); system_call_failed::raise("pthread_spin_unlock");
} }
}; };
#endif //DARWIN #else // have spinlocks
typedef Mutex Spinlock;
#endif // have spinlocks
#endif //SOLARIS_MT #endif //SOLARIS_MT

2
src/jrd/isc_sync.cpp
View File

@ -104,7 +104,7 @@ static UCHAR *next_shared_memory;
#include <sys/shm.h> #include <sys/shm.h>
#include <sys/sem.h> #include <sys/sem.h>
#ifndef O_RDWR #ifdef HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>
#endif #endif

2
src/jrd/utl.cpp
View File

@ -172,7 +172,7 @@ static const TEXT* const impl_implementation[] =
"Firebird/sun", /* 28 */ "Firebird/sun", /* 28 */
NULL, // "Firebird/OS2", /* 29 */ NULL, // "Firebird/OS2", /* 29 */
"Firebird/sun4", /* 30 */ "Firebird/sun4", /* 30 */
NULL, // "Firebird/hpux800", /* 31 */ "Firebird/hpux", /* 31 */
"Firebird/sun386", /* 32 */ "Firebird/sun386", /* 32 */
"Firebird:ORACLE/vms", /* 33 */ "Firebird:ORACLE/vms", /* 33 */
NULL, // "Firebird/mac/aux", /* 34 */ NULL, // "Firebird/mac/aux", /* 34 */