Date: Fri, 30 Jun 2023 21:23:21 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 35b00cf31554 - main - cleanup: Remove expired ccache-memcached ports: Message-ID: <202306302123.35ULNL1K078708@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=35b00cf315541a12c849994e8969383939a967e7 commit 35b00cf315541a12c849994e8969383939a967e7 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2023-06-30 21:22:46 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2023-06-30 21:22:53 +0000 cleanup: Remove expired ccache-memcached ports: 2023-06-30 devel/ccache-memcached: Unmaintained fork that targets a very old version of ccache 2023-06-30 devel/ccache-memcached-static: Unmaintained fork that targets a very old version of ccache --- MOVED | 2 + devel/Makefile | 2 - devel/ccache-memcached-static/Makefile | 9 -- devel/ccache-memcached/Makefile | 111 --------------------- devel/ccache-memcached/distinfo | 3 - .../files/ccache-howto-freebsd.txt.in | 66 ------------ .../files/ccache-update-links.sh.in | 69 ------------- devel/ccache-memcached/files/patch-Makefile.in | 14 --- devel/ccache-memcached/files/patch-configure.ac | 59 ----------- devel/ccache-memcached/files/patch-src__ccache.c | 56 ----------- devel/ccache-memcached/files/pkg-message.in | 9 -- devel/ccache-memcached/files/world-ccache.in | 9 -- devel/ccache-memcached/pkg-descr | 6 -- devel/ccache-memcached/pkg-plist | 9 -- 14 files changed, 2 insertions(+), 422 deletions(-) diff --git a/MOVED b/MOVED index 82679dfe8525..7d1557b77cf0 100644 --- a/MOVED +++ b/MOVED @@ -7741,3 +7741,5 @@ multimedia/mlt6-qt5|multimedia/mlt7-qt|2023-06-30|Has expired: Deprecated and un multimedia/mlt6|multimedia/mlt7|2023-06-30|Has expired: Deprecated and unsupported upstream, please consider using multimedia/mlt7 instead devel/electron19||2023-06-30|Has expired: EOLed upstream, switch to newer version devel/electron21||2023-06-30|Has expired: EOLed upstream, switch to newer version +devel/ccache-memcached||2023-06-30|Has expired: Unmaintained fork that targets a very old version of ccache +devel/ccache-memcached-static||2023-06-30|Has expired: Unmaintained fork that targets a very old version of ccache diff --git a/devel/Makefile b/devel/Makefile index f83950853f02..dcd1aead2ff5 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -343,8 +343,6 @@ SUBDIR += cbrowser SUBDIR += cc65 SUBDIR += ccache - SUBDIR += ccache-memcached - SUBDIR += ccache-memcached-static SUBDIR += ccache-static SUBDIR += ccache4 SUBDIR += cccc diff --git a/devel/ccache-memcached-static/Makefile b/devel/ccache-memcached-static/Makefile deleted file mode 100644 index 295bef881772..000000000000 --- a/devel/ccache-memcached-static/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -PKGNAMESUFFIX= -memcached-static - -MASTERDIR= ${.CURDIR}/../ccache-memcached - -OPTIONS_SLAVE= STATIC - -CONFLICTS_INSTALL= ccache ccache-memcached ccache-static - -.include "${MASTERDIR}/Makefile" diff --git a/devel/ccache-memcached/Makefile b/devel/ccache-memcached/Makefile deleted file mode 100644 index ca743a2d9255..000000000000 --- a/devel/ccache-memcached/Makefile +++ /dev/null @@ -1,111 +0,0 @@ -PORTNAME= ccache -PKGNAMESUFFIX?= -memcached -PORTVERSION= 3.5.dev.20180926 -PORTREVISION= 5 -CATEGORIES= devel -MASTER_SITES= LOCAL/bdrewery \ - GH - -MAINTAINER= bdrewery@FreeBSD.org -COMMENT= Tool to minimize the compile time of C/C++ programs -WWW= https://ccache.samba.org/ - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/GPL-3.0.txt - -DEPRECATED= Unmaintained fork that targets a very old version of ccache -EXPIRATION_DATE=2023-06-30 - -USE_GITHUB= yes -GH_TAGNAME= f7712082106bef085515f86ae47e7dbbd2a48b57 - -CONFLICTS_INSTALL?= ccache ccache-static ccache-memcached-static - -GNU_CONFIGURE= yes - -# Some files shared with devel/ccache -CCACHEDIR?= ${MASTERDIR}/../ccache - -HOWTO= ccache-howto-freebsd.txt -SUB_FILES= ${HOWTO} world-ccache pkg-message ccache-update-links.sh - -PORTDOCS= ccache-howto-freebsd.txt MANUAL.html MANUAL.adoc NEWS.adoc \ - NEWS.html - -OPTIONS_DEFINE= CLANGLINK LLVMLINK STATIC DOCS TINDERBOX -OPTIONS_DEFAULT=CLANGLINK LLVMLINK -OPTIONS_SUB= yes - -CLANGLINK_DESC= Create clang compiler links if clang is installed -LLVMLINK_DESC= Create llvm compiler links if llvm is installed -TINDERBOX_DESC= Create tarball for tinderbox usage - -USES= autoreconf compiler gmake pkgconfig - -CONFIGURE_ARGS+= --enable-memcached -LIB_DEPENDS+= libmemcached.so:databases/libmemcached -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${LOCALBASE}/include - -STATIC_CONFIGURE_ENABLE= static -STATIC_LDFLAGS+= -static -# Hack for libsasl2.a requiring HMAC_CTX_reset from hidden libntlm.a. -STATIC_LDFLAGS+= -L${LOCALBASE}/lib/sasl2 - -# While this works in theory it breaks due to install conflict in Poudriere -NO_CCACHE_DEPEND= yes - -.include <bsd.port.options.mk> - -# Extra dependencies needed for generating manpage -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= ${LOCALBASE}/bin/a2x:textproc/asciidoc -ALL_TARGET= all docs -.endif - -.include <bsd.port.pre.mk> - -. if ${COMPILER_TYPE} == clang -CPPFLAGS+= -DCC_IS_CLANG -. elif ${COMPILER_TYPE} == gcc -CPPFLAGS+= -DCC_IS_GCC -. endif - -.include "${CCACHEDIR}/Makefile.compilers" - -SUB_LIST+= HOWTO="${HOWTO}" - -post-build-TINDERBOX-on: - @${MKDIR} ${WRKDIR}/tb/opt - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${WRKDIR}/tb/opt -.for l in ${CCACHE_COMPILERS} - @${LN} -sf ${PORTNAME} ${WRKDIR}/tb/opt/${l} -.endfor - @${TAR} -C ${WRKDIR}/tb -cpf ${WRKSRC}/${PORTNAME}.tar opt - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ccache ${STAGEDIR}${PREFIX}/bin - # Memcached uses the 3.5 dev branch which requires asciidoc to generate - # ccache.1. -.if ${PORT_OPTIONS:MDOCS} - ${INSTALL_MAN} ${WRKSRC}/doc/ccache.1 ${STAGEDIR}${PREFIX}/man/man1 -.endif - ${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world - ${INSTALL_SCRIPT} ${WRKDIR}/world-ccache \ - ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world/ccache - ${INSTALL_SCRIPT} ${WRKDIR}/ccache-update-links.sh \ - ${STAGEDIR}${PREFIX}/bin/ccache-update-links - -do-install-TINDERBOX-on: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.tar ${STAGEDIR}${DATADIR} - -do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/MANUAL.html ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/MANUAL.adoc ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/NEWS.adoc ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/NEWS.html ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${HOWTO} ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.post.mk> diff --git a/devel/ccache-memcached/distinfo b/devel/ccache-memcached/distinfo deleted file mode 100644 index 18e39b465696..000000000000 --- a/devel/ccache-memcached/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1538593371 -SHA256 (ccache-ccache-3.5.dev.20180926-f7712082106bef085515f86ae47e7dbbd2a48b57_GH0.tar.gz) = 7d615ffb6c72b5accc6801d9302cf6109731f605e4b9a08fcb9667a7cbacdd82 -SIZE (ccache-ccache-3.5.dev.20180926-f7712082106bef085515f86ae47e7dbbd2a48b57_GH0.tar.gz) = 367922 diff --git a/devel/ccache-memcached/files/ccache-howto-freebsd.txt.in b/devel/ccache-memcached/files/ccache-howto-freebsd.txt.in deleted file mode 100644 index c86c552c7707..000000000000 --- a/devel/ccache-memcached/files/ccache-howto-freebsd.txt.in +++ /dev/null @@ -1,66 +0,0 @@ -To use ccache for ports and base, just add WITH_CCACHE_BUILD=yes to -/etc/make.conf. The rest of this guide is for building -/usr/src and other checkouts. - -Refer to src.conf(5) for more information specific to base builds. - -------------------------------------------------------------------------------- - -For older releases, before 11.0, add the following to /etc/make.conf. -You can replace cc and c++ with the compilers of your choice. -(remember that only GCC and Clang can build world and kernel) - -.if (!empty(.CURDIR:M/usr/src*) || !empty(.CURDIR:M/usr/obj*)) -.if !defined(NOCCACHE) && exists(%%PREFIX%%/%%CCLINKDIR%%/world/cc) -CC:=${CC:C,^cc,%%PREFIX%%/%%CCLINKDIR%%/world/cc,1} -CXX:=${CXX:C,^c\+\+,%%PREFIX%%/%%CCLINKDIR%%/world/c++,1} -.endif -.endif - -For Korn/Bourne shells Add the following to /etc/profile: - export PATH=%%PREFIX%%/%%CCLINKDIR%%:$PATH - export CCACHE_PATH=/usr/bin:%%LOCALBASE%%/bin - -For csh/tcsh Add the following to /etc/csh.cshrc: - setenv PATH %%PREFIX%%/%%CCLINKDIR%%:$PATH - setenv CCACHE_PATH /usr/bin:%%LOCALBASE%%/bin - -For icc users: - Add %%ICCPREFIX%% to CCACHE_PATH - -------------------------------------------------------------------------------- - -To use distcc: - -For Korn/Bourne shells Add the following to /etc/profile: - export CCACHE_PREFIX=distcc - export DISTCC_HOSTS="localhost host1 host2" - -For csh/tcsh Add the following to /etc/csh.cshrc: - setenv CCACHE_PREFIX distcc - setenv DISTCC_HOSTS "localhost host1 host2" - --- - -If you have a problem building world -define NOCCACHE and try again. - -If you have a problem building a port -reset PATH=$CCACHE_PATH and try again. - --- - -Make sure you run 'ccache-update-links' after you install/uninstall -additional compilers in order to create/remove compiler links. - --- - -Ccache's default cache size is 1GB and this is larger than the default size of -the root partition (/) on FreeBSD. To over come this you may specify a new -cache location on a different partition with the following examples. - -For Korn/Bourne shells Add the following to /etc/profile: - export CCACHE_DIR=/usr/.ccache - -For csh/tcsh Add the following to /etc/csh.cshrc - setenv CCACHE_DIR "/usr/.ccache" diff --git a/devel/ccache-memcached/files/ccache-update-links.sh.in b/devel/ccache-memcached/files/ccache-update-links.sh.in deleted file mode 100644 index bfeb2e220bfb..000000000000 --- a/devel/ccache-memcached/files/ccache-update-links.sh.in +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# Author: Emanuel Haupt <ehaupt@FreeBSD.org> - -CCACHE_COMPILERS="%%CCACHE_COMPILERS%% ${EXTRA_COMPILERS}" -CCLINKDIR="%%CCLINKDIR%%" -PREFIX="%%PREFIX%%" - -usage() { - cat << "EOUSAGE" -Usage: ccache-update-links [hv] - -ccache-update-links maintains symlinks needed by ccache to work with additional -compilers. - - -h, --help this help - -v verbose - -EOUSAGE -} - -case "$1" -in - -h|--help) - usage - ;; -esac - -strip_path() { - local IFS=":" - local path - set -- ${PATH} - while [ $# -gt 0 ]; do - if ! [ "${1}" = "${PREFIX}/libexec/ccache" ]; then - path="${path}${path:+:}${1}" - fi - shift - done - echo "${path}" -} - -# Remove ccache wrappers from PATH -PATH=$(strip_path) - -# create compiler links -for comp in ${CCACHE_COMPILERS} -do - if command -v "${comp}" >/dev/null; then - if [ ! -L "${PREFIX}/${CCLINKDIR}/${comp}" ]; then - [ "$1" = "-v" ] && echo "create symlink for ${comp}" - ln -sf ${PREFIX}/bin/ccache ${PREFIX}/${CCLINKDIR}/${comp} - fi - - if [ ! -L "${PREFIX}/${CCLINKDIR}/world/${comp}" ]; then - [ "$1" = "-v" ] && echo "create symlink for ${comp} (world)" - ln -sf ccache ${PREFIX}/${CCLINKDIR}/world/${comp} - fi - else - if [ -L "${PREFIX}/${CCLINKDIR}/${comp}" ]; then - [ "$1" = "-v" ] && echo "remove symlink for ${comp}" - rm -f ${PREFIX}/${CCLINKDIR}/${comp} - fi - - if [ -L "${PREFIX}/${CCLINKDIR}/world/${comp}" ]; then - [ "$1" = "-v" ] && echo "remove symlink for ${comp} (world)" - rm -f ${PREFIX}/${CCLINKDIR}/world/${comp} - fi - fi -done diff --git a/devel/ccache-memcached/files/patch-Makefile.in b/devel/ccache-memcached/files/patch-Makefile.in deleted file mode 100644 index 4d3c9bed421b..000000000000 --- a/devel/ccache-memcached/files/patch-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -libmemcached is a c++ library. To link statically we need to use cxx rather -than cc to ensure libc++ is linked in. - ---- Makefile.in.orig 2017-03-09 13:00:34.016595000 -0800 -+++ Makefile.in 2017-03-09 13:00:39.656086000 -0800 -@@ -74,7 +74,7 @@ files_to_distclean = Makefile config.h c - all: ccache$(EXEEXT) - - ccache$(EXEEXT): $(ccache_objs) $(extra_libs) -- $(CC) $(all_cflags) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS) -+ $(CXX) $(all_cflags) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS) - - .PHONY: install - install: all $(srcdir)/ccache.1 diff --git a/devel/ccache-memcached/files/patch-configure.ac b/devel/ccache-memcached/files/patch-configure.ac deleted file mode 100644 index a089a7e07f22..000000000000 --- a/devel/ccache-memcached/files/patch-configure.ac +++ /dev/null @@ -1,59 +0,0 @@ ---- configure.ac.orig 2017-07-27 13:36:38.827581000 -0700 -+++ configure.ac 2017-07-27 13:39:10.856958000 -0700 -@@ -28,6 +28,10 @@ AC_PROG_CC_C99 - if test "$ac_cv_prog_cc_c99" = no; then - AC_MSG_ERROR(cannot find a C99-compatible compiler) - fi -+AC_PROG_CXX -+if test "$ac_cv_prog_cxx" = no; then -+ AC_MSG_ERROR(cannot find a C++-compatible compiler) -+fi - - AC_PROG_CPP - AC_PROG_INSTALL -@@ -97,19 +101,39 @@ AC_ARG_ENABLE(memcached, - [AS_HELP_STRING([--enable-memcached], - [enable memcached as a cache backend])]) - -+# Need to use C++ compiler for linking -lmemcached as static, rather than -+# hacking in GCC's -lstdc++, since we may be using Clang. -+AC_LANG(C++) - dnl enable-memcached: Check if -lmemcached is needed. - if test x${enable_memcached} != x; then -- if test x${enable_static} != x; then -+ if false && test x${enable_static} != x; then - AC_CHECK_LIB(stdc++, __gxx_personality_v0,[]) - fi - AC_CHECK_LIB(pthread, pthread_once) -- AC_CHECK_LIB(memcached, memcached,[],[ -- echo ' WARNING: recent version libmemcached not found' -- echo ' please install libmemcached > 1.0 with development files' -- exit 1 -- ]) -+ if test x${enable_static} = xyes; then -+ AC_CHECK_LIB(sasl2, sasl_version, ac_cv_have_libsasl2=yes, -+ ac_cv_have_libsasl2=no, -lntlm -lcrypto -lopie -lmd) -+ fi -+ if test x$ac_cv_have_libsasl2 = xyes; then -+ AC_CHECK_LIB(memcached, memcached,[ -+ LIBS="${LIBS} -lmemcached -lsasl2 -lntlm -lcrypto -lopie -lmd" -+ AC_DEFINE(HAVE_LIBMEMCACHED, 1) -+ ] -+ ,[ -+ echo ' WARNING: recent version libmemcached not found' -+ echo ' please install libmemcached > 1.0 with development files' -+ exit 1 -+ ], -lsasl2 -lntlm -lcrypto -lopie -lmd) -+ else -+ AC_CHECK_LIB(memcached, memcached,[],[ -+ echo ' WARNING: recent version libmemcached not found' -+ echo ' please install libmemcached > 1.0 with development files' -+ exit 1 -+ ]) -+ fi - ccache_memcached='CCACHE_MEMCACHED=1 ' - fi -+AC_LANG(C) - - dnl Check for zlib - AC_ARG_WITH(bundled-zlib, diff --git a/devel/ccache-memcached/files/patch-src__ccache.c b/devel/ccache-memcached/files/patch-src__ccache.c deleted file mode 100644 index 62be558d1bad..000000000000 --- a/devel/ccache-memcached/files/patch-src__ccache.c +++ /dev/null @@ -1,56 +0,0 @@ -- Determine whether cc(1) is clang or gcc at compile-time. -- Don't hash -fcolor-diagnostics; make will auto use it while make -j will not. - There's no reason to not use the cache in either of these cases if it is - already available. --bdrewery - - ---- src/ccache.c.orig 2018-03-25 13:24:05.000000000 -0700 -+++ src/ccache.c 2018-06-26 11:44:03.336177000 -0700 -@@ -487,6 +487,16 @@ guess_compiler(const char *path) - } else if (str_eq(name, "pump") || str_eq(name, "distcc-pump")) { - result = GUESSED_PUMP; - } -+#if defined(CC_IS_CLANG) || defined(CC_IS_GCC) -+ if (result == GUESSED_UNKNOWN && -+ (strcmp(name, "cc") == 0 || strcmp(name, "CC") == 0 || -+ strcmp(name, "c++") == 0)) -+#if defined(CC_IS_CLANG) -+ result = GUESSED_CLANG; -+#elif defined(CC_IS_GCC) -+ result = GUESSED_GCC; -+#endif -+#endif - free(name); - return result; - } -@@ -1657,6 +1667,7 @@ calculate_common_hash(struct args *args, struct mdfour - free(p); - } - -+#if 0 - // Possibly hash GCC_COLORS (for color diagnostics). - if (guessed_compiler == GUESSED_GCC) { - const char *gcc_colors = getenv("GCC_COLORS"); -@@ -1665,6 +1676,7 @@ calculate_common_hash(struct args *args, struct mdfour - hash_string(hash, gcc_colors); - } - } -+#endif - } - - // Update a hash sum with information specific to the direct and preprocessor -@@ -1697,6 +1709,13 @@ calculate_object_hash(struct args *args, struct mdfour - - // -Wl,... doesn't affect compilation (except for clang). - if (str_startswith(args->argv[i], "-Wl,") && !is_clang) { -+ continue; -+ } -+ -+ /* Colors do not affect compilation. */ -+ if (str_startswith(args->argv[i], "-fcolor-diagnostics") || -+ str_eq(args->argv[i], "-fdiagnostics-color") || -+ str_eq(args->argv[i], "-fdiagnostics-color=always")) { - continue; - } - diff --git a/devel/ccache-memcached/files/pkg-message.in b/devel/ccache-memcached/files/pkg-message.in deleted file mode 100644 index 088912983fd3..000000000000 --- a/devel/ccache-memcached/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: <<EOM -NOTE: -Please read %%DOCSDIR%%/%%HOWTO%% for -information on using ccache with FreeBSD ports and src. -EOM -} -] diff --git a/devel/ccache-memcached/files/world-ccache.in b/devel/ccache-memcached/files/world-ccache.in deleted file mode 100644 index 9803d12b8298..000000000000 --- a/devel/ccache-memcached/files/world-ccache.in +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -[ "${0##*/}" = "ccache" ] && - printf "Please, use one of the compiler links in\n%%PREFIX%%/%%CCLINKDIR%%/world\nto invoke ccache\n" >&2 && - exit 1 - -unset CCACHE_PATH -export CCACHE_COMPILERCHECK=content -exec %%PREFIX%%/%%CCLINKDIR%%/${0##*/} "$@" diff --git a/devel/ccache-memcached/pkg-descr b/devel/ccache-memcached/pkg-descr deleted file mode 100644 index 56405a5bec77..000000000000 --- a/devel/ccache-memcached/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -ccache is a compiler cache. It acts as a caching pre-processor to C/C++ -compilers, using the -E compiler switch and a hash to detect when a -compilation can be satisfied from cache. This often results in a 5 to 10 -times speedup in common compilations. - -ccache-memcached is an older fork with memcached support. diff --git a/devel/ccache-memcached/pkg-plist b/devel/ccache-memcached/pkg-plist deleted file mode 100644 index d85d009442a1..000000000000 --- a/devel/ccache-memcached/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/ccache -bin/ccache-update-links -@comment manpage requires extra dependencies -%%DOCS%%man/man1/ccache.1.gz -%%CCLINKDIR%%/world/ccache -%%TINDERBOX%%%%DATADIR%%/ccache.tar -@postexec echo "Create compiler links..." -@postexec %D/bin/ccache-update-links -v -@preunexec find %D/%%CCLINKDIR%% -type l -exec rm -f {} \;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306302123.35ULNL1K078708>