2011-02-09 13:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbmxml/3rd/minixml/mxml.hbp * contrib/3rd/sqlite3/sqlite3.hbp * contrib/hbmzip/3rd/minizip/minizip.hbp * contrib/hblzf/3rd/liblzf/lzf.hbp * contrib/hbxdiff/3rd/libxdiff/xdiff.hbp * contrib/hbexpat/3rd/expat/expat.hbp * contrib/hbbz2/3rd/bz2/bz2.hbp * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp ! Do not create dynamic version of 3rd party dependencies hosted locally. It should fix some problems on *nix builds with HB_BUILD_CONTRIB_DYN=yes. * contrib/hbrun/hbrun.hbp + -o option. * utils/hbmk2/hbmk2.prg + Added dynlib dir + prefix to --hbinfo output.
2011-02-09 12:47:35 +00:00
parent 38dba3eec7
commit c05dd197d9
11 changed files with 89 additions and 53 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,10 +16,29 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2011-02-09 13:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbmxml/3rd/minixml/mxml.hbp
+  * contrib/3rd/sqlite3/sqlite3.hbp
+  * contrib/hbmzip/3rd/minizip/minizip.hbp
+  * contrib/hblzf/3rd/liblzf/lzf.hbp
+  * contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
+  * contrib/hbexpat/3rd/expat/expat.hbp
+  * contrib/hbbz2/3rd/bz2/bz2.hbp
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+    ! Do not create dynamic version of 3rd party dependencies hosted
+      locally. It should fix some problems on *nix builds with
+      HB_BUILD_CONTRIB_DYN=yes.
+
+  * contrib/hbrun/hbrun.hbp
+    + -o option.
+
+  * utils/hbmk2/hbmk2.prg
+    + Added dynlib dir + prefix to --hbinfo output.
+
 2011-02-09 03:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
  * utils/hbmk2/hbmk2.prg
    + REQUESTed some functions needed by postinst.hbs.
-    + Added .hbs/.hrb capbility to help notes.
+    + Added .hbs/.hrb capability to help notes.

 2011-02-09 02:27 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
  * contrib/hbplist
--- a/harbour/contrib/3rd/sqlite3/sqlite3.hbp
+++ b/harbour/contrib/3rd/sqlite3/sqlite3.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #

+-stop{hbdyn}
+
 -stop{poccarm}
 # NOTE: old msvcarm can't cope with some PP directives. [vszakats]
 -stop{msvcarm&HB_COMP_VER!='1200'&HB_COMP_VER!='1300'&HB_COMP_VER!='1310')}
--- a/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp
+++ b/harbour/contrib/hbbz2/3rd/bz2/bz2.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #

+-stop{hbdyn}
+
 -stop{wce|pocc64}

 -hblib
--- a/harbour/contrib/hbexpat/3rd/expat/expat.hbp
+++ b/harbour/contrib/hbexpat/3rd/expat/expat.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #

+-stop{hbdyn}
+
 -hblib
 -inc

--- a/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+++ b/harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #

+-stop{hbdyn}
+
 # pocc64 version 6.0 is OK, version 5.0 is not (->internal error).
 -stop{pocc64|(wce&!mingwarm)}

--- a/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp
+++ b/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #

+-stop{hbdyn}
+
 -hblib
 -inc

--- a/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp
+++ b/harbour/contrib/hbmxml/3rd/minixml/mxml.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #

+-stop{hbdyn}
+
 -hblib
 -inc

@@ -13,20 +15,20 @@
 {win}-cflag=-DWIN32 -DWIN
 {win|dos|os2}-cflag=-D_EOL_CRLF

-mxml_att.c     
-mxml_ent.c     
-mxml_fil.c     
-mxml_get.c     
-mxml_ind.c     
-mxml_nod.c     
-mxml_pri.c     
-mxml_sea.c     
-mxml_set.c     
-mxml_str.c     
+mxml_att.c
+mxml_ent.c
+mxml_fil.c
+mxml_get.c
+mxml_ind.c
+mxml_nod.c
+mxml_pri.c
+mxml_sea.c
+mxml_set.c
+mxml_str.c

 # ORIGIN http://www.minixml.org
 # VER    2.7
-# URL    
+# URL
 # DIFF   minixml.dif
 #
 # MAP    COPYING
