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

2009-12-05 01:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + Added Harbour lib dir autodetection when Harbour installed
      on 64-bit systems (where libs are in */lib64/harbour).
      Please test it.

    ; NOTE: I've also found some logic which makes hbmk2 build
            process inherit -m64/-m32/-mlp64/-mlp32 switches from
            hbmk2 itself. But it only passes it to C flags.
            I'm not sure it sure pass it at all, but in case it
            needs to pass it, should it also pass it to linker
            flags? I don't have 64-bit linux development system
            to try these things.
This commit is contained in:
Viktor Szakats
2009-12-05 00:59:30 +00:00
parent 5c0eb70eee
commit 6fdd5f7c26
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -17,6 +17,20 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-05 01:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Added Harbour lib dir autodetection when Harbour installed
on 64-bit systems (where libs are in */lib64/harbour).
Please test it.
; NOTE: I've also found some logic which makes hbmk2 build
process inherit -m64/-m32/-mlp64/-mlp32 switches from
hbmk2 itself. But it only passes it to C flags.
I'm not sure it sure pass it at all, but in case it
needs to pass it, should it also pass it to linker
flags? I don't have 64-bit linux development system
to try these things.
2009-12-05 01:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* config/global.mk
+ Added some provisions for separate -cpu selection:

8
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -1115,7 +1115,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
l_cHB_INSTALL_PREFIX := DirAddPathSep( l_cHB_INSTALL_PREFIX ) + ".." + hb_osPathSeparator()
ENDIF
/* Detect special *nix dir layout (/bin, /lib/harbour, /include/harbour) */
/* Detect special *nix dir layout (/bin, /lib/harbour, /lib64/harbour, /include/harbour) */
IF hb_FileExists( DirAddPathSep( l_cHB_INSTALL_PREFIX ) + "include" +;
hb_osPathSeparator() + iif( hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB, "xharbour", "harbour" ) +;
hb_osPathSeparator() + "hbvm.h" )
@@ -1123,7 +1123,11 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
l_cHB_BIN_INSTALL := PathNormalize( DirAddPathSep( l_cHB_INSTALL_PREFIX ) + "bin" )
ENDIF
IF Empty( l_cHB_LIB_INSTALL )
l_cHB_LIB_INSTALL := PathNormalize( DirAddPathSep( l_cHB_INSTALL_PREFIX ) + "lib" + hb_osPathSeparator() + iif( hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB, "xharbour", "harbour" ) )
IF hb_DirExists( tmp := PathNormalize( DirAddPathSep( l_cHB_INSTALL_PREFIX ) + "lib64" + hb_osPathSeparator() + iif( hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB, "xharbour", "harbour" ) ) )
l_cHB_LIB_INSTALL := tmp
ELSE
l_cHB_LIB_INSTALL := PathNormalize( DirAddPathSep( l_cHB_INSTALL_PREFIX ) + "lib" + hb_osPathSeparator() + iif( hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB, "xharbour", "harbour" ) )
ENDIF
ENDIF
IF Empty( l_cHB_INC_INSTALL )
l_cHB_INC_INSTALL := PathNormalize( DirAddPathSep( l_cHB_INSTALL_PREFIX ) + "include" + hb_osPathSeparator() + iif( hbmk[ _HBMK_nHBMODE ] == _HBMODE_XHB, "xharbour", "harbour" ) )