2006-02-15 13:50 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/source/vm/hvm.c
    ! fixed memory leak I introduced changing Ryszard modifications

  * harbour/ChangeLog
  + harbour/ChangeLog.015
    * new ChangeLog file created

  * harbour/harbour.spec
  * harbour/bin/hb-func.sh
    * some modification in xhb* scripts building - adding passing
      predefined compiler and linker switches

harbour/bin/hb-func.sh

@@ -284,8 +284,10 @@ HB_MAIN_FUNC=\`echo \${HB_MAIN_FUNC}|tr '[a-z]' '[A-Z]'\`
 
 HB_PATHS="-I\${HB_INC_INSTALL}"
 GCC_PATHS="\${HB_PATHS} -L\${HB_LIB_INSTALL}"
-LINK_OPT="${CC_L_USR}"
-CC_OPT=""
+
+LN_OPT="${CC_L_USR}"
+CC_OPT="${CC_C_USR}"
+HB_OPT="${CC_PRG_USR}"
 
 HB_GPM_LIB=""
 if [ -f "\${HB_LIB_INSTALL}/libgtsln.a" ]; then
@@ -312,13 +314,16 @@ fi
 if [ "\${HB_STATIC}" = "full" ]; then
     SYSTEM_LIBS="\${SYSTEM_LIBS} -ldl"
     if [ "\${HB_ARCHITECTURE}" = "linux" ]; then
-       SYSTEM_LIBS="\${SYSTEM_LIBS} -lpthread"
+        SYSTEM_LIBS="\${SYSTEM_LIBS} -lpthread"
     fi
-    LINK_OPT="\${LINK_OPT} -static"
+    LN_OPT="\${LN_OPT} -static"
     HB_STATIC="yes"
 fi
-if [ "\${HB_XBGTK}" = "yes" ] || [ "\${HB_HWGUI}" = "yes" ]; then
+
+if [ "\${HB_XBGTK}" = "yes" ]; then
     SYSTEM_LIBS="\${SYSTEM_LIBS} \`pkg-config --libs gtk+-2.0\`"
+elif [ "\${HB_HWGUI}" = "yes" ]; then
+    SYSTEM_LIBS="\${SYSTEM_LIBS} \`pkg-config --libs gtk+-2.0 --libs libgnomeprint-2.2\`"
 fi
 
 HB_LNK_REQ=""
@@ -345,7 +350,7 @@ else
     if [ "\${HB_ARCHITECTURE}" = "darwin" ]; then
         pref="lib"
         ext=".dylib"
-        LINK_OPT="-bind_at_load -multiply_defined suppress"
+        LN_OPT="\${LN_OPT} -bind_at_load -multiply_defined suppress"
     elif [ "\${HB_ARCHITECTURE}" = "w32" ]; then
         pref=""
         ext=".dll"
@@ -387,12 +392,9 @@ if [ -f "\${HB_LIB_INSTALL}/lib\${l}.a" ]; then
 fi
 
 if [ "\${HB_ARCHITECTURE}" = "darwin" ]; then
-    CC_OPT="-no-cpp-precomp -Wno-long-double"
+    CC_OPT="\${CC_OPT} -no-cpp-precomp -Wno-long-double"
 elif [ "\${HB_ARCHITECTURE}" = "sunos" ]; then
     HB_STRIP="no"
-elif [ "\${HB_ARCHITECTURE}" = "w32" ]; then
-    CC_OPT="$CC_C_USR"
-    HB_OPT="$CC_PRG_USR"
 fi
 
 FOUTC="\${DIROUT}/\${FILEOUT%.*}.c"
@@ -423,9 +425,9 @@ hb_link()
     fi
     if [ -n "\${HB_LNK_REQ}" ] || [ -n "\${HB_GT_REQ}" ] || [ -n "\${HB_MAIN_FUNC}" ]; then
         hb_lnk_request > \${_TMP_FILE_} && \\
-        hb_cc "\$@" "\${_TMP_FILE_}" \${LINK_OPT} \${GCC_PATHS} \${HARBOUR_LIBS} \${HB_USRLIBS} \${SYSTEM_LIBS} -o "\${FOUTE}"
+        hb_cc "\$@" "\${_TMP_FILE_}" \${LN_OPT} \${GCC_PATHS} \${HARBOUR_LIBS} \${HB_USRLIBS} \${SYSTEM_LIBS} -o "\${FOUTE}"
     else
-        hb_cc "\$@" \${LINK_OPT} \${GCC_PATHS} \${HARBOUR_LIBS} \${HB_USRLIBS} \${SYSTEM_LIBS} -o "\${FOUTE}"
+        hb_cc "\$@" \${LN_OPT} \${GCC_PATHS} \${HARBOUR_LIBS} \${HB_USRLIBS} \${SYSTEM_LIBS} -o "\${FOUTE}"
     fi
 }
 

harbour/harbour.spec

@@ -59,7 +59,7 @@
 %define hb_arch  export HB_ARCHITECTURE=linux
 %define hb_cc    export HB_COMPILER=gcc
 %define hb_cflag export C_USR="-DHB_FM_STATISTICS_OFF -O3"
-%define hb_lflag export L_USR=%{?_with_static:-static}
+%define hb_lflag export L_USR="${CC_L_USR} %{?_with_static:-static}"
 %define hb_mt    export HB_MT=no
 %define hb_gt    export HB_GT_LIB=gtcrs
 %define hb_gpm   export HB_GPM_MOUSE=%{!?_without_gpm:yes}
@@ -350,7 +350,7 @@ popd
 if [ "%{!?_with_static:1}" ]
 then
     unset HB_GTALLEG
-    export L_USR="-L${HB_LIB_INSTALL} -l%{name} -lncurses %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11}"
+    export L_USR="${CC_L_USR} -L${HB_LIB_INSTALL} -l%{name} -lncurses %{!?_without_gtsln:-lslang} %{!?_without_gpm:-lgpm} %{!?_without_x11:-L/usr/X11R6/%{_lib} -lX11}"
 
     for utl in hbmake hbrun hbpp hbdoc
     do

harbour/source/vm/hvm.c

@@ -2166,7 +2166,7 @@ static void hb_vmPlus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pIte
    }
    while( --iPopCnt >= 0 )
    {
-      hb_stackDec();
+      hb_stackPop();
    }
 }
 
@@ -2243,7 +2243,7 @@ static void hb_vmMinus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pIt
    }
    while( --iPopCnt >= 0 )
    {
-      hb_stackDec();
+      hb_stackPop();
    }
 }