firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Fix some packaging issues with non-x86 Linux ports. Prepare AMD64 port for public testing

Browse Source
This commit is contained in:
skidder 2004-01-29 06:32:09 +00:00
parent cec8e380e2
commit 75ae1d9890
8 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builds/install/arch-specific/linux/Makefile.in
View File

@ -27,7 +27,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in,v 1.2 2003-12-30 02:06:13 skidder Exp $ # $Id: Makefile.in,v 1.3 2004-01-29 06:32:01 skidder Exp $
# #
ROOT=.. ROOT=..
@ -49,7 +49,7 @@ export -n FIREBIRD
export -n INTERBASE export -n INTERBASE
.PHONY: install dist packages tarfile rpmfile .PHONY: install dist packages tarfile rpmfile
.PHONY: buildTarDir buildImageDir .PHONY: buildTarDir buildImageDir buildRoot buildDebugInfo
# Some of these targets are run from the root tree of the build. # Some of these targets are run from the root tree of the build.
# those need to know where the install subdirectory is kept. # those need to know where the install subdirectory is kept.
@ -130,8 +130,10 @@ $(DebugFile) : buildImageDir
# #
# 28-Dec-2003. Nickolay Samofatov # 28-Dec-2003. Nickolay Samofatov
buildImageDir: buildRoot:
(cd $(GEN_ROOT); ./install/makeInstallImage.sh) (cd $(GEN_ROOT); ./install/makeInstallImage.sh)
buildDebugInfo: buildRoot
mkdir -p $(GEN_ROOT)/$(DebugDir) mkdir -p $(GEN_ROOT)/$(DebugDir)
for x in `(cd $(GEN_ROOT)/buildroot; find)`; do \ for x in `(cd $(GEN_ROOT)/buildroot; find)`; do \
FIL=$(GEN_ROOT)/buildroot/$$x; \ FIL=$(GEN_ROOT)/buildroot/$$x; \
@ -154,11 +156,15 @@ buildImageDir:
fi; \ fi; \
done done
# Work around GDB 6.0 bug # Work around GDB 6.0 bug
mkdir -p $(GEN_ROOT)/$(DebugDir)/usr/lib/.debug mkdir -p $(GEN_ROOT)/$(DebugDir)@libdir@/.debug
for x in `ls $(GEN_ROOT)/$(DebugDir)@prefix@/lib/.debug`; do \ for x in `ls $(GEN_ROOT)/$(DebugDir)@prefix@/lib/.debug`; do \
ln -f -s @prefix@/lib/.debug/`basename $$x` $(GEN_ROOT)/$(DebugDir)/usr/lib/.debug; \ ln -f -s @prefix@/lib/.debug/`basename $$x` $(GEN_ROOT)/$(DebugDir)@libdir@/.debug; \
done done
# Use this line if you don't want to use separate debug info
#buildImageDir: buildRoot
buildImageDir: buildDebugInfo
buildTarDir: buildImageDir buildTarDir: buildImageDir
mkdir -p $(GEN_ROOT)/$(TarDir) mkdir -p $(GEN_ROOT)/$(TarDir)
@ -179,7 +185,7 @@ rpmfile: $(RPMFile)
$(RPMFile) : $(GEN_ROOT)/install/rpmscript buildImageDir $(RPMFile) : $(GEN_ROOT)/install/rpmscript buildImageDir
rpmbuild --define='_topdir @BUILD_ROOT_DIR@/gen/RPM' -bb $(GEN_ROOT)/install/rpmscript rpmbuild --define='_topdir @BUILD_ROOT_DIR@/gen/RPM' -bb $(GEN_ROOT)/install/rpmscript
# rpmbuild -bb --buildroot `pwd`/buildroot $(GEN_ROOT)/rpmscript # rpmbuild -bb --buildroot `pwd`/buildroot $(GEN_ROOT)/rpmscript
cp @BUILD_ROOT_DIR@/gen/RPM/RPMS/i686/$(RPMFile) $(GEN_ROOT) cp @BUILD_ROOT_DIR@/gen/RPM/RPMS/@CPU_TYPE@/$(RPMFile) $(GEN_ROOT)
.PHONY: $(GEN_ROOT)/install/rpmscript .PHONY: $(GEN_ROOT)/install/rpmscript

10
builds/install/arch-specific/linux/classic/makeInstallImage.sh.in
View File

@ -30,7 +30,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: makeInstallImage.sh.in,v 1.4 2003-10-28 17:58:10 skidder Exp $ # $Id: makeInstallImage.sh.in,v 1.5 2004-01-29 06:32:06 skidder Exp $
# #
# Script to copy install files from the build/transport area # Script to copy install files from the build/transport area
@ -99,7 +99,7 @@ copyFiles() {
# mkdir $TargetDir/var/adm/fillup-templates # mkdir $TargetDir/var/adm/fillup-templates
# mkdir -p $TargetDir/usr/sbin # mkdir -p $TargetDir/usr/sbin
mkdir -p $TargetDir/usr/lib mkdir -p $TargetDir@libdir@
mkdir -p $TargetDir/usr/include mkdir -p $TargetDir/usr/include
cp -f $BuiltFBDir/bin/fb_inet_server $DestDir/bin/fb_inet_server cp -f $BuiltFBDir/bin/fb_inet_server $DestDir/bin/fb_inet_server
@ -188,14 +188,14 @@ copyFiles() {
echo "#" >> $DestDir/aliases.conf echo "#" >> $DestDir/aliases.conf
# Create links from /usr/lib to install area. # Create links from @libdir@ to install area.
origDir=`pwd` origDir=`pwd`
cd $DestDir cd $DestDir
for i in lib/libfb*.so*; do ln -s ../../$FBRootDir/$i $origDir/$TargetDir/usr/$i; done for i in lib/libfb*.so*; do ln -s ../../$FBRootDir/$i $origDir/$TargetDir/usr/$i; done
cd $origDir cd $origDir
#ln -s ../../$FBRootDir/lib/libgds.a $TargetDir/usr/lib/libgds.a #ln -s ../../$FBRootDir/lib/libgds.a $TargetDir@libdir@/libgds.a
ln -s ../../$FBRootDir/lib/libib_util.so $TargetDir/usr/lib/libib_util.so ln -s ../../$FBRootDir/lib/libib_util.so $TargetDir@libdir@/libib_util.so

10
builds/install/arch-specific/linux/classic/postinstall.sh.in
View File

@ -31,7 +31,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: postinstall.sh.in,v 1.6 2003-10-31 16:42:48 skidder Exp $ # $Id: postinstall.sh.in,v 1.7 2004-01-29 06:32:06 skidder Exp $
# #
# The post install script for Firebird Classic # The post install script for Firebird Classic
@ -625,14 +625,14 @@ createLinksForBackCompatibility() {
# to ensure it loads the fb equivalent. Eventually these should be # to ensure it loads the fb equivalent. Eventually these should be
# optional and in a seperate rpm install. MOD 7-Nov-2002. # optional and in a seperate rpm install. MOD 7-Nov-2002.
if [ ! -e /usr/lib/libgds.so ] if [ ! -e @libdir@/libgds.so ]
then then
ln -s $FBRootDir/lib/libfbembed.so /usr/lib/libgds.so ln -s $FBRootDir/lib/libfbembed.so @libdir@/libgds.so
fi fi
if [ ! -e /usr/lib/libgds.so.0 ] if [ ! -e @libdir@/libgds.so.0 ]
then then
ln -s $FBRootDir/lib/libfbembed.so /usr/lib/libgds.so.0 ln -s $FBRootDir/lib/libfbembed.so @libdir@/libgds.so.0
fi fi

4
builds/install/arch-specific/linux/classic/preinstall.sh.in
View File

@ -31,7 +31,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: preinstall.sh.in,v 1.2 2003-10-28 17:58:10 skidder Exp $ # $Id: preinstall.sh.in,v 1.3 2004-01-29 06:32:06 skidder Exp $
# #
@ -211,7 +211,7 @@ archivePriorInstallSystemFilesX() {
echo "--- Warning ----------------------------------------------" echo "--- Warning ----------------------------------------------"
echo " The installation target directory: $FBRootDir" echo " The installation target directory: $FBRootDir"
echo " Already contains a prior installation of Firebird." echo " Already contains a prior installation of Firebird."
echo " This and files found in /usr/include and /usr/lib will be" echo " This and files found in /usr/include and @libdir@ will be"
echo " archived in the file : ${ArchiveMainFile}" echo " archived in the file : ${ArchiveMainFile}"
echo "" echo ""

8
builds/install/arch-specific/linux/super/makeInstallImage.sh.in
View File

@ -30,7 +30,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: makeInstallImage.sh.in,v 1.5 2003-10-27 18:00:44 alexpeshkoff Exp $ # $Id: makeInstallImage.sh.in,v 1.6 2004-01-29 06:32:09 skidder Exp $
# #
# Script to copy install files from the build/transport area # Script to copy install files from the build/transport area
@ -93,7 +93,7 @@ copyFiles() {
mkdir $DestDir/UDF mkdir $DestDir/UDF
mkdir $DestDir/misc mkdir $DestDir/misc
mkdir -p $TargetDir/usr/lib mkdir -p $TargetDir@libdir@
mkdir -p $TargetDir/usr/include mkdir -p $TargetDir/usr/include
# mkdir $TargetDir/var # mkdir $TargetDir/var
@ -173,12 +173,12 @@ copyFiles() {
echo "#" >> $DestDir/aliases.conf echo "#" >> $DestDir/aliases.conf
# Create links from /usr/lib to install area. # Create links from @libdir@ to install area.
origDir=`pwd` origDir=`pwd`
cd $DestDir cd $DestDir
for i in lib/libfb*.so*; do ln -s ../../$FBRootDir/$i $origDir/$TargetDir/usr/$i; done for i in lib/libfb*.so*; do ln -s ../../$FBRootDir/$i $origDir/$TargetDir/usr/$i; done
cd $origDir cd $origDir
ln -s ../../$FBRootDir/lib/libib_util.so $TargetDir/usr/lib/libib_util.so ln -s ../../$FBRootDir/lib/libib_util.so $TargetDir@libdir@/libib_util.so
# link include files to /usr/include # link include files to /usr/include

2
builds/install/arch-specific/linux/super/preinstall.sh.in
View File

@ -137,7 +137,7 @@ archivePriorInstallSystemFiles() {
echo "--- Warning ----------------------------------------------" echo "--- Warning ----------------------------------------------"
echo " The installation target directory: $IBRootDir" echo " The installation target directory: $IBRootDir"
echo " Already contains a prior installation of InterBase/Firebird." echo " Already contains a prior installation of InterBase/Firebird."
echo " This and files found in /usr/include and /usr/lib will be" echo " This and files found in /usr/include and @libdir@ will be"
echo " archived in the file : ${ArchiveMainFile}" echo " archived in the file : ${ArchiveMainFile}"
echo "" echo ""

8
builds/install/arch-specific/linux/super/rpmfiles.txt.in
View File

@ -1,9 +1,9 @@
@prefix@ @prefix@
/usr/lib/libfbclient.so.1.5.0 @libdir@/libfbclient.so.2.0.0
/usr/lib/libfbclient.so.1 @libdir@/libfbclient.so.1
/usr/lib/libfbclient.so @libdir@/libfbclient.so
/usr/lib/libib_util.so @libdir@/libib_util.so
/usr/include/gds.h /usr/include/gds.h
/usr/include/ibase.h /usr/include/ibase.h

8
configure.in
View File

@ -1,4 +1,4 @@
dnl $Id: configure.in,v 1.190 2004-01-12 04:58:09 skidder Exp $ dnl $Id: configure.in,v 1.191 2004-01-29 06:31:49 skidder Exp $
dnl ############################# INITIALISATION ############################### dnl ############################# INITIALISATION ###############################
@ -30,6 +30,10 @@ dnl SHRLIB_EXT : suffix of shared library files
RAW_DEVICES_FLG=Y RAW_DEVICES_FLG=Y
INSTALL_PREFIX="" INSTALL_PREFIX=""
dnl Use /usr/lib for library links on most platforms except some 64-bit ones
libdir=/usr/lib
case "$target" in case "$target" in
*-*-darwin*) *-*-darwin*)
MAKEFILE_PREFIX=darwin MAKEFILE_PREFIX=darwin
@ -57,6 +61,8 @@ case "$target" in
LOCK_MANAGER_FLG=Y LOCK_MANAGER_FLG=Y
EDITLINE_FLG=Y EDITLINE_FLG=Y
SHRLIB_EXT=so SHRLIB_EXT=so
libdir=/usr/lib64
CPU_TYPE=amd64
;; ;;
sparc*-*-linux-*) sparc*-*-linux-*)