CVS commit: pkgsrc/filesystems

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Aug  6 18:55:00 UTC 2024

Modified Files:
        pkgsrc/filesystems/glusterfs: distinfo
        pkgsrc/filesystems/glusterfs/patches: patch-configure.ac
        pkgsrc/filesystems/glusterfs8: Makefile

Log Message:
filesystems/gluster: Fix cross-build.

No change for native build -- conditional on USE_CROSS_COMPILE=yes in
pkgsrc makefile, cross_compiling=yes in configure script.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/filesystems/glusterfs/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/filesystems/glusterfs/patches/patch-configure.ac
cvs rdiff -u -r1.9 -r1.10 pkgsrc/filesystems/glusterfs8/Makefile

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

Modified files:

Index: pkgsrc/filesystems/glusterfs/distinfo
diff -u pkgsrc/filesystems/glusterfs/distinfo:1.80 pkgsrc/filesystems/glusterfs/distinfo:1.81
--- pkgsrc/filesystems/glusterfs/distinfo:1.80  Tue Aug  6 18:54:01 2024
+++ pkgsrc/filesystems/glusterfs/distinfo       Tue Aug  6 18:55:00 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.80 2024/08/06 18:54:01 riastradh Exp $
+$NetBSD: distinfo,v 1.81 2024/08/06 18:55:00 riastradh Exp $
 
 BLAKE2s (glusterfs-10.4.tar.gz) = 9813ba102591f6ab715fc7d3dc089860888effe70dc146a4366667be0cc9bd0c
 SHA512 (glusterfs-10.4.tar.gz) = 06c563ab77a29145b1fac44f5a56a91539accb69ba736fe6297aa3f38b128e68ba4f7d0b49ac6eb56397a51950fb4de882ff60037e91c61ad13dd89a18139d82
@@ -6,7 +6,7 @@ Size (glusterfs-10.4.tar.gz) = 8293872 b
 SHA1 (patch-api_src_glfs.c) = 0092cae6a58a58b58e51a5aa90a4423ac32f0100
 SHA1 (patch-cli_src_cli-cmd-parser.c) = 50415e57abe2e7385df326434cde357958070356
 SHA1 (patch-cli_src_cli-xml-output.c) = 44326b6936bc2576fcce74b0a5390f1b641354a7
-SHA1 (patch-configure.ac) = bc76ecb683f7a6eef32d6b11f86df4760c12e032
+SHA1 (patch-configure.ac) = aa9da3d124299e6f42664408234318aee10d9061
 SHA1 (patch-contrib_umountd_umountd.c) = 631ecf62ff5815d1d935b12ccf0e8d285eed4319
 SHA1 (patch-events-src-Makefile.am) = 5a112994c9990962a19eecd3933dabb18d5db2b0
 SHA1 (patch-events-tools-Makefile.am) = b224ed16200befdb68e51eebd762257a0911e591

Index: pkgsrc/filesystems/glusterfs/patches/patch-configure.ac
diff -u pkgsrc/filesystems/glusterfs/patches/patch-configure.ac:1.5 pkgsrc/filesystems/glusterfs/patches/patch-configure.ac:1.6
--- pkgsrc/filesystems/glusterfs/patches/patch-configure.ac:1.5 Tue Jun  6 00:58:05 2023
+++ pkgsrc/filesystems/glusterfs/patches/patch-configure.ac     Tue Aug  6 18:55:00 2024
@@ -1,7 +1,11 @@
-$NetBSD: patch-configure.ac,v 1.5 2023/06/06 00:58:05 gutteridge Exp $
+$NetBSD: patch-configure.ac,v 1.6 2024/08/06 18:55:00 riastradh Exp $
 
 Check for sizeof(time_t).
 
+Leave GF_DISTRIBUTION empty in cross-builds, not set to Unspecified
+which breaks things.  (Maybe we should set this in CONFIGURE_ARGS if we
+can determine it.)
+
 Defang bash 4.0 syntax in configure
 (https://github.com/gluster/glusterfs/issues/3940).
 
@@ -19,7 +23,16 @@ Defang bash 4.0 syntax in configure
  # YACC needs a check
  AC_PROG_YACC
  if test "x${YACC}" = "xbyacc" -o "x${YACC}" = "xyacc" -o "x${YACC}" = "x"; then
-@@ -1899,10 +1904,10 @@
+@@ -1276,8 +1281,6 @@ if test x$cross_compiling != xyes; then
+     if test "x$ac_cv_file__etc_redhat_release" = "xyes"; then
+         GF_DISTRIBUTION=Redhat
+     fi
+-else
+-    GF_DISTRIBUTION=Unspecified
+ fi
+ 
+ AC_SUBST(GF_DISTRIBUTION)
+@@ -1899,10 +1902,10 @@ echo "Enable Brick Mux     : $USE_BRICKM
  echo "Building with LTO    : $LTO_BUILD"
  echo
  

Index: pkgsrc/filesystems/glusterfs8/Makefile
diff -u pkgsrc/filesystems/glusterfs8/Makefile:1.9 pkgsrc/filesystems/glusterfs8/Makefile:1.10
--- pkgsrc/filesystems/glusterfs8/Makefile:1.9  Tue Aug  6 18:54:02 2024
+++ pkgsrc/filesystems/glusterfs8/Makefile      Tue Aug  6 18:55:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/08/06 18:54:02 riastradh Exp $
+# $NetBSD: Makefile,v 1.10 2024/08/06 18:55:00 riastradh Exp $
 
 DISTNAME=      glusterfs-8.2
 PKGREVISION=   17
@@ -121,6 +121,13 @@ CONFIGURE_ARGS+=   --enable-debug
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+CONFIGURE_ARGS+=       ac_cv_file__etc_centos_release=no
+CONFIGURE_ARGS+=       ac_cv_file__etc_debian_version=no
+CONFIGURE_ARGS+=       ac_cv_file__etc_SuSE_release=no
+CONFIGURE_ARGS+=       ac_cv_file__etc_redhat_release=no
+.endif
+
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/argp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"