diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 15189b9e4f..7cf16dcef7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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 diff --git a/harbour/config/bin.mk b/harbour/config/bin.mk index e95922f7d8..9efdc18381 100644 --- a/harbour/config/bin.mk +++ b/harbour/config/bin.mk @@ -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 diff --git a/harbour/config/linux/libs.mk b/harbour/config/linux/libs.mk index 1eed434094..ffb758d1ed 100644 --- a/harbour/config/linux/libs.mk +++ b/harbour/config/linux/libs.mk @@ -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 diff --git a/harbour/contrib/hbnetio/netiosrv.c b/harbour/contrib/hbnetio/netiosrv.c index 3dba2010e1..d8869991f3 100644 --- a/harbour/contrib/hbnetio/netiosrv.c +++ b/harbour/contrib/hbnetio/netiosrv.c @@ -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 ); } diff --git a/harbour/include/hbexpra.c b/harbour/include/hbexpra.c index 779175dcb0..8ed8bcc554 100644 --- a/harbour/include/hbexpra.c +++ b/harbour/include/hbexpra.c @@ -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; diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec index e574e69d7f..4e4b30b544 100644 --- a/harbour/package/harbour.spec +++ b/harbour/package/harbour.spec @@ -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)}