Orion Poplawski
5 years ago
parent
298288fd68
commit
fb205c10df
@ -1,13 +0,0 @@
|
|||||||
Index: hdf5/java/src/jni/h5pFCPLImp.c
|
|
||||||
===================================================================
|
|
||||||
--- hdf5.orig/java/src/jni/h5pFCPLImp.c
|
|
||||||
+++ hdf5/java/src/jni/h5pFCPLImp.c
|
|
||||||
@@ -240,7 +240,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1sym_1k
|
|
||||||
|
|
||||||
done:
|
|
||||||
if (theArray)
|
|
||||||
- UNPIN_LONG_ARRAY(ENVONLY, size, theArray, (status < 0) ? JNI_ABORT : 0);
|
|
||||||
+ UNPIN_INT_ARRAY(ENVONLY, size, theArray, (status < 0) ? JNI_ABORT : 0);
|
|
||||||
|
|
||||||
return (jint)status;
|
|
||||||
} /* end Java_hdf_hdf5lib_H5_H5Pget_1sym_1k */
|
|
||||||
@ -1,21 +1,20 @@
|
|||||||
diff -up hdf5-1.8.13/src/Makefile.am.LD_LIBRARY_PATH hdf5-1.8.13/src/Makefile.am
|
--- hdf5-1.12.0/src/Makefile.am~ 2020-02-29 00:29:58.000000000 +0100
|
||||||
--- hdf5-1.8.13/src/Makefile.am.LD_LIBRARY_PATH 2014-05-05 20:13:01.000000000 -0600
|
+++ hdf5-1.12.0/src/Makefile.am 2021-02-26 16:10:03.612252484 +0100
|
||||||
+++ hdf5-1.8.13/src/Makefile.am 2014-05-15 09:53:59.569476295 -0600
|
@@ -156,8 +156,6 @@
|
||||||
@@ -128,8 +128,6 @@ settings_DATA=libhdf5.settings
|
|
||||||
# Remove the generated .c file if errors occur unless HDF5_Make_Ignore
|
# Remove the generated .c file if errors occur unless HDF5_Make_Ignore
|
||||||
# is set to ignore the error.
|
# is set to ignore the error.
|
||||||
H5Tinit.c: H5detect$(EXEEXT)
|
H5Tinit.c: H5detect$(EXEEXT)
|
||||||
- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \
|
- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \
|
||||||
- sed -e 's/-L/:/g' -e 's/ //g'`" \
|
- sed -e 's/-L/:/g' -e 's/ //g'`" \
|
||||||
$(RUNSERIAL) ./H5detect$(EXEEXT) > $@ || \
|
$(RUNSERIAL) ./H5detect$(EXEEXT) $@ || \
|
||||||
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
|
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
|
||||||
($(RM) $@ ; exit 1)
|
($(RM) $@ ; exit 1)
|
||||||
@@ -140,8 +138,6 @@ H5Tinit.c: H5detect$(EXEEXT)
|
@@ -168,8 +166,6 @@
|
||||||
# Remove the generated .c file if errors occur unless HDF5_Make_Ignore
|
# Remove the generated .c file if errors occur unless HDF5_Make_Ignore
|
||||||
# is set to ignore the error.
|
# is set to ignore the error.
|
||||||
H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings
|
H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings
|
||||||
- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \
|
- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \
|
||||||
- sed -e 's/-L/:/g' -e 's/ //g'`" \
|
- sed -e 's/-L/:/g' -e 's/ //g'`" \
|
||||||
$(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > $@ || \
|
$(RUNSERIAL) ./H5make_libsettings$(EXEEXT) $@ || \
|
||||||
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
|
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
|
||||||
($(RM) $@ ; exit 1)
|
($(RM) $@ ; exit 1)
|
||||||
|
|||||||
@ -1,67 +0,0 @@
|
|||||||
diff -up hdf5-1.10.7/testpar/t_cache.c.warning hdf5-1.10.7/testpar/t_cache.c
|
|
||||||
--- hdf5-1.10.7/testpar/t_cache.c.warning 2020-09-04 15:50:58.000000000 -0600
|
|
||||||
+++ hdf5-1.10.7/testpar/t_cache.c 2020-10-07 20:23:01.877566435 -0600
|
|
||||||
@@ -80,8 +80,8 @@ long local_pins = 0;
|
|
||||||
|
|
||||||
|
|
||||||
/* the following fields are used by the server process only */
|
|
||||||
-int total_reads = 0;
|
|
||||||
-int total_writes = 0;
|
|
||||||
+unsigned total_reads = 0;
|
|
||||||
+unsigned total_writes = 0;
|
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************
|
|
||||||
@@ -176,8 +176,8 @@ struct datum
|
|
||||||
hbool_t local_pinned;
|
|
||||||
hbool_t cleared;
|
|
||||||
hbool_t flushed;
|
|
||||||
- int reads;
|
|
||||||
- int writes;
|
|
||||||
+ unsigned reads;
|
|
||||||
+ unsigned writes;
|
|
||||||
int index;
|
|
||||||
struct H5AC_aux_t * aux_ptr;
|
|
||||||
};
|
|
||||||
@@ -2445,12 +2445,12 @@ static herr_t
|
|
||||||
datum_image_len(const void *thing, size_t *image_len)
|
|
||||||
{
|
|
||||||
int idx;
|
|
||||||
- struct datum * entry_ptr;
|
|
||||||
+ const struct datum * entry_ptr;
|
|
||||||
|
|
||||||
HDassert( thing );
|
|
||||||
HDassert( image_len );
|
|
||||||
|
|
||||||
- entry_ptr = (struct datum *)thing;
|
|
||||||
+ entry_ptr = (const struct datum *)thing;
|
|
||||||
|
|
||||||
idx = addr_to_datum_index(entry_ptr->base_addr);
|
|
||||||
|
|
||||||
@@ -4612,7 +4612,7 @@ verify_entry_reads(haddr_t addr,
|
|
||||||
int expected_entry_reads)
|
|
||||||
{
|
|
||||||
hbool_t success = TRUE;
|
|
||||||
- int reported_entry_reads = 0;
|
|
||||||
+ unsigned reported_entry_reads = 0;
|
|
||||||
struct mssg_t mssg;
|
|
||||||
|
|
||||||
if ( success ) {
|
|
||||||
@@ -4719,7 +4719,7 @@ verify_entry_writes(haddr_t addr,
|
|
||||||
int expected_entry_writes)
|
|
||||||
{
|
|
||||||
hbool_t success = TRUE;
|
|
||||||
- int reported_entry_writes = 0;
|
|
||||||
+ unsigned reported_entry_writes = 0;
|
|
||||||
struct mssg_t mssg;
|
|
||||||
|
|
||||||
if ( success ) {
|
|
||||||
@@ -4824,7 +4824,7 @@ static hbool_t
|
|
||||||
verify_total_reads(int expected_total_reads)
|
|
||||||
{
|
|
||||||
hbool_t success = TRUE; /* will set to FALSE if appropriate. */
|
|
||||||
- long reported_total_reads;
|
|
||||||
+ unsigned reported_total_reads;
|
|
||||||
struct mssg_t mssg;
|
|
||||||
|
|
||||||
if ( success ) {
|
|
||||||
@ -1,2 +1,2 @@
|
|||||||
SHA512 (hdf5-1.10.7.tar.bz2) = bfbd045ea5d7940ac1d0f9aef964dad2e9f22d78b49c90668021106259c9612352fbcb4e89085a7fa189f58142ef83a363c6220ea89aa0d57bdfed245df0ab57
|
SHA512 (hdf5-1.12.1.tar.bz2) = 158a067ee284ccb9e2c4db12e9d37cf187d90d9ef1bed7a6303e2c3a2fd216d7b13a46c5f46018b097511281c4246156b6f917633ca88872f10f0ad04be285fd
|
||||||
SHA512 (hdf5_1.10.6+repack-2.debian.tar.xz) = 56a817bec56ef439259787e174172e5045d34b3b398b3fb95e42147a9b6a42e81f456d8527af4ec283226d84c7f247c63a7fa65654edebabe0de0bddfc038b71
|
SHA512 (hdf5_1.12.0+repack-1~exp2.debian.tar.xz) = 4c58d3021a634abe79211a6292d105f0ac9f1cc748e5033f8fefa845265e37104a3d6ef91deac51b85a26b5bc426095ca80ea606e1c3b730d3709368f8ffee9c
|
||||||
|
|||||||
Loading…
Reference in new issue