Wed Jan 4 12:26:08 2023 UTC ()
Pullup ticket #6713 - requested by gutteridge
devel/ccache: i386 build fix

Revisions pulled up:
- devel/ccache/Makefile                                         1.68

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Wed Jan  4 02:26:47 UTC 2023

   Modified Files:
            pkgsrc/devel/ccache: Makefile

   Log Message:
   ccache: fix builds on i386 (and possibly other arches)

   Addresses PR pkg/57157 from ano(ther)nymous.


(bsiegert)
diff -r1.67 -r1.67.2.1 pkgsrc/devel/ccache/Makefile
cvs diff -r1.67 -r1.67.2.1 pkgsrc/devel/ccache/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ccache/Makefile 2022/12/09 16:14:12 1.67
+++ pkgsrc/devel/ccache/Makefile 2023/01/04 12:26:08 1.67.2.1
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.67 2022/12/09 16:14:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.67.2.1 2023/01/04 12:26:08 bsiegert Exp $
2 2
3DISTNAME= ccache-4.7.4 3DISTNAME= ccache-4.7.4
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=ccache/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=ccache/}
7GITHUB_RELEASE= v${PKGVERSION_NOREV} 7GITHUB_RELEASE= v${PKGVERSION_NOREV}
8# Do not use xz distfile here; xz needs gettext-lib which leads to circular 8# Do not use xz distfile here; xz needs gettext-lib which leads to circular
9# dependencies on some platforms. 9# dependencies on some platforms.
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://ccache.dev/ 12HOMEPAGE= https://ccache.dev/
13COMMENT= Cache for C/C++ compilers 13COMMENT= Cache for C/C++ compilers
14LICENSE= gnu-gpl-v3 AND modified-bsd AND public-domain AND zlib 14LICENSE= gnu-gpl-v3 AND modified-bsd AND public-domain AND zlib
15 15
16USE_CMAKE= yes 16USE_CMAKE= yes
17USE_LANGUAGES= c99 c++17 17USE_LANGUAGES= c99 c++17
@@ -21,14 +21,15 @@ TEST_TARGET= test @@ -21,14 +21,15 @@ TEST_TARGET= test
21GCC_REQD= 8 # std::filesystem 21GCC_REQD= 8 # std::filesystem
22 22
23.include "../../lang/ruby/rubyversion.mk" 23.include "../../lang/ruby/rubyversion.mk"
24TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor 24TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor
25 25
26SUBST_CLASSES+= rubyver 26SUBST_CLASSES+= rubyver
27SUBST_SED.rubyver+= -e "s/asciidoctor/asciidoctor${RUBY_SUFFIX}/" 27SUBST_SED.rubyver+= -e "s/asciidoctor/asciidoctor${RUBY_SUFFIX}/"
28SUBST_FILES.rubyver+= doc/CMakeLists.txt 28SUBST_FILES.rubyver+= doc/CMakeLists.txt
29SUBST_STAGE.rubyver= pre-configure 29SUBST_STAGE.rubyver= pre-configure
30SUBST_MESSAGE.rubyver= Fixing asciidoctor executable name. 30SUBST_MESSAGE.rubyver= Fixing asciidoctor executable name.
31 31
32.include "../../archivers/zstd/buildlink3.mk" 32.include "../../archivers/zstd/buildlink3.mk"
33.include "../../databases/hiredis/buildlink3.mk" 33.include "../../databases/hiredis/buildlink3.mk"
 34.include "../../mk/atomic64.mk"
34.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"