From owner-svn-ports-head@freebsd.org Mon May 20 17:06:36 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10B1015B3365; Mon, 20 May 2019 17:06:36 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A5B8388031; Mon, 20 May 2019 17:06:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 61116212E4; Mon, 20 May 2019 17:06:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4KH6ZB6040497; Mon, 20 May 2019 17:06:35 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4KH6YFw040492; Mon, 20 May 2019 17:06:34 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201905201706.x4KH6YFw040492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 20 May 2019 17:06:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502126 - in head: devel/ccache devel/ccache/files devel/gettext-runtime devel/gmake print/indexinfo X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head: devel/ccache devel/ccache/files devel/gettext-runtime devel/gmake print/indexinfo X-SVN-Commit-Revision: 502126 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A5B8388031 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.975,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 May 2019 17:06:36 -0000 Author: bdrewery Date: Mon May 20 17:06:34 2019 New Revision: 502126 URL: https://svnweb.freebsd.org/changeset/ports/502126 Log: Fix recursive dependency issue with gmake. Add a hard .error so I don't miss this again. PR: 237979 Submitted by: tcberner, adamw (based on) Pointyhat to: bdrewery Added: head/devel/ccache/files/extra-patch-Makefile.in (contents, props changed) Modified: head/devel/ccache/Makefile head/devel/gettext-runtime/Makefile head/devel/gmake/Makefile head/print/indexinfo/Makefile Modified: head/devel/ccache/Makefile ============================================================================== --- head/devel/ccache/Makefile Mon May 20 16:56:13 2019 (r502125) +++ head/devel/ccache/Makefile Mon May 20 17:06:34 2019 (r502126) @@ -33,25 +33,25 @@ LLVMLINK_DESC= Create llvm compiler links if llvm is i TINDERBOX_DESC= Create tarball for tinderbox usage MEMCACHED_DESC= Build in experimental Memcached support -USES= compiler gmake +USES= compiler MEMCACHED_EXTRA_PATCHES= \ ${FILESDIR}/extra-patch-memcached-configure.ac \ ${FILESDIR}/extra-patch-memcached-Makefile.in MEMCACHED_CONFIGURE_ENABLE= memcached -MEMCACHED_USES= autoreconf pkgconfig +MEMCACHED_USES= autoreconf gmake pkgconfig MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached MEMCACHED_LDFLAGS= -L${LOCALBASE}/lib MEMCACHED_CFLAGS= -I${LOCALBASE}/include STATIC_CONFIGURE_ENABLE= static +.if empty(OPTIONS_SLAVE:MMEMCACHED) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in +.endif + .if defined(WITH_CCACHE_BUILD) && empty(OPTIONS_SLAVE:MMEMCACHED) && \ !defined(NO_CCACHE_DEPEND) -# Don't allow autoreconf. We want no dependencies on this to keep -# WITH_CCACHE_BUILD working. -USES:= ${USES:Nautoreconf} - MEMCACHED_IGNORE= MEMCACHED cannot be combined with WITH_CCACHE_BUILD. Use devel/ccache-memcached # XXX: This needs more testing with Poudriere before enabling. Also bsd.options.mk support. #MEMCACHED_DEPENDS_ARGS+= NO_CCACHE_DEPEND=1 @@ -84,6 +84,12 @@ PORTVERSION= 3.7.1 .endif .include + +.if defined(WITH_CCACHE_BUILD) && empty(OPTIONS_SLAVE:MMEMCACHED) +.if !empty(BUILD_DEPENDS) +.error MAINTAINER NOTE: Cannot have any BUILD_DEPENDS for default ccache packages +.endif +.endif . if ${COMPILER_TYPE} == clang CPPFLAGS+= -DCC_IS_CLANG Added: head/devel/ccache/files/extra-patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ccache/files/extra-patch-Makefile.in Mon May 20 17:06:34 2019 (r502126) @@ -0,0 +1,13 @@ +--- Makefile.in.orig 2019-05-20 14:04:00 UTC ++++ Makefile.in +@@ -126,10 +126,6 @@ install: ccache$(EXEEXT) @disable_man@ccache.1 + clean: + rm -rf $(files_to_clean) + +-src/snprintf.o: CFLAGS += @no_implicit_fallthrough_warning@ +-$(zlib_objs): CPPFLAGS += -include config.h +-$(zlib_objs): CFLAGS += @no_implicit_fallthrough_warning@ +- + src/zlib/libz.a: $(zlib_objs) + $(if $(quiet),@echo " AR $@") + $(Q)$(AR) cr $@ $(zlib_objs) Modified: head/devel/gettext-runtime/Makefile ============================================================================== --- head/devel/gettext-runtime/Makefile Mon May 20 16:56:13 2019 (r502125) +++ head/devel/gettext-runtime/Makefile Mon May 20 17:06:34 2019 (r502126) @@ -28,7 +28,6 @@ WRKSRC_SUBDIR= gettext-runtime INFO= autosprintf CPE_PRODUCT= gettext CPE_VENDOR= gnu -NO_CCACHE= yes .include Modified: head/devel/gmake/Makefile ============================================================================== --- head/devel/gmake/Makefile Mon May 20 16:56:13 2019 (r502125) +++ head/devel/gmake/Makefile Mon May 20 17:06:34 2019 (r502126) @@ -24,8 +24,6 @@ CONFIGURE_ARGS= --program-prefix=g \ USES= cpe tar:bzip2 CPE_VENDOR= gnu -NO_CCACHE= yes - OPTIONS_DEFINE= NLS OPTIONS_SUB= yes Modified: head/print/indexinfo/Makefile ============================================================================== --- head/print/indexinfo/Makefile Mon May 20 16:56:13 2019 (r502125) +++ head/print/indexinfo/Makefile Mon May 20 17:06:34 2019 (r502126) @@ -15,7 +15,6 @@ USE_GITHUB= yes GH_ACCOUNT= bapt INSTALL_TARGET= install-strip PLIST_FILES= bin/indexinfo -NO_CCACHE= yes .if exists(/usr/include/sys/capsicum.h) CFLAGS+= -DHAVE_CAPSICUM