SOURCES: hdf5-config.patch, hdf5-sig.patch - updated for 1.8.1
qboosh
qboosh at pld-linux.org
Thu Jun 5 18:09:42 CEST 2008
Author: qboosh Date: Thu Jun 5 16:09:42 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.8.1
---- Files affected:
SOURCES:
hdf5-config.patch (1.9 -> 1.10) , hdf5-sig.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/hdf5-config.patch
diff -u SOURCES/hdf5-config.patch:1.9 SOURCES/hdf5-config.patch:1.10
--- SOURCES/hdf5-config.patch:1.9 Tue Nov 15 19:07:04 2005
+++ SOURCES/hdf5-config.patch Thu Jun 5 18:09:37 2008
@@ -1,69 +1,14 @@
---- hdf5-1.6.0/config/commence.in.orig 2003-07-03 19:23:35.000000000 +0200
-+++ hdf5-1.6.0/config/commence.in 2003-07-19 14:00:59.000000000 +0200
-@@ -51,7 +51,7 @@
- LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(libdir) $(DYNAMIC_DIRS)
- LT_RUN=$(LT) --mode=execute
- LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
--LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
-+LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_PROGRAM)
- LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
-
- ## Optional variables. We must declare them here because Irix pmake
---- hdf5-1.6.0/c++/config/commence.in.orig 2003-06-30 17:19:35.000000000 +0200
-+++ hdf5-1.6.0/c++/config/commence.in 2003-07-19 14:01:16.000000000 +0200
-@@ -50,11 +50,11 @@
- DYNAMIC_DIRS=@DYNAMIC_DIRS@
- LT=$(top_builddir)/libtool
- LT_COMPILE=$(LT) --mode=compile $(CXX)
--LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS)
--LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
-+LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir) $(DYNAMIC_DIRS)
-+LT_LINK_EXE=$(LT) --mode=link $(CXX) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
- LT_RUN=$(LT) --mode=execute
- LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
--LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
-+LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_PROGRAM)
- LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
-
- ## Optional variables. We must declare them here because Irix pmake
---- 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=
-- case "$host_os-$host_cpu" in
-- # FreeBSD sets the information from "uname -m" to the general machine
-- # architecture, not the specific CPU for the machine, so even our
-- # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD
-- # machine, use the "sysctl" command to get the CPU hardware model.
-- freebsd*-i386)
-- host_cpu_model=`sysctl -n hw.model`
-- case "$host_cpu_model" in
-- # Hmm.. this might not catch Celerons, but it won't hurt them either...
-- *Pro*|*II*|*III*|*IV*|*Athlon*)
-- arch="-march=i686"
-- ;;
-- esac
-- ;;
--
-- *-i686)
-- arch="-march=i686"
-- ;;
-- esac
--
- # Host-specific flags
- case "`hostname`" in
- sleipnir.ncsa.uiuc.edu)
-@@ -140,7 +120,6 @@
+--- hdf5-1.8.1/config/gnu-flags.orig 2008-05-29 18:39:02.000000000 +0200
++++ hdf5-1.8.1/config/gnu-flags 2008-06-04 22:33:32.839106766 +0200
+@@ -143,7 +143,6 @@
# Production
case "$cc_vendor-$cc_version" in
gcc-2.95.[34])
- PROD_CFLAGS="-O3"
;;
- gcc-3.[0-4]*|gcc-4.[01]*)
+ gcc-3.[0-4]*|gcc-4.[0123]*)
# The optimization level is reduced for gcc 3.* and 4.* due to problems
-@@ -148,14 +127,11 @@
+@@ -151,14 +150,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,48 +23,3 @@
;;
esac
-@@ -192,7 +168,7 @@
- CFLAGS="$CFLAGS -Wno-long-long"
-
- # Append warning flags from gcc-3* case
-- 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
- 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
-- 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
- 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
-- 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
- 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
-- 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
- 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.2 SOURCES/hdf5-sig.patch:1.3
--- SOURCES/hdf5-sig.patch:1.2 Tue Nov 15 19:07:04 2005
+++ SOURCES/hdf5-sig.patch Thu Jun 5 18:09:37 2008
@@ -1,6 +1,6 @@
---- 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 @@
+--- hdf5-1.8.1/src/H5detect.c.orig 2008-05-29 18:38:42.000000000 +0200
++++ hdf5-1.8.1/src/H5detect.c 2008-06-04 23:04:39.917510528 +0200
+@@ -109,7 +109,7 @@
static void detect_C99_integers64(void);
static void detect_alignments(void);
static size_t align_g[] = {1, 2, 4, 8, 16};
@@ -9,7 +9,7 @@
/*-------------------------------------------------------------------------
-@@ -360,7 +360,7 @@
+@@ -366,7 +366,7 @@
void (*_handler2)(int) = signal(SIGSEGV, sigsegv_handler); \
\
_buf = (char*)malloc(sizeof(TYPE)+align_g[NELMTS(align_g)-1]); \
@@ -18,16 +18,16 @@
if (_ano<NELMTS(align_g)) { \
*((TYPE*)(_buf+align_g[_ano])) = _val; /*possible SIGBUS or SEGSEGV*/ \
_val2 = *((TYPE*)(_buf+align_g[_ano])); /*possible SIGBUS or SEGSEGV*/ \
-@@ -376,7 +376,7 @@
+@@ -383,7 +383,7 @@
memcpy(_buf+align_g[_ano]+(INFO.offset/8),((char *)&_val)+(INFO.offset/8),(size_t)(INFO.precision/8)); \
_val2 = *((TYPE*)(_buf+align_g[_ano])); \
if(_val!=_val2) \
-- longjmp(jbuf_g, 1); \
-+ siglongjmp(jbuf_g, 1); \
+- longjmp(jbuf_g, 1); \
++ siglongjmp(jbuf_g, 1); \
/* End Cray Check */ \
(INFO.align)=align_g[_ano]; \
} else { \
-@@ -460,7 +460,7 @@
+@@ -467,7 +467,7 @@
sigsegv_handler(int UNUSED signo)
{
signal(SIGSEGV, sigsegv_handler);
@@ -36,12 +36,14 @@
}
-@@ -485,7 +485,7 @@
+@@ -492,10 +492,7 @@
sigbus_handler(int UNUSED signo)
{
signal(SIGBUS, sigbus_handler);
- longjmp(jbuf_g, 1);
-+ siglongjmp(jbuf_g, 1);
+-#ifdef H5_HAVE_SIGLONGJMP
+ siglongjmp(jbuf_g, 1);
+-#endif /* H5_HAVE_SIGLONGJMP */
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/hdf5-config.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/hdf5-sig.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list