fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-09-17 17:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* bin/hb-mkslib.sh
  * make_gcc.sh
  * make_gnu.sh
  * make_tgz.sh
  * make_xmingw.sh
  * make_xmingwce.sh
  * contrib/make_gcc_all.sh
  * contrib/mtpl_gcc.sh
    - Removed unnecessary explicit SunOS detection.
    - Removed unnecessary explicit Darwin detection (to be tested).

  * contrib/make_gcc_all.sh
    ! Fixed 'cyg' platform in contrib make files.

  * make_tgz.sh
    ! Fixed .tgz generation for SunOS. Thanks Przemek.
      I simply copied the Linux method here, I'm not sure 64-bit 
      code would apply here, too.
    ! Fix for SunOS to link against curses instead of ncurses lib.
      Someone pls verify me.
    ; TOFIX: make_tgz.sh in OpenSolaris still has these errors:
             ld: fatal: relocations remain against allocatable but non-writable sections.
             ld: fatal: library -lharbour: not found
This commit is contained in:
Viktor Szakats
2008-09-17 15:54:07 +00:00
parent f182ba5a3f
commit fd15782dd8
9 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
harbour/ChangeLog
View File

@@ -8,6 +8,31 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-09-17 17:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* bin/hb-mkslib.sh
* make_gcc.sh
* make_gnu.sh
* make_tgz.sh
* make_xmingw.sh
* make_xmingwce.sh
* contrib/make_gcc_all.sh
* contrib/mtpl_gcc.sh
- Removed unnecessary explicit SunOS detection.
- Removed unnecessary explicit Darwin detection (to be tested).
* contrib/make_gcc_all.sh
! Fixed 'cyg' platform in contrib make files.
* make_tgz.sh
! Fixed .tgz generation for SunOS. Thanks Przemek.
I simply copied the Linux method here, I'm not sure 64-bit
code would apply here, too.
! Fix for SunOS to link against curses instead of ncurses lib.
Someone pls verify me.
; TOFIX: make_tgz.sh in OpenSolaris still has these errors:
ld: fatal: relocations remain against allocatable but non-writable sections.
ld: fatal: library -lharbour: not found
2008-09-17 14:04 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* bin/hb-mkslib.sh
* make_xmingwce.sh
@@ -17,7 +42,7 @@
* make_tgz.sh
+ Added SunOS platform detection as an attempt to make
make_tgz.sh work on OpenSolaris.
; NOFIX: Still, when trying to use make_tgz.sh in OpenSolaris,
; TOFIX: Still, when trying to use make_tgz.sh in OpenSolaris,
I'm getting these errors:
---
ld: fatal: library -lharbour: not found

2
harbour/bin/hb-mkslib.sh
View File

@@ -29,8 +29,6 @@ case "$hb_arch" in
*os/2*) hb_arch="os2" ;;
*dos) hb_arch="dos" ;;
*bsd) hb_arch="bsd" ;;
*darwin) hb_arch="darwin" ;;
*SunOS) hb_arch="sunos" ;;
esac
case "$hb_arch" in

16
harbour/contrib/make_gcc_all.sh
View File

@@ -16,11 +16,10 @@ if [ -z "$HB_ARCHITECTURE" ]; then
else
hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null`
case "$hb_arch" in
*windows*|*mingw32*|msys*) hb_arch="w32" ;;
*cygwin*) hb_arch="cyg" ;;
*dos) hb_arch="dos" ;;
*bsd) hb_arch="bsd" ;;
*darwin) hb_arch="darwin" ;;
*windows*|*mingw32*|msys*) hb_arch="w32" ;;
*cygwin*) hb_arch="cyg" ;;
*dos) hb_arch="dos" ;;
*bsd) hb_arch="bsd" ;;
esac
fi
export HB_ARCHITECTURE="$hb_arch" _HB_ARCH_SAVED=1
@@ -49,6 +48,13 @@ case "$HB_ARCHITECTURE" in
_HB_DIRS_ADD=;;
esac
# Revert Cygwin architecture to w32.
# After all it's under Windows OS.
#if [ "$HB_ARCHITECTURE" == "cyg" ]
#then
# export HB_ARCHITECTURE=w32
#fi
if [ "${HB_INC_ALLEGRO}" != "" ]; then _HB_DIRS="${_HB_DIRS} gtalleg"; fi;
if [ "${HB_INC_APOLLO}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbapollo"; fi;
if [ "${HB_INC_CURL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbcurl "; fi;

8
harbour/contrib/mtpl_gcc.sh
View File

@@ -30,11 +30,9 @@ if [ -z "$HB_ARCHITECTURE" ]; then
else
hb_arch=`uname -s | tr -d "[-]" | tr '[A-Z]' '[a-z]' 2>/dev/null`
case "$hb_arch" in
*windows*|*mingw32*|msys*) hb_arch="w32" ;;
*cygwin*) hb_arch="cyg" ;;
*dos) hb_arch="dos" ;;
*bsd) hb_arch="bsd" ;;
*darwin) hb_arch="darwin" ;;
*windows*|*mingw32*|msys*) hb_arch="w32" ;;
*dos) hb_arch="dos" ;;
*bsd) hb_arch="bsd" ;;
esac
fi
export HB_ARCHITECTURE="$hb_arch" _HB_ARCH_SAVED=1

2
harbour/make_gcc.sh
View File

@@ -19,8 +19,6 @@ if [ -z "$HB_ARCHITECTURE" ]; then
*os/2*) hb_arch="os2" ;;
*dos) hb_arch="dos" ;;
*bsd) hb_arch="bsd" ;;
*darwin) hb_arch="darwin" ;;
*SunOS) hb_arch="sunos" ;;
esac
fi
export HB_ARCHITECTURE="$hb_arch"

2
harbour/make_gnu.sh
View File

@@ -25,8 +25,6 @@ if [ -z "$HB_ARCHITECTURE" ]; then
*os/2*) hb_arch="os2" ;;
*dos) hb_arch="dos" ;;
*bsd) hb_arch="bsd" ;;
*darwin) hb_arch="darwin" ;;
*SunOS) hb_arch="sunos" ;;
esac
fi
export HB_ARCHITECTURE="$hb_arch"

8
harbour/make_tgz.sh
View File

@@ -46,8 +46,6 @@ if [ -z "$HB_ARCHITECTURE" ]; then
*os/2*) hb_arch="os2" ;;
*dos) hb_arch="dos" ;;
*bsd) hb_arch="bsd" ;;
*darwin) hb_arch="darwin" ;;
*SunOS) hb_arch="sunos" ;;
esac
fi
export HB_ARCHITECTURE="$hb_arch"
@@ -109,6 +107,11 @@ case "$HB_ARCHITECTURE" in
[ -d "$HB_INSTALL_PREFIX/lib64" ] && [ "${HB_ARCH64}" = yes ] && HB_LIBDIRNAME="lib64"
HB_INSTALL_GROUP=root
;;
sunos)
[ -z "$HB_INSTALL_PREFIX" ] && HB_INSTALL_PREFIX="/usr"
[ -d "$HB_INSTALL_PREFIX/lib64" ] && [ "${HB_ARCH64}" = yes ] && HB_LIBDIRNAME="lib64"
HB_INSTALL_GROUP=root
;;
w32)
[ -z "$HB_INSTALL_PREFIX" ] && HB_INSTALL_PREFIX="/usr/local"
HB_INSTALL_GROUP=0
@@ -270,6 +273,7 @@ then
case $HB_ARCHITECTURE in
darwin) ADD_LIBS="$ADD_LIBS -lncurses -L/opt/local/lib -L/sw/lib" ;;
dos|w32) ADD_LIBS="" ;;
sunos) ADD_LIBS="$ADD_LIBS -lcurses" ;;
*) ADD_LIBS="$ADD_LIBS -lncurses" ;;
esac
[ "${HB_GPM_MOUSE}" = yes ] && ADD_LIBS="$ADD_LIBS -lgpm"

2
harbour/make_xmingw.sh
View File

@@ -30,8 +30,6 @@ else
*windows*|*mingw32*|msys*) HB_HOST_ARCH="w32"; HB_HOST_CC="mingw" ;;
*dos) HB_HOST_ARCH="dos" ;;
*bsd) HB_HOST_ARCH="bsd" ;;
*darwin) HB_HOST_ARCH="darwin" ;;
*SunOS) HB_HOST_ARCH="sunos" ;;
esac
fi

2
harbour/make_xmingwce.sh
View File

@@ -30,8 +30,6 @@ else
*windows*|*mingw32*|msys*) HB_HOST_ARCH="w32"; HB_HOST_CC="mingw" ;;
*dos) HB_HOST_ARCH="dos" ;;
*bsd) HB_HOST_ARCH="bsd" ;;
*darwin) HB_HOST_ARCH="darwin" ;;
*SunOS) HB_HOST_ARCH="sunos" ;;
esac
fi