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

Import gnuregex 0.12 and remove hardcoded paths

Browse Source 
This is required on OS X and other systems which do not have the glibc
extensions for regular expressions (FreeBSD is not one of them as it
already includes gnuregex in /usr). With this there are no hardcoded
non-standard paths for OS X anymore.

regex.c and regex.h are from the official gnuregex 0.12 distribution,
the only modification is that I added __BEGIN_DECLS and __END_DECLS to
regex.h.
This commit is contained in:
Jonathan Schleifer
2014-02-03 18:27:35 +01:00
parent 539a6cafc5
commit b55c918f57
6 changed files with 5455 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+6 -2
View File
@@ -495,8 +495,8 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
HOST_LIBROOT += /usr/lib/libgnuregex.so ;
HOST_STATIC_LIBROOT += /usr/lib/libgnuregex.so ;
} else if $(HOST_PLATFORM) = darwin {
HOST_LIBROOT += /opt/local/lib/libgnuregex.dylib ;
HOST_STATIC_LIBROOT += /opt/local/lib/libgnuregex.dylib ;
HOST_LIBROOT += libgnuregex_build.a ;
HOST_STATIC_LIBROOT += libgnuregex_build.a ;
}
# The BeOS compilers define __INTEL__ respectively __POWERPC__. On the
@@ -593,6 +593,10 @@ if $(HOST_PLATFORM) = freebsd {
HOST_LINKFLAGS += -L/usr/local/lib ;
}
if $(HOST_PLATFORM) = darwin {
HOST_HDRS += [ FDirName $(HAIKU_TOP) src build libgnuregex ] ;
}
HOST_BE_API_HEADERS =
[ FDirName $(HAIKU_TOP) headers build ]
[ FDirName $(HAIKU_TOP) headers build os ]