mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-23 09:10:43 +00:00
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
This commit is contained in:
parent
f5703125af
commit
1761e6570e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=502126
@ -33,25 +33,25 @@ LLVMLINK_DESC= Create llvm compiler links if llvm is installed
|
||||
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
|
||||
@ -85,6 +85,12 @@ PORTVERSION= 3.7.1
|
||||
|
||||
.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
|
||||
. elif ${COMPILER_TYPE} == gcc
|
||||
|
13
devel/ccache/files/extra-patch-Makefile.in
Normal file
13
devel/ccache/files/extra-patch-Makefile.in
Normal file
@ -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)
|
@ -28,7 +28,6 @@ WRKSRC_SUBDIR= gettext-runtime
|
||||
INFO= autosprintf
|
||||
CPE_PRODUCT= gettext
|
||||
CPE_VENDOR= gnu
|
||||
NO_CCACHE= yes
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user