diff options
| author | Stanislav Sedov <stas@FreeBSD.org> | 2011-09-09 07:32:40 +0000 |
|---|---|---|
| committer | Stanislav Sedov <stas@FreeBSD.org> | 2011-09-09 07:32:40 +0000 |
| commit | 03a0dc36b837f649ced953775a337368fdd66f1f (patch) | |
| tree | 565189a68bb7aa23d903fc5308f7d9ad67044fbe /devel/libdispatch | |
| parent | 386a4fb82a5def8933f6d4bab0ebfc7a728787cf (diff) | |
| download | ports-03a0dc36b837f649ced953775a337368fdd66f1f.tar.gz ports-03a0dc36b837f649ced953775a337368fdd66f1f.zip | |
Notes
Diffstat (limited to 'devel/libdispatch')
| -rw-r--r-- | devel/libdispatch/Makefile | 15 | ||||
| -rw-r--r-- | devel/libdispatch/distinfo | 4 | ||||
| -rw-r--r-- | devel/libdispatch/files/patch-configure.ac | 22 | ||||
| -rw-r--r-- | devel/libdispatch/files/patch-src_shims_time.h | 13 |
4 files changed, 47 insertions, 7 deletions
diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile index 57d96f2d8663..3973668651b0 100644 --- a/devel/libdispatch/Makefile +++ b/devel/libdispatch/Makefile @@ -6,14 +6,15 @@ # PORTNAME= libdispatch -PORTVERSION= 174 +PORTVERSION= 210 CATEGORIES= devel MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/ -DISTNAME= ${PORTNAME}-r${PORTVERSION} MAINTAINER= stas@FreeBSD.org COMMENT= Grand Central Dispatch API support library +USE_AUTOTOOLS= aclocal autoconf +ACLOCAL_ARGS= -Im4 GNU_CONFIGURE= yes USE_BZIP2= yes USE_LDCONFIG= yes @@ -83,13 +84,17 @@ IGNORE= is not supported on this OS version .endif .if !defined(WITHOUT_CLANG) +. if ${OSVERSION} < 900024 BUILD_DEPENDS+= clang:${PORTSDIR}/devel/llvm-devel \ ${LOCALBASE}/lib/libBlocksRuntime.so:${PORTSDIR}/devel/compiler-rt RUN_DEPENDS+= clang:${PORTSDIR}/devel/llvm-devel \ ${LOCALBASE}/lib/libBlocksRuntime.so:${PORTSDIR}/devel/compiler-rt -CONFIGURE_ARGS+= --with-blocks-runtime=/usr/local/lib -CONFIGURE_ENV+= CC="clang" -MAKE_ENV+= CC="clang" +CONFIGURE_ARGS+= --with-blocks-runtime=${LOCALBASE}/lib +CONFIGURE_ENV+= CC="${LOCALBASE}/clang" +. else +CONFIGURE_ARGS+= --with-blocks-runtime=/usr/lib +CONFIGURE_ENV+= CC="/usr/bin/clang" +. endif .endif .include <bsd.port.post.mk> diff --git a/devel/libdispatch/distinfo b/devel/libdispatch/distinfo index e9c119f14e05..27b20ee5fb15 100644 --- a/devel/libdispatch/distinfo +++ b/devel/libdispatch/distinfo @@ -1,2 +1,2 @@ -SHA256 (libdispatch-r174.tar.bz2) = 4bed0f9a2010d779ab478324d3e69badaebaf6d67cbd8cb70ef6700ab0135359 -SIZE (libdispatch-r174.tar.bz2) = 353608 +SHA256 (libdispatch-210.tar.bz2) = cc9be9b318ae0ee2414d5082d9f9a66d1afb304fd17dcc506383066d45efda4a +SIZE (libdispatch-210.tar.bz2) = 350329 diff --git a/devel/libdispatch/files/patch-configure.ac b/devel/libdispatch/files/patch-configure.ac new file mode 100644 index 000000000000..cea80713c323 --- /dev/null +++ b/devel/libdispatch/files/patch-configure.ac @@ -0,0 +1,22 @@ +--- configure.ac.orig 2011-09-08 23:48:16.000000000 -0700 ++++ configure.ac 2011-09-08 23:48:28.000000000 -0700 +@@ -137,7 +137,18 @@ + # Find libraries we will need + # + AC_SEARCH_LIBS(clock_gettime, rt) +-AC_SEARCH_LIBS(pthread_create, pthread) ++ ++# ++# Find how to enable threads ++# ++case $host in ++*freebsd*) ++ LIBS="${LIBS} -pthread" ++ ;; ++*) ++ AC_SEARCH_LIBS(pthread_create, pthread) ++ ;; ++esac + + # + # Prefer native kqueue(2); otherwise use libkqueue if present. diff --git a/devel/libdispatch/files/patch-src_shims_time.h b/devel/libdispatch/files/patch-src_shims_time.h new file mode 100644 index 000000000000..f012effd0b58 --- /dev/null +++ b/devel/libdispatch/files/patch-src_shims_time.h @@ -0,0 +1,13 @@ +--- src/shims/time.h.orig 2011-09-08 23:49:45.000000000 -0700 ++++ src/shims/time.h 2011-09-08 23:49:56.000000000 -0700 +@@ -52,8 +52,8 @@ + bool ratio_1_to_1; + dispatch_once_t pred; + } _dispatch_host_time_data_s; +-__private_extern__ _dispatch_host_time_data_s _dispatch_host_time_data; +-__private_extern__ void _dispatch_get_host_time_init(void *context); ++extern _dispatch_host_time_data_s _dispatch_host_time_data; ++extern void _dispatch_get_host_time_init(void *context); + + static inline uint64_t + _dispatch_time_mach2nano(uint64_t machtime) |