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

2012-06-07 12:45 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* utils/hbmk2/hbmk2.prg
    + added darwin Homwbrew support
    * minor improvements on darwin pkg manager usage
This commit is contained in:
Viktor Szakats
2012-06-07 10:46:15 +00:00
parent 04cb7eb758
commit 3afab7b585
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-06-07 12:45 UTC+0200 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
+ added darwin Homwbrew support
* minor improvements on darwin pkg manager usage
2012-06-07 12:15 UTC+0200 Viktor Szakats (harbour syenar.net)
* include/Makefile
* include/common.ch

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

@@ -3333,7 +3333,8 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
/boot/common/include (beos)
/boot/develop/headers/3rdparty (beos)
/opt/local/include (darwin MacPorts)
/usr/local/include (darwin Homebrew)
/opt/local/include (darwin MacPorts/DarwinPorts)
/sw/include (darwin Fink)
/Library/Frameworks/<pkg>.framework/Headers (darwin)
@@ -3792,8 +3793,15 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
/* Add paths, where this isn't a system component */
DO CASE
CASE hbmk[ _HBMK_cPLAT ] == "darwin"
AAddNew( hbmk[ _HBMK_aLIBPATH ], "/sw/lib" ) /* For Fink */
AAddNew( hbmk[ _HBMK_aLIBPATH ], "/opt/local/lib" ) /* For MacPorts (formerly DarwinPorts) */
IF hb_DirExists( "/usr/local/lib" )
AAddNew( hbmk[ _HBMK_aLIBPATH ], "/usr/local/lib" ) /* For Homebrew */
ENDIF
IF hb_DirExists( "/opt/local/lib" )
AAddNew( hbmk[ _HBMK_aLIBPATH ], "/opt/local/lib" ) /* For MacPorts (formerly DarwinPorts) */
ENDIF
IF hb_DirExists( "/sw/lib" )
AAddNew( hbmk[ _HBMK_aLIBPATH ], "/sw/lib" ) /* For Fink */
ENDIF
CASE hbmk[ _HBMK_cPLAT ] == "bsd"
AAddNew( hbmk[ _HBMK_aLIBPATH ], "/usr/local/lib" ) /* For ports */
AAddNew( hbmk[ _HBMK_aLIBPATH ], "/usr/pkg/lib" ) /* For pkgsrc */
@@ -8237,7 +8245,18 @@ STATIC FUNCTION dep_try_pkg_detection( hbmk, dep )
hb_processRun( cName + "-config --version --libs --cflags",, @cStdOut, @cStdErr )
ENDIF
#if defined( __PLATFORM__DARWIN )
/* DarwinPorts */
/* Homebrew */
IF Empty( cStdOut )
IF hb_FileExists( "/usr/local/bin/pkg-config" )
hb_processRun( "/usr/local/bin/pkg-config --modversion --libs --cflags " + cName,, @cStdOut, @cStdErr )
ENDIF
ENDIF
IF Empty( cStdOut )
IF hb_FileExists( "/usr/local/bin/" + cName + "-config" )
hb_processRun( "/usr/local/bin/" + cName + "-config --version --libs --cflags",, @cStdOut, @cStdErr )
ENDIF
ENDIF
/* MacPorts/DarwinPorts */
IF Empty( cStdOut )
IF hb_FileExists( "/opt/local/bin/pkg-config" )
hb_processRun( "/opt/local/bin/pkg-config --modversion --libs --cflags " + cName,, @cStdOut, @cStdErr )