On 2020/11/15 07:40, Jeremie Courreges-Anglas wrote: > CVSROOT: /cvs > Module name: ports > Changes by: j...@cvs.openbsd.org 2020/11/15 07:40:50 > > Modified files: > devel/ccache : Makefile > > Log message: > Typo in comment > > Noticed after learning about a ccache-4.0 release and checking our port. ;) >
fwiw, here's a diff for the update - I haven't committed it because it introduces circular dependencies if building from scratch with USE_CCACHE. Index: Makefile =================================================================== RCS file: /cvs/ports/devel/ccache/Makefile,v retrieving revision 1.65 diff -u -p -r1.65 Makefile --- Makefile 15 Nov 2020 14:40:50 -0000 1.65 +++ Makefile 15 Nov 2020 16:21:24 -0000 @@ -2,7 +2,7 @@ COMMENT = compiler cache -V = 3.7.12 +V = 4.0 DISTNAME = ccache-$V CATEGORIES = devel @@ -16,13 +16,14 @@ WANTLIB += c m z MASTER_SITES = https://github.com/ccache/ccache/releases/download/v$V/ -CONFIGURE_STYLE = gnu +MODULES = devel/cmake DEBUG_PACKAGES = ${BUILD_PACKAGES} -# This port should not have build/run dependencies. NO_CCACHE = Yes DWZ = : +CFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 +CXXFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 # Failure in cpp1 test suite appears to be due to an embedded filename # in a .o file present in one file, and not present in the file being Index: distinfo =================================================================== RCS file: /cvs/ports/devel/ccache/distinfo,v retrieving revision 1.45 diff -u -p -r1.45 distinfo --- distinfo 2 Oct 2020 18:45:00 -0000 1.45 +++ distinfo 15 Nov 2020 16:21:24 -0000 @@ -1,2 +1,2 @@ -SHA256 (ccache-3.7.12.tar.gz) = 0qvojUwoPOlg4jNYMGESexVv+wJ8baPPEHcPwMckQZQ= -SIZE (ccache-3.7.12.tar.gz) = 506948 +SHA256 (ccache-4.0.tar.gz) = rJevhmeQKOvIVVyZMYNSWI/1D1Ffw6f47SGorTZ+PUU= +SIZE (ccache-4.0.tar.gz) = 518384 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 5 Feb 2020 00:12:44 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,50 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.6 2020/02/05 00:12:44 sthen Exp $ - -remove gmake-isms - this port needs to have no dependencies (for USE_CCACHE) - -get rid of warning spam during build, -: $(if $(quiet),@echo "...")' expands to '' - - -Index: Makefile.in ---- Makefile.in.orig -+++ Makefile.in -@@ -105,19 +105,15 @@ files_to_distclean = Makefile config.h config.log conf - all: ccache$(EXEEXT) - - ccache$(EXEEXT): $(ccache_objs) $(extra_libs) -- $(if $(quiet),@echo " LD $@") - $(Q)$(CC) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS) - - ccache.1: doc/ccache.1 -- $(if $(quiet),@echo " CP $@") -- $(Q)cp $< $@ -+ $(Q)cp $> $@ - - .PHONY: install - install: ccache$(EXEEXT) @disable_man@ccache.1 -- $(if $(quiet),@echo " INSTALL ccache$(EXEEXT)") - $(Q)$(installcmd) -d $(DESTDIR)$(bindir) - $(Q)$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir) --@disable_man@ $(if $(quiet),@echo " INSTALL ccache.1") - @disable_man@ $(Q)$(installcmd) -d $(DESTDIR)$(mandir)/man1 - @disable_man@ $(Q)-$(installcmd) -m 644 ccache.1 $(DESTDIR)$(mandir)/man1/ - -@@ -125,9 +121,6 @@ install: ccache$(EXEEXT) @disable_man@ccache.1 - clean: - rm -rf $(files_to_clean) - --$(non_3pp_objs) $(test_objs): CFLAGS += @more_warnings@ -- --src/snprintf.o: CFLAGS += @no_implicit_fallthrough_warning@ - $(zlib_objs): CPPFLAGS += -include config.h - $(zlib_objs): CFLAGS += @no_implicit_fallthrough_warning@ - -@@ -176,7 +169,6 @@ installcheck: ccache$(EXEEXT) unittest/run$(EXEEXT) - CCACHE=$(bindir)/ccache CC='$(CC)' $(BASH) $(srcdir)/test/run - - .c.o: -- $(if $(quiet),@echo " CC $@") - $(Q)$(CC) $(all_cppflags) $(all_cflags) -c -o $@ $< - - @include_dev_mk@ Index: patches/patch-cmake_config_h_in =================================================================== RCS file: patches/patch-cmake_config_h_in diff -N patches/patch-cmake_config_h_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cmake_config_h_in 15 Nov 2020 16:21:24 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: cmake/config.h.in +--- cmake/config.h.in.orig ++++ cmake/config.h.in +@@ -32,7 +32,7 @@ + + #if defined(__SunOS_5_8) || defined(__SunOS_5_9) || defined(__SunOS_5_10) + # define _XOPEN_SOURCE 500 +-#elif !defined(__SunOS_5_11) && !defined(__APPLE__) ++#elif !defined(__SunOS_5_11) && !defined(__APPLE__) && !defined(__OpenBSD__) + # define _XOPEN_SOURCE + #endif + Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 10 Nov 2019 18:38:47 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-configure,v 1.8 2019/11/10 18:38:47 sthen Exp $ - -avoid nested functions in configure test (gcc extension) - -Index: configure ---- configure.orig -+++ configure -@@ -4760,10 +4760,11 @@ else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <stdlib.h> -+ void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); } - int - main () - { --void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); } -+ - ; - return 0; - } Index: patches/patch-src_Logging_cpp =================================================================== RCS file: patches/patch-src_Logging_cpp diff -N patches/patch-src_Logging_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_Logging_cpp 15 Nov 2020 16:21:24 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/Logging.cpp +--- src/Logging.cpp.orig ++++ src/Logging.cpp +@@ -87,7 +87,7 @@ do_log(string_view message, bool bulk) + if (tm) { + strftime(timestamp, sizeof(timestamp), "%Y-%m-%dT%H:%M:%S", &*tm); + } else { +- snprintf(timestamp, sizeof(timestamp), "%lu", tv.tv_sec); ++ snprintf(timestamp, sizeof(timestamp), "%lld", (long long)tv.tv_sec); + } + snprintf(prefix, + sizeof(prefix), Index: patches/patch-src_util_c =================================================================== RCS file: patches/patch-src_util_c diff -N patches/patch-src_util_c --- patches/patch-src_util_c 13 Feb 2018 16:08:06 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_util_c,v 1.1 2018/02/13 16:08:06 sthen Exp $ - -Index: src/util.c ---- src/util.c.orig -+++ src/util.c -@@ -15,6 +15,11 @@ - // this program; if not, write to the Free Software Foundation, Inc., 51 - // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <stdio.h> -+#include <string.h> -+ - #include "ccache.h" - - #include <zlib.h>
