CVS commit: pkgsrc/archivers/lz4

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Wed Jun 14 11:07:43 UTC 2023

Modified Files:
        pkgsrc/archivers/lz4: Makefile distinfo
Added Files:
        pkgsrc/archivers/lz4/patches: patch-contrib_gen__manual_Makefile

Log Message:
archivers/lz4: Fix cross-compilation.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/archivers/lz4/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/archivers/lz4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/archivers/lz4/patches/patch-contrib_gen__manual_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/lz4/Makefile
diff -u pkgsrc/archivers/lz4/Makefile:1.25 pkgsrc/archivers/lz4/Makefile:1.26
--- pkgsrc/archivers/lz4/Makefile:1.25  Tue Aug 16 13:02:56 2022
+++ pkgsrc/archivers/lz4/Makefile       Wed Jun 14 11:07:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2022/08/16 13:02:56 adam Exp $
+# $NetBSD: Makefile,v 1.26 2023/06/14 11:07:42 riastradh Exp $
 
 DISTNAME=      lz4-1.9.4
 CATEGORIES=    archivers
@@ -18,4 +18,10 @@ TEST_TARGET=         test
 # Needed for nanosleep() on Solaris 10, PR pkg/56226
 LDFLAGS.SunOS+=                -lrt
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${USE_CROSS_COMPILE:U:tl} == "yes"
+MAKE_FLAGS+=           CXX_FOR_BUILD=${NATIVE_CXX:Q}
+.endif
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/archivers/lz4/distinfo
diff -u pkgsrc/archivers/lz4/distinfo:1.23 pkgsrc/archivers/lz4/distinfo:1.24
--- pkgsrc/archivers/lz4/distinfo:1.23  Tue Aug 16 13:02:56 2022
+++ pkgsrc/archivers/lz4/distinfo       Wed Jun 14 11:07:42 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.23 2022/08/16 13:02:56 adam Exp $
+$NetBSD: distinfo,v 1.24 2023/06/14 11:07:42 riastradh Exp $
 
 BLAKE2s (lz4-1.9.4.tar.gz) = 47eac8d4a549b2ab125e6b44d9c0acd1ed2c4d0e86054ecacc5f9704a0d4c208
 SHA512 (lz4-1.9.4.tar.gz) = 043a9acb2417624019d73db140d83b80f1d7c43a6fd5be839193d68df8fd0b3f610d7ed4d628c2a9184f7cde9a0fd1ba9d075d8251298e3eb4b3a77f52736684
 Size (lz4-1.9.4.tar.gz) = 354063 bytes
 SHA1 (patch-Makefile.inc) = 7f27fb9d4cde9c14623c8fce167990bec0332161
+SHA1 (patch-contrib_gen__manual_Makefile) = c29514de7920f484e4b00b8fd79ce4d8d2e80428
 SHA1 (patch-lib_Makefile) = 64441f91217cf5832f122ed32a31007b4a8dc5f4
 SHA1 (patch-programs_Makefile) = bf3a8b296bfac8407c3e233c41fa037ba989876c

Added files:

Index: pkgsrc/archivers/lz4/patches/patch-contrib_gen__manual_Makefile
diff -u /dev/null pkgsrc/archivers/lz4/patches/patch-contrib_gen__manual_Makefile:1.1
--- /dev/null   Wed Jun 14 11:07:43 2023
+++ pkgsrc/archivers/lz4/patches/patch-contrib_gen__manual_Makefile     Wed Jun 14 11:07:42 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-contrib_gen__manual_Makefile,v 1.1 2023/06/14 11:07:42 riastradh Exp $
+
+Handle cross-compilation.
+
+--- contrib/gen_manual/Makefile.orig   2022-08-15 22:45:31.000000000 +0000
++++ contrib/gen_manual/Makefile
+@@ -56,8 +56,9 @@ endif
+ .PHONY: default
+ default: gen_manual
+ 
++CXX_FOR_BUILD = $(CXX)
+ gen_manual: gen_manual.cpp
+-      $(CXX) $(FLAGS) $^ -o $@$(EXT)
++      $(CXX_FOR_BUILD) $(FLAGS) $^ -o $@$(EXT)
+ 
+ $(LZ4MANUAL) : gen_manual $(LZ4API)
+       echo "Update lz4 manual in /doc"