diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 41f675683e..a5a9fa3b5d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,26 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-26 14:50 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/bin/hb-mkslib.sh + * harbour/bin/postinst.sh + * set predefined CCPREFIX in cross build hb*-mkslib + + * harbour/make_xmingw.sh + ! fixed BSD build cross build - problem noticed by Phil Krylov + in xHarbour + + * harbour/source/rdd/dbffpt/dbffpt1.c + * casting + + * harbour/config/darwin/gcc.cf + * harbour/config/hpux/gcc.cf + * harbour/config/linux/gcc.cf + * harbour/config/sunos/gcc.cf + * harbour/config/bsd/gcc.cf + * added support for HB_CRS_LIB envvar which allow to overload platform + default [n]curses library name + 2007-11-26 14:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/what32/wintabs.prg * contrib/what32/wintbar.prg diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh index a7bc861273..f862dc4f9b 100755 --- a/harbour/bin/hb-mkslib.sh +++ b/harbour/bin/hb-mkslib.sh @@ -13,6 +13,7 @@ # --------------------------------------------------------------- # HB_ARCHITECTURE="" +# CCPREFIX="" if [ -n "${HB_ARCHITECTURE}" ] then diff --git a/harbour/bin/postinst.sh b/harbour/bin/postinst.sh index 9f5850a26e..1dd7e98a3b 100755 --- a/harbour/bin/postinst.sh +++ b/harbour/bin/postinst.sh @@ -55,6 +55,7 @@ then hb_mkslib="${HB_BIN_INSTALL}/${HB_TOOLS_PREF}-mkslib" rm -f "${hb_mkslib}" sed -e "s/^# HB_ARCHITECTURE=\"\"\$/HB_ARCHITECTURE=\"${HB_ARCHITECTURE}\"/g" \ + -e "s/^# CCPREFIX=\"\"\$/[ -n \"\${CCPREFIX}\" ] || CCPREFIX=\"${CCPREFIX}\"/g" \ "${hb_root}/bin/hb-mkslib.sh" > "${hb_mkslib}" && \ chmod 755 "${hb_mkslib}" elif [ "${HB_ARCHITECTURE}" = "sunos" ]; then diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index e73a1efa8c..b1b8f7540e 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -44,15 +44,19 @@ LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_A LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) # screen driver libraries +ifeq ($(HB_CRS_LIB),) +HB_CRS_LIB=ncurses +endif + ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) -LINKLIBS += -lncurses +LINKLIBS += -l$(HB_CRS_LIB) endif ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) LINKLIBS += -lslang # In BSD, slang still needs curses :( ifeq ($(findstring gtcrs, $(HB_GT_LIBS)),) -LINKLIBS += -lncurses +LINKLIBS += -l$(HB_CRS_LIB) endif endif diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf index e91f38aae6..547dbf32e2 100644 --- a/harbour/config/darwin/gcc.cf +++ b/harbour/config/darwin/gcc.cf @@ -58,15 +58,19 @@ LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_A LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl # screen driver libraries +ifeq ($(HB_CRS_LIB),) +HB_CRS_LIB=ncurses +endif + ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) -LINKLIBS += -lncurses +LINKLIBS += -l$(HB_CRS_LIB) endif ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) LINKLIBS += -lslang # In BSD, slang still needs curses :( ifeq ($(findstring gtcrs, $(HB_GT_LIBS)),) -LINKLIBS += -lncurses +LINKLIBS += -l$(HB_CRS_LIB) endif endif diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf index 188641ed29..a26a32ce20 100644 --- a/harbour/config/hpux/gcc.cf +++ b/harbour/config/hpux/gcc.cf @@ -47,8 +47,11 @@ LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_A LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl # screen driver libraries +ifeq ($(HB_CRS_LIB),) +HB_CRS_LIB=ncurses +endif ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) -LINKLIBS += -lncurses +LINKLIBS += -l$(HB_CRS_LIB) endif ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) LINKLIBS += -lslang diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index 3d2aa14882..7f789e7476 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -58,8 +58,11 @@ LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_A LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) # screen driver libraries +ifeq ($(HB_CRS_LIB),) +HB_CRS_LIB=ncurses +endif ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) -LINKLIBS += -lncurses +LINKLIBS += -l$(HB_CRS_LIB) endif ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) LINKLIBS += -lslang diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf index dc7bc53735..f38b017062 100644 --- a/harbour/config/sunos/gcc.cf +++ b/harbour/config/sunos/gcc.cf @@ -47,8 +47,11 @@ LINKPATHS += $(foreach gt, $(HB_GT_LIBS), -L$(TOP)$(ROOT)source/rtl/$(gt)/$(HB_A LINKLIBS += $(foreach gt, $(HB_GT_LIBS), -l$(gt)) -lrtl # screen driver libraries +ifeq ($(HB_CRS_LIB),) +HB_CRS_LIB=curses +endif ifneq ($(findstring gtcrs, $(HB_GT_LIBS)),) -LINKLIBS += -lcurses +LINKLIBS += -l$(HB_CRS_LIB) endif ifneq ($(findstring gtsln, $(HB_GT_LIBS)),) LINKLIBS += -lslang diff --git a/harbour/make_xmingw.sh b/harbour/make_xmingw.sh index 3885ae53fb..ceb8f70b39 100755 --- a/harbour/make_xmingw.sh +++ b/harbour/make_xmingw.sh @@ -37,6 +37,7 @@ elif [ "$UNAME" = "FreeBSD" ]; then MINGW_PREFIX=/usr/local/mingw32 TARGET="." CCPREFIX="" + UNAMEL=bsd elif find /usr/local/bin -name "i[3456]86-mingw*-gcc" -maxdepth 1 &>/dev/null; then MINGW_PREFIX=/usr/local TARGET=`find /usr/local/bin -name "i[3456]86-mingw*-gcc" -maxdepth 1|sed -e '1 !d' -e 's/.*\(i[3456]86-mingw[^-]*\).*/\1/g'` diff --git a/harbour/source/rdd/dbffpt/dbffpt1.c b/harbour/source/rdd/dbffpt/dbffpt1.c index b32a557aff..fa45efe79f 100644 --- a/harbour/source/rdd/dbffpt/dbffpt1.c +++ b/harbour/source/rdd/dbffpt/dbffpt1.c @@ -2417,8 +2417,8 @@ static ERRCODE hb_fptCopyToFile( FHANDLE hSrc, FHANDLE hDst, HB_FOFFSET size ) do { - ulRead = hb_fsReadLarge( hSrc, pBuffer, - ( ULONG ) HB_MIN( ulBufSize, size - written ) ); + ulRead = hb_fsReadLarge( hSrc, pBuffer, ( ULONG ) + HB_MIN( ( HB_FOFFSET ) ulBufSize, size - written ) ); if( ulRead <= 0 ) errCode = EDBF_READ; else if( hb_fsWriteLarge( hDst, pBuffer, ulRead ) != ulRead )