Date: Mon, 20 May 2019 17:06:34 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> 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 Message-ID: <201905201706.x4KH6YFw040492@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk> + +.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 <bsd.port.options.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905201706.x4KH6YFw040492>