SOURCES: hdf5-config.patch, hdf5-sig.patch - updated for 1.6.5
qboosh
qboosh at pld-linux.org
Tue Nov 15 19:07:09 CET 2005
Author: qboosh Date: Tue Nov 15 18:07:09 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.6.5
---- Files affected:
SOURCES:
hdf5-config.patch (1.8 -> 1.9) , hdf5-sig.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/hdf5-config.patch
diff -u SOURCES/hdf5-config.patch:1.8 SOURCES/hdf5-config.patch:1.9
--- SOURCES/hdf5-config.patch:1.8 Mon Mar 28 04:10:38 2005
+++ SOURCES/hdf5-config.patch Tue Nov 15 19:07:04 2005
@@ -26,9 +26,9 @@
LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
## Optional variables. We must declare them here because Irix pmake
---- hdf5-1.6.4/config/gnu-flags.orig 2004-12-29 16:27:16.000000000 +0100
-+++ hdf5-1.6.4/config/gnu-flags 2005-03-28 02:28:39.948478952 +0200
-@@ -94,26 +94,6 @@
+--- hdf5-1.6.5/config/gnu-flags.orig 2005-10-28 22:15:26.000000000 +0200
++++ hdf5-1.6.5/config/gnu-flags 2005-11-15 18:20:35.303439288 +0100
+@@ -107,26 +107,6 @@
gcc*|egcs*|pgcc*)
# Architecture-specific flags
arch=
@@ -55,15 +55,15 @@
# Host-specific flags
case "`hostname`" in
sleipnir.ncsa.uiuc.edu)
-@@ -127,7 +107,6 @@
+@@ -140,7 +120,6 @@
# Production
case "$cc_vendor-$cc_version" in
gcc-2.95.[34])
- PROD_CFLAGS="-O3"
;;
- gcc-3.[0-4]*|gcc-4.0*)
+ gcc-3.[0-4]*|gcc-4.[01]*)
# The optimization level is reduced for gcc 3.* and 4.* due to problems
-@@ -135,14 +114,11 @@
+@@ -148,14 +127,11 @@
# optimization levels (which shows up as failures for various integer
# types -> long long conversions in the test/dtypes test). Perhaps
# later versions of gcc will fix this bug... - QAK - 2003/10/20
@@ -78,39 +78,48 @@
;;
esac
-@@ -175,7 +151,7 @@
+@@ -192,7 +168,7 @@
CFLAGS="$CFLAGS -Wno-long-long"
# Append warning flags from gcc-3* case
-- CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
++ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
# Append warning flags from gcc-3.2* case
- CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-@@ -208,7 +184,7 @@
+ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+@@ -225,7 +201,7 @@
CFLAGS="$CFLAGS -Wno-long-long"
# Append warning flags from gcc-3* case
-- CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
++ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
# Append warning flags from gcc-3.2* case
- CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-@@ -238,7 +214,7 @@
+ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+@@ -255,7 +231,7 @@
CFLAGS="$CFLAGS -Wno-long-long"
# Append warning flags from gcc-3* case
-- CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
++ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
# Append warning flags from gcc-3.2* case
- CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-@@ -262,7 +238,7 @@
+ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+@@ -279,7 +255,7 @@
CFLAGS="$CFLAGS -Wno-long-long"
# Append warning flags from gcc-3* case
-- CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
++ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
# Append more extra warning flags that only gcc3.2+ know about
- CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
+@@ -300,7 +276,7 @@
+ CFLAGS="$CFLAGS -Wno-long-long"
+
+ # Append some extra warning flags that only gcc3+ know about
+- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
++ DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
+ ;;
+
+ gcc-2.9[56]*)
================================================================
Index: SOURCES/hdf5-sig.patch
diff -u SOURCES/hdf5-sig.patch:1.1 SOURCES/hdf5-sig.patch:1.2
--- SOURCES/hdf5-sig.patch:1.1 Mon Mar 28 23:59:24 2005
+++ SOURCES/hdf5-sig.patch Tue Nov 15 19:07:04 2005
@@ -1,5 +1,5 @@
---- hdf5-1.6.4/src/H5detect.c.orig 2005-02-28 17:22:42.000000000 +0000
-+++ hdf5-1.6.4/src/H5detect.c 2005-03-28 20:51:46.622816724 +0000
+--- hdf5-1.6.5/src/H5detect.c.orig 2005-09-12 19:18:23.000000000 +0200
++++ hdf5-1.6.5/src/H5detect.c 2005-11-15 18:25:36.030721792 +0100
@@ -106,7 +106,7 @@
static void detect_C99_integers64(void);
static void detect_alignments(void);
@@ -12,7 +12,7 @@
@@ -360,7 +360,7 @@
void (*_handler2)(int) = signal(SIGSEGV, sigsegv_handler); \
\
- _buf = malloc(sizeof(TYPE)+align_g[NELMTS(align_g)-1]); \
+ _buf = (char*)malloc(sizeof(TYPE)+align_g[NELMTS(align_g)-1]); \
- if (setjmp(jbuf_g)) _ano++; \
+ if (sigsetjmp(jbuf_g, 1)) _ano++; \
if (_ano<NELMTS(align_g)) { \
@@ -34,7 +34,7 @@
- longjmp(jbuf_g, 1);
+ siglongjmp(jbuf_g, 1);
}
-
+
@@ -485,7 +485,7 @@
sigbus_handler(int UNUSED signo)
@@ -43,5 +43,5 @@
- longjmp(jbuf_g, 1);
+ siglongjmp(jbuf_g, 1);
}
-
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/hdf5-config.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/SOURCES/hdf5-sig.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list