i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "build/libgnuregex: Remove."

Browse Source 
This reverts commit ca087b0532.

Mac OS X requires libgnuregex for Keymap
This commit is contained in:
John Scipione
2018-02-16 16:45:11 -08:00
parent f12d3b3477
commit 940a3a2322
14 changed files with 7343 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+11
View File
@@ -484,6 +484,15 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
}
}
# Unlike glibc FreeBSD's libc doesn't have built-in regex support.
if $(HOST_PLATFORM) = freebsd {
HOST_LIBROOT += /usr/lib/libgnuregex.so ;
HOST_STATIC_LIBROOT += /usr/lib/libgnuregex.so ;
} else if $(HOST_PLATFORM) = darwin {
HOST_LIBROOT += libgnuregex_build.so ;
HOST_STATIC_LIBROOT += libgnuregex_build.so ;
}
# The BeOS compilers define __INTEL__ respectively __POWERPC__. On the
# build platform we need to make sure, this is also defined.
if $(HOST_CPU) = x86 {
@@ -567,6 +576,8 @@ if $(HOST_PLATFORM) = freebsd {
}
if $(HOST_PLATFORM) = darwin {
HOST_HDRS += [ FDirName $(HAIKU_TOP) src build libgnuregex ] ;
# Mac OS X users may be using macports libraries, in which case the headers
# and the libs are located in /opt/local/.
HOST_HDRS += /opt/local/include ;