From owner-svn-ports-all@FreeBSD.ORG Fri Oct 18 13:57:11 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 04A3355D; Fri, 18 Oct 2013 13:57:11 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D7B7E2327; Fri, 18 Oct 2013 13:57:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IDvA7W082395; Fri, 18 Oct 2013 13:57:10 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IDvAVS082394; Fri, 18 Oct 2013 13:57:10 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201310181357.r9IDvAVS082394@svn.freebsd.org> From: Brooks Davis Date: Fri, 18 Oct 2013 13:57:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330745 - head/devel/libdispatch X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Oct 2013 13:57:11 -0000 Author: brooks Date: Fri Oct 18 13:57:10 2013 New Revision: 330745 URL: http://svnweb.freebsd.org/changeset/ports/330745 Log: STAGIFY Depend on a more modern version of clang when the base one won't do. Modified: head/devel/libdispatch/Makefile Modified: head/devel/libdispatch/Makefile ============================================================================== --- head/devel/libdispatch/Makefile Fri Oct 18 13:49:29 2013 (r330744) +++ head/devel/libdispatch/Makefile Fri Oct 18 13:57:10 2013 (r330745) @@ -22,60 +22,61 @@ OPTIONS_DEFINE= CLANG OPTIONS_DEFAULT= CLANG CLANG_DESC= Build with LLVM/Clang (required for blocks support) -MAN3= dispatch.3 dispatch_after.3 dispatch_api.3 dispatch_apply.3 \ - dispatch_async.3 dispatch_benchmark.3 dispatch_group_create.3 \ - dispatch_object.3 dispatch_once.3 dispatch_queue_create.3 \ - dispatch_semaphore_create.3 dispatch_source_create.3 dispatch_time.3 - -MLINKS= dispatch_after.3 dispatch_after_f.3 \ - dispatch_apply.3 dispatch_apply_f.3 \ - dispatch_async.3 dispatch_sync.3 \ - dispatch_async.3 dispatch_async_f.3 \ - dispatch_async.3 dispatch_sync_f.3 \ - dispatch_benchmark.3 dispatch_benchmark_f.3 \ - dispatch_group_create.3 dispatch_group_enter.3 \ - dispatch_group_create.3 dispatch_group_leave.3 \ - dispatch_group_create.3 dispatch_group_wait.3 \ - dispatch_group_create.3 dispatch_group_notify.3 \ - dispatch_group_create.3 dispatch_group_notify_f.3 \ - dispatch_group_create.3 dispatch_group_async.3 \ - dispatch_group_create.3 dispatch_group_async_f.3 \ - dispatch_object.3 dispatch_retain.3 \ - dispatch_object.3 dispatch_release.3 \ - dispatch_object.3 dispatch_suspend.3 \ - dispatch_object.3 dispatch_resume.3 \ - dispatch_object.3 dispatch_get_context.3 \ - dispatch_object.3 dispatch_set_context.3 \ - dispatch_object.3 dispatch_set_finalizer_f.3 \ - dispatch_once.3 dispatch_once_f.3 \ - dispatch_queue_create.3 dispatch_queue_get_label.3 \ - dispatch_queue_create.3 dispatch_get_current_queue.3 \ - dispatch_queue_create.3 dispatch_get_global_queue.3 \ - dispatch_queue_create.3 dispatch_get_main_queue.3 \ - dispatch_queue_create.3 dispatch_main.3 \ - dispatch_queue_create.3 dispatch_set_target_queue.3 \ - dispatch_semaphore_create.3 dispatch_semaphore_signal.3 \ - dispatch_semaphore_create.3 dispatch_semaphore_wait.3 \ - dispatch_source_create.3 dispatch_source_set_event_handler.3 \ - dispatch_source_create.3 dispatch_source_set_event_handler_f.3 \ - dispatch_source_create.3 dispatch_source_set_cancel_handler.3 \ - dispatch_source_create.3 dispatch_source_set_cancel_handler_f.3 \ - dispatch_source_create.3 dispatch_source_cancel.3 \ - dispatch_source_create.3 dispatch_source_testcancel.3 \ - dispatch_source_create.3 dispatch_source_get_handle.3 \ - dispatch_source_create.3 dispatch_source_get_mask.3 \ - dispatch_source_create.3 dispatch_source_get_data.3 \ - dispatch_source_create.3 dispatch_source_merge_data.3 \ - dispatch_source_create.3 dispatch_source_set_timer.3 \ - dispatch_time.3 dispatch_walltime.3 - -# -# Get rid of .la and static library files -# -NO_STAGE= yes -post-configure: - @${REINPLACE_CMD} -E -e \ - '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool +_MAN3= dispatch.3 \ + dispatch_after.3 \ + dispatch_after_f.3 \ + dispatch_api.3 \ + dispatch_apply.3 \ + dispatch_apply_f.3 \ + dispatch_async.3 \ + dispatch_async_f.3 \ + dispatch_benchmark.3 \ + dispatch_benchmark_f.3 \ + dispatch_get_context.3 \ + dispatch_get_current_queue.3 \ + dispatch_get_global_queue.3 \ + dispatch_get_main_queue.3 \ + dispatch_group_async.3 \ + dispatch_group_async_f.3 \ + dispatch_group_create.3 \ + dispatch_group_enter.3 \ + dispatch_group_leave.3 \ + dispatch_group_notify.3 \ + dispatch_group_notify_f.3 \ + dispatch_group_wait.3 \ + dispatch_main.3 \ + dispatch_object.3 \ + dispatch_once.3 \ + dispatch_once_f.3 \ + dispatch_queue_create.3 \ + dispatch_queue_get_label.3 \ + dispatch_release.3 \ + dispatch_resume.3 \ + dispatch_retain.3 \ + dispatch_semaphore_create.3 \ + dispatch_semaphore_signal.3 \ + dispatch_semaphore_wait.3 \ + dispatch_set_context.3 \ + dispatch_set_finalizer_f.3 \ + dispatch_set_target_queue.3 \ + dispatch_source_cancel.3 \ + dispatch_source_create.3 \ + dispatch_source_get_data.3 \ + dispatch_source_get_handle.3 \ + dispatch_source_get_mask.3 \ + dispatch_source_merge_data.3 \ + dispatch_source_set_cancel_handler.3 \ + dispatch_source_set_cancel_handler_f.3 \ + dispatch_source_set_event_handler.3 \ + dispatch_source_set_event_handler_f.3 \ + dispatch_source_set_timer.3 \ + dispatch_source_testcancel.3 \ + dispatch_suspend.3 \ + dispatch_sync.3 \ + dispatch_sync_f.3 \ + dispatch_time.3 \ + dispatch_walltime.3 +PLIST_FILES+= ${_MAN3:S|^|man/man3/|:S|$|.gz|} .include @@ -93,16 +94,24 @@ BROKEN= Does not link on sparc64-9 .if ${PORT_OPTIONS:MCLANG} . if ${OSVERSION} < 900024 -BUILD_DEPENDS+= clang:${PORTSDIR}/lang/clang \ +BUILD_DEPENDS+= clang33:${PORTSDIR}/lang/clang33 \ ${LOCALBASE}/lib/libBlocksRuntime.so:${PORTSDIR}/devel/compiler-rt -RUN_DEPENDS+= clang:${PORTSDIR}/lang/clang \ +RUN_DEPENDS+= clang33:${PORTSDIR}/lang/clang33 \ ${LOCALBASE}/lib/libBlocksRuntime.so:${PORTSDIR}/devel/compiler-rt CONFIGURE_ARGS+= --with-blocks-runtime=${LOCALBASE}/lib -CONFIGURE_ENV+= CC="${LOCALBASE}/bin/clang" CPPFLAGS="-I${LOCALBASE}/include" +CONFIGURE_ENV+= CC="${LOCALBASE}/bin/clang33" CPPFLAGS="-I${LOCALBASE}/include" . else CONFIGURE_ARGS+= --with-blocks-runtime=/usr/lib CONFIGURE_ENV+= CC="/usr/bin/clang" . endif .endif +# +# Get rid of .la and static library files +# +post-configure: + @${REINPLACE_CMD} -E -e \ + '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool + + .include