diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-20 18:19:58 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-09-23 10:58:02 +0200 |
| commit | 2a789c8442ce730cac112eeb89c7eb497bb5cc15 (patch) | |
| tree | ee06d2ced75dea5309da59e6e96116e69c4c546f | |
| parent | d40fe50a6755ab701f2fe8a434f1d3331769a4c0 (diff) | |
| download | samba-2a789c8442ce730cac112eeb89c7eb497bb5cc15.tar.gz samba-2a789c8442ce730cac112eeb89c7eb497bb5cc15.tar.bz2 samba-2a789c8442ce730cac112eeb89c7eb497bb5cc15.zip | |
build: Fix waf build on MacOS X
The -framework CoreFoundation is required by the charset_macosxfs module
The system/time.h header is required to access the replacement clock_gettime()
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Sep 23 10:58:02 CEST 2011 on sn-devel-104
| -rw-r--r-- | lib/util/charset/charset_macosxfs.c | 2 | ||||
| -rw-r--r-- | source3/lib/pthreadpool/pthreadpool.c | 3 | ||||
| -rwxr-xr-x | wscript | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/lib/util/charset/charset_macosxfs.c b/lib/util/charset/charset_macosxfs.c index dfd142a51e..b32aa2bcd1 100644 --- a/lib/util/charset/charset_macosxfs.c +++ b/lib/util/charset/charset_macosxfs.c @@ -33,7 +33,7 @@ #include "charset_proto.h" #undef realloc -#ifdef DARWIN +#ifdef DARWINOS /* * Include OS frameworks. These are only needed in this module. diff --git a/source3/lib/pthreadpool/pthreadpool.c b/source3/lib/pthreadpool/pthreadpool.c index 9981ed25ae..42b550d7ed 100644 --- a/source3/lib/pthreadpool/pthreadpool.c +++ b/source3/lib/pthreadpool/pthreadpool.c @@ -17,6 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "config.h" #include <errno.h> #include <stdio.h> #include <unistd.h> @@ -26,7 +27,7 @@ #include <signal.h> #include <assert.h> #include <fcntl.h> -#include <sys/time.h> +#include "system/time.h" #include "pthreadpool.h" #include "lib/util/dlinklist.h" @@ -77,6 +77,10 @@ def configure(conf): conf.ADD_CFLAGS('-fno-common') if not conf.CHECK_SHLIB_W_PYTHON("Checking if -undefined dynamic_lookup is not need"): conf.env.append_value('shlib_LINKFLAGS', ['-undefined', 'dynamic_lookup']) + + if sys.platform == 'darwin': + conf.ADD_LDFLAGS('-framework CoreFoundation') + if int(conf.env['PYTHON_VERSION'][0]) >= 3: raise Utils.WafError('Python version 3.x is not supported by Samba yet') |