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

2012-11-12 15:15 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* harbour/include/hbexpra.c
    * indenting

  * harbour/package/harbour.spec
    ! fixed ssl library detection

  * harbour/contrib/hbnetio/netiosrv.c
    ! fixed parameters numbers in NETIO_COMPRESS()

  * harbour/config/linux/libs.mk
  * harbour/config/bin.mk
    ! use pthread in linked library list if shared linking is enabled
    ! do not strip system libraries in shared mode - some systems
      (i.e. RH7.3) needs pthread to be given at link time to create
      correct MT programs and now harbour shared library is only in MT.
This commit is contained in:
Przemyslaw Czerpak
2012-11-12 14:15:42 +00:00
parent e80dff8be7
commit 767d9dfa1d
6 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog
View File

@@ -16,6 +16,23 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-11-12 15:15 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/include/hbexpra.c
* indenting
* harbour/package/harbour.spec
! fixed ssl library detection
* harbour/contrib/hbnetio/netiosrv.c
! fixed parameters numbers in NETIO_COMPRESS()
* harbour/config/linux/libs.mk
* harbour/config/bin.mk
! use pthread in linked library list if shared linking is enabled
! do not strip system libraries in shared mode - some systems
(i.e. RH7.3) needs pthread to be given at link time to create
correct MT programs and now harbour shared library is only in MT.
2012-11-12 15:02 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbi18n/hbi18n.prg
+ converted UI strings to translatable ones

7
harbour/config/bin.mk
View File

@@ -121,13 +121,6 @@ ifneq ($(__HB_BUILD_NOSYSLIB),)
SYSLIBS := $(filter-out $(__HB_BUILD_NOSYSLIB),$(SYSLIBS))
endif
ifneq ($(HB_PLATFORM_UNIX),)
ifeq ($(BUILD_SHARED),yes)
SYSLIBS :=
SYSLIBPATHS :=
endif
endif
LIBS := $(HB_USER_LIBS) $(LIBS)
include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk

4
harbour/config/linux/libs.mk
View File

@@ -38,6 +38,10 @@ ifneq ($(HB_LINKING_RTL),)
ifneq ($(HB_LINKING_VMMT),)
SYSLIBS += pthread
endif
else
ifeq ($(BUILD_SHARED),yes)
SYSLIBS += pthread
endif
endif
SYSLIBS += m

8
harbour/contrib/hbnetio/netiosrv.c
View File

@@ -664,13 +664,13 @@ HB_FUNC( NETIO_COMPRESS )
if( conn && conn->sd != HB_NO_SOCKET && ! conn->stop )
{
int iLevel, iStrategy, keylen = ( int ) hb_parclen( 3 );
int iLevel, iStrategy, keylen = ( int ) hb_parclen( 2 );
if( keylen > NETIO_PASSWD_MAX )
keylen = NETIO_PASSWD_MAX;
iLevel = hb_parnidef( 4, keylen ? HB_ZLIB_COMPRESSION_DEFAULT :
iLevel = hb_parnidef( 3, keylen ? HB_ZLIB_COMPRESSION_DEFAULT :
HB_ZLIB_COMPRESSION_DISABLE );
iStrategy = hb_parnidef( 5, HB_ZLIB_STRATEGY_DEFAULT );
iStrategy = hb_parnidef( 4, HB_ZLIB_STRATEGY_DEFAULT );
if( iLevel == HB_ZLIB_COMPRESSION_DISABLE )
{
@@ -688,8 +688,6 @@ HB_FUNC( NETIO_COMPRESS )
if( conn->zstream )
hb_znetClose( conn->zstream );
conn->zstream = zstream;
if( keylen > NETIO_PASSWD_MAX )
keylen = NETIO_PASSWD_MAX;
if( keylen )
hb_znetEncryptKey( zstream, hb_parc( 2 ), keylen );
}

2
harbour/include/hbexpra.c
View File

@@ -399,7 +399,7 @@ HB_EXPR_PTR hb_compExprNewFunCall( HB_EXPR_PTR pName, HB_EXPR_PTR pParms, HB_COM
*/
if( pArg->pNext == NULL )
{
/* no second argument */
/* no second argument */
const char *szText = pFirst->value.asMacro.szMacro;
pArg->pNext = hb_compExprNewString( szText, strlen( szText ), HB_FALSE, HB_COMP_PARAM );
pArg->pNext->pNext = pNext;

4
harbour/package/harbour.spec
View File

@@ -521,8 +521,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{name}/librddsql.a
%{_libdir}/%{name}/libsddsqlt3.a
%{_libdir}/%{name}/libhbsms.a
%([ -f %{_libdir}/%{name}/libhbssl.a ] && echo %{_libdir}/%{name}/libhbssl.a)
%([ -f %{_libdir}/%{name}/libhbhttpds.a ] && echo %{_libdir}/%{name}/libhbhttpds.a)
%([ -f %{buildroot}%{_libdir}/%{name}/libhbssl.a ] && echo %{_libdir}/%{name}/libhbssl.a)
%([ -f %{buildroot}%{_libdir}/%{name}/libhbhttpds.a ] && echo %{_libdir}/%{name}/libhbhttpds.a)
%{?_with_ads:%files ads}
%{?_with_ads:%defattr(644,root,root,755)}