CVS commit: pkgsrc/filesystems/ltfs/patches

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Thu Mar 24 16:35:31 UTC 2022

Added Files:
        pkgsrc/filesystems/ltfs/patches: patch-messages_make_message_src.sh
            patch-src_ltfs_fuse.c

Log Message:
dd missing patch (Hi Thomas!)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/filesystems/ltfs/patches/patch-messages_make_message_src.sh \
    pkgsrc/filesystems/ltfs/patches/patch-src_ltfs_fuse.c

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

Added files:

Index: pkgsrc/filesystems/ltfs/patches/patch-messages_make_message_src.sh
diff -u /dev/null pkgsrc/filesystems/ltfs/patches/patch-messages_make_message_src.sh:1.1
--- /dev/null   Thu Mar 24 16:35:31 2022
+++ pkgsrc/filesystems/ltfs/patches/patch-messages_make_message_src.sh  Thu Mar 24 16:35:31 2022
@@ -0,0 +1,37 @@
+$NetBSD: patch-messages_make_message_src.sh,v 1.1 2022/03/24 16:35:31 manu Exp $
+
+Build all .o generated by ICU to spare undefined symbol errors
+
+--- messages/make_message_src.sh.orig  2019-03-15 05:24:46.000000000 +0100
++++ messages/make_message_src.sh       2022-03-22 17:16:40.802122202 +0100
+@@ -77,19 +77,22 @@
+                       ;;
+               NetBSD)
+                       # generate libtool archive for later linking
+                       mv lib${BASENAME}.a ../../lib${BASENAME}_dat.a
+-                      OBJFILE=${BASENAME}_dat.o
+-                      LTFILE=${BASENAME}_dat.lo
+                       mkdir -p .libs ../../.libs
+-                      mv ${OBJFILE} .libs
++                      LTFILES=""
+                       LTVERS=`libtool --version | 
+                           sed -e 's/^\([^ ]*\) (GNU \(.*\)) \(.*\)$$/\1 - GNU \2 \3/' -e q` 
+-                      echo "# ${OBJFILE} - a libtool object file" > ${LTFILE}
+-                      echo "# Generated by ${LTVERS}" >> ${LTFILE}
+-                      echo "pic_object='.libs/${OBJFILE}'" >> ${LTFILE}
+-                      echo "non_pic_object=none" >> ${LTFILE}
+-                      libtool --mode=link --tag=CC cc -o ../../lib${BASENAME}_dat.la ${LTFILE}
++                      for OBJFILE in *.o ; do 
++                              LTFILE=${OBJFILE%.o}.lo
++                              mv ${OBJFILE} .libs
++                              echo "# ${OBJFILE} - a libtool object file" > ${LTFILE}
++                              echo "# Generated by ${LTVERS}" >> ${LTFILE}
++                              echo "pic_object='.libs/${OBJFILE}'" >> ${LTFILE}
++                              echo "non_pic_object=none" >> ${LTFILE}
++                              LTFILES="${LTFILES} ${LTFILE}"
++                      done
++                      libtool --mode=link --tag=CC cc -o ../../lib${BASENAME}_dat.la ${LTFILES}
+                       ;;
+               *)
+                       mv ${BASENAME}_dat.o ../../lib${BASENAME}_dat.a
+                       ;;
Index: pkgsrc/filesystems/ltfs/patches/patch-src_ltfs_fuse.c
diff -u /dev/null pkgsrc/filesystems/ltfs/patches/patch-src_ltfs_fuse.c:1.1
--- /dev/null   Thu Mar 24 16:35:31 2022
+++ pkgsrc/filesystems/ltfs/patches/patch-src_ltfs_fuse.c       Thu Mar 24 16:35:31 2022
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_ltfs_fuse.c,v 1.1 2022/03/24 16:35:31 manu Exp $
+
+Do not take for granted that __WORDSIZE is defined to distinguish 
+between 32 and 64 bit platforms. Instead use ULONG_MAX from <limits.h>
+which is mandared by ISO C99.
+
+--- src/ltfs_fuse.c.orig       2022-03-24 10:08:47.455171288 +0100
++++ src/ltfs_fuse.c    2022-03-24 10:21:27.627832669 +0100
+@@ -53,8 +53,11 @@
+ **                  piste%jp.ibm.com@localhost
+ **
+ *************************************************************************************
+ */
++
++#include <limits.h> /* for ULONG_MAX */
++
+ #include "ltfs_fuse.h"
+ #include "libltfs/ltfs_fsops.h"
+ #include "libltfs/iosched.h"
+ #include "libltfs/pathname.h"
+@@ -67,9 +70,9 @@
+ #ifdef mingw_PLATFORM
+ #include "libltfs/arch/win/win_util.h"
+ #endif
+ 
+-#if (__WORDSIZE == 64)
++#if (__WORDSIZE == 64 || ULONG_MAX == 0xffffffffffffffffUL)
+ #define FILEHANDLE_TO_STRUCT(fh) ((struct ltfs_file_handle *)(uint64_t)(fh))
+ #define STRUCT_TO_FILEHANDLE(de) ((uint64_t)(de))
+ #else
+ #define FILEHANDLE_TO_STRUCT(fh) ((struct ltfs_file_handle *)(uint32_t)(fh))