@@ -41,5 +43,5 @@ mxml_str.c
 # MAP    mxml-search.c   mxml_sea.c
 # MAP    mxml-set.c      mxml_set.c
 # MAP    mxml-string.c   mxml_str.c
-# MAP    mxml.h          mxml.h    
+# MAP    mxml.h          mxml.h
 # MAP    mxml-private.h  mxml_pri.h
--- a/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp
+++ b/harbour/contrib/hbmzip/3rd/minizip/minizip.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #

+-stop{hbdyn}
+
 -hblib
 -inc

--- a/harbour/contrib/hbrun/hbrun.hbp
+++ b/harbour/contrib/hbrun/hbrun.hbp
@@ -5,6 +5,8 @@
 -w3 -es2 -l
 -kmo

+-o${hb_name}
+
 -DHBRUN_WITH_HEADERS

 -ldflag={allmsvc}-nxcompat
--- a/harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
+++ b/harbour/contrib/hbxdiff/3rd/libxdiff/xdiff.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #

-#-stop
+-stop{hbdyn}

 -hblib
 -inc
@@ -15,18 +15,18 @@
 -cflag=-DHAVE_HBCONFIG_H

 xadler32.c
-xalloc.c  
-xbdiff.c  
+xalloc.c
+xbdiff.c
 xbpatchi.c
-xdiffi.c  
-xemit.c   
-xmerge3.c 
+xdiffi.c
+xemit.c
+xmerge3.c
 xmissing.c
-xpatchi.c 
+xpatchi.c
 xprepare.c
 xrabdiff.c
-xrabply.c 
-xutils.c  
+xrabply.c
+xutils.c
 xversion.c

 # ORIGIN http://www.xmailserver.org/xdiff-lib.html
@@ -38,28 +38,28 @@ xversion.c
 # MAP    COPYING
 # MAP    winconfig.h
 # MAP    man/xdiff.txt       xdiff.txt
-# MAP    xdiff/xadler32.c    xadler32.c    
-# MAP    xdiff/xadler32.h    xadler32.h    
-# MAP    xdiff/xalloc.c      xalloc.c      
-# MAP    xdiff/xbdiff.c      xbdiff.c      
-# MAP    xdiff/xbdiff.h      xbdiff.h      
-# MAP    xdiff/xbpatchi.c    xbpatchi.c    
-# MAP    xdiff/xdiff.h       xdiff.h       
-# MAP    xdiff/xdiffi.c      xdiffi.c      
-# MAP    xdiff/xdiffi.h      xdiffi.h      
-# MAP    xdiff/xemit.c       xemit.c       
-# MAP    xdiff/xemit.h       xemit.h       
-# MAP    xdiff/xinclude.h    xinclude.h    
-# MAP    xdiff/xmacros.h     xmacros.h     
-# MAP    xdiff/xmerge3.c     xmerge3.c     
-# MAP    xdiff/xmissing.c    xmissing.c    
-# MAP    xdiff/xmissing.h    xmissing.h    
-# MAP    xdiff/xpatchi.c     xpatchi.c     
-# MAP    xdiff/xprepare.c    xprepare.c    
-# MAP    xdiff/xprepare.h    xprepare.h    
-# MAP    xdiff/xrabdiff.c    xrabdiff.c    
-# MAP    xdiff/xrabply.c     xrabply.c     
-# MAP    xdiff/xtypes.h      xtypes.h      
-# MAP    xdiff/xutils.c      xutils.c      
-# MAP    xdiff/xutils.h      xutils.h      
-# MAP    xdiff/xversion.c    xversion.c    
+# MAP    xdiff/xadler32.c    xadler32.c
+# MAP    xdiff/xadler32.h    xadler32.h
+# MAP    xdiff/xalloc.c      xalloc.c
+# MAP    xdiff/xbdiff.c      xbdiff.c
+# MAP    xdiff/xbdiff.h      xbdiff.h
+# MAP    xdiff/xbpatchi.c    xbpatchi.c
+# MAP    xdiff/xdiff.h       xdiff.h
+# MAP    xdiff/xdiffi.c      xdiffi.c
+# MAP    xdiff/xdiffi.h      xdiffi.h
+# MAP    xdiff/xemit.c       xemit.c
+# MAP    xdiff/xemit.h       xemit.h
+# MAP    xdiff/xinclude.h    xinclude.h
+# MAP    xdiff/xmacros.h     xmacros.h
+# MAP    xdiff/xmerge3.c     xmerge3.c
+# MAP    xdiff/xmissing.c    xmissing.c
+# MAP    xdiff/xmissing.h    xmissing.h
+# MAP    xdiff/xpatchi.c     xpatchi.c
+# MAP    xdiff/xprepare.c    xprepare.c
+# MAP    xdiff/xprepare.h    xprepare.h
+# MAP    xdiff/xrabdiff.c    xrabdiff.c
+# MAP    xdiff/xrabply.c     xrabply.c
+# MAP    xdiff/xtypes.h      xtypes.h
+# MAP    xdiff/xutils.c      xutils.c
+# MAP    xdiff/xutils.h      xutils.h
+# MAP    xdiff/xversion.c    xversion.c
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -803,6 +803,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
   LOCAL l_lLIBSYSMISC := .T.
   LOCAL l_cCMAIN := NIL
   LOCAL l_lTargetSelected := .F.
+   LOCAL l_cDynLibDir

   /* hbmk2 lib ordering tries to satisfy linkers which require this
      (mingw*, linux/gcc, bsd/gcc and dos/djgpp), but this won't solve
@@ -874,7 +875,6 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
   LOCAL fhnd
   LOCAL cFile
   LOCAL lSysLoc
-   LOCAL cPrefix
   LOCAL cPostfix
   LOCAL aOBJLIST

@@ -3050,10 +3050,10 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
      DEFAULT hbmk[ _HBMK_lSHAREDDIST ] TO lSysLoc

      IF hbmk[ _HBMK_lSHAREDDIST ] .OR. ! HBMK_ISCOMP( "gcc|clang|open64" )
-         cPrefix := ""
+         l_cDynLibDir := ""
      ELSE
         /* Only supported by gcc, clang, open64 compilers. */
-         cPrefix := DirAddPathSep( l_cHB_INSTALL_DYN )
+         l_cDynLibDir := DirAddPathSep( l_cHB_INSTALL_DYN )
      ENDIF
 #if 1
      cPostfix := ""
@@ -3064,12 +3064,12 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )

      DO CASE
      CASE HBMK_ISPLAT( "darwin|bsd|linux|hpux|beos|qnx|vxworks|sunos|minix" )
-         IF Empty( cPrefix )
+         IF Empty( l_cDynLibDir )
            l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cPostfix,;
                                                      "harbour"   + cPostfix ) }
         ELSE
-            l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], cPrefix + hbmk[ _HBMK_cDynLibPrefix ] + "harbourmt" + cPostfix + hbmk[ _HBMK_cDynLibExt ],;
-                                                      cPrefix + hbmk[ _HBMK_cDynLibPrefix ] + "harbour"   + cPostfix + hbmk[ _HBMK_cDynLibExt ] ) }
+            l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], l_cDynLibDir + hbmk[ _HBMK_cDynLibPrefix ] + "harbourmt" + cPostfix + hbmk[ _HBMK_cDynLibExt ],;
+                                                      l_cDynLibDir + hbmk[ _HBMK_cDynLibPrefix ] + "harbour"   + cPostfix + hbmk[ _HBMK_cDynLibExt ] ) }
         ENDIF
      CASE HBMK_ISPLAT( "os2|win|wce" )
         l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], hbmk[ _HBMK_cDynLibPrefix ] + "harbourmt",;
@@ -4891,6 +4891,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
      ENDIF
      OutStd( "targetname{{" + hbmk_TARGETNAME( hbmk ) + "}}" + hb_eol() )
      OutStd( "targettype{{" + hbmk_TARGETTYPE( hbmk ) + "}}" + hb_eol() )
+      OutStd( "dynprefix{{" + iif( Empty( l_cDynLibDir ), "", l_cDynLibDir + hbmk[ _HBMK_cDynLibPrefix ] ) + "}}" + hb_eol() )
      OutStd( "dynsuffix{{" + hbmk_DYNSUFFIX( hbmk ) + "}}" + hb_eol() )
      OutStd( "inc{{" + iif( hbmk[ _HBMK_lINC ], "yes", "no" ) + "}}" + hb_eol() )