Hi all,
I'm looking at building areaDetector under both the linux-x86 and linux-x86_64 architectures, unfortunately the HDF5 libraries have slightly different headers for each architecture.
I know that I can do INC_Linux += ... to get different header files for each platform under include/os/Linux, but I can't work out if it's possible to install and use header files under include/os/linux-x86?
Does anyone have any ideas? In case it's useful I've attached a diff of the offending header file between 32 bit and 64 bit versions.
Thanks,
Tom Cobb
Index: ADApp/hdf5Support/os/Linux/H5pubconf.h
===================================================================
--- ADApp/hdf5Support/os/Linux/H5pubconf.h (revision 67256)
+++ ADApp/hdf5Support/os/Linux/H5pubconf.h (working copy)
@@ -511,7 +511,7 @@
#define H5_PACKAGE_VERSION "1.8.6"
/* Width for printf() for type `long long' or `__int64', use `ll' */
-#define H5_PRINTF_LL_WIDTH "ll"
+#define H5_PRINTF_LL_WIDTH "l"
/* The size of `char', as computed by sizeof. */
#define H5_SIZEOF_CHAR 1
@@ -538,10 +538,10 @@
#define H5_SIZEOF_INT8_T 1
/* The size of `int_fast16_t', as computed by sizeof. */
-#define H5_SIZEOF_INT_FAST16_T 4
+#define H5_SIZEOF_INT_FAST16_T 8
/* The size of `int_fast32_t', as computed by sizeof. */
-#define H5_SIZEOF_INT_FAST32_T 4
+#define H5_SIZEOF_INT_FAST32_T 8
/* The size of `int_fast64_t', as computed by sizeof. */
#define H5_SIZEOF_INT_FAST64_T 8
@@ -562,10 +562,10 @@
#define H5_SIZEOF_INT_LEAST8_T 1
/* The size of `long', as computed by sizeof. */
-#define H5_SIZEOF_LONG 4
+#define H5_SIZEOF_LONG 8
/* The size of `long double', as computed by sizeof. */
-#define H5_SIZEOF_LONG_DOUBLE 12
+#define H5_SIZEOF_LONG_DOUBLE 16
/* The size of `long long', as computed by sizeof. */
#define H5_SIZEOF_LONG_LONG 8
@@ -577,16 +577,16 @@
#define H5_SIZEOF_OFF_T 8
/* The size of `ptrdiff_t', as computed by sizeof. */
-#define H5_SIZEOF_PTRDIFF_T 4
+#define H5_SIZEOF_PTRDIFF_T 8
/* The size of `short', as computed by sizeof. */
#define H5_SIZEOF_SHORT 2
/* The size of `size_t', as computed by sizeof. */
-#define H5_SIZEOF_SIZE_T 4
+#define H5_SIZEOF_SIZE_T 8
/* The size of `ssize_t', as computed by sizeof. */
-#define H5_SIZEOF_SSIZE_T 4
+#define H5_SIZEOF_SSIZE_T 8
/* The size of `uint16_t', as computed by sizeof. */
#define H5_SIZEOF_UINT16_T 2
@@ -601,10 +601,10 @@
#define H5_SIZEOF_UINT8_T 1
/* The size of `uint_fast16_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT_FAST16_T 4
+#define H5_SIZEOF_UINT_FAST16_T 8
/* The size of `uint_fast32_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT_FAST32_T 4
+#define H5_SIZEOF_UINT_FAST32_T 8
/* The size of `uint_fast64_t', as computed by sizeof. */
#define H5_SIZEOF_UINT_FAST64_T 8
@@ -696,7 +696,7 @@
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
-#define H5__FILE_OFFSET_BITS 64
+/* #undef H5__FILE_OFFSET_BITS */
/* Define for large files, on AIX-style hosts. */
/* #undef H5__LARGE_FILES */
--
This e-mail and any attachments may contain confidential, copyright and or privileged material, and are for the use of the intended addressee only. If you are not the intended addressee or an authorised recipient of the addressee please notify us of receipt by returning the e-mail and do not use, copy, retain, distribute or disclose the information in or attached to the e-mail.
Any opinions expressed within this e-mail are those of the individual and not necessarily of Diamond Light Source Ltd.
Diamond Light Source Ltd. cannot guarantee that this e-mail or any attachments are free from viruses and we cannot accept liability for any damage which you may sustain as a result of software viruses which may be transmitted in or with the message.
Diamond Light Source Limited (company no. 4375679). Registered in England and Wales with its registered office at Diamond House, Harwell Science and Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United Kingdom
- Replies:
- RE: linux-x86_64 and linux-x86 architectures with different include files Mark Rivers
- Navigate by Date:
- Prev:
RE: windows enable debug build Mark Rivers
- Next:
RE: linux-x86_64 and linux-x86 architectures with different include files Mark Rivers
- Index:
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
<2011>
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Re: windows enable debug build Andrew Johnson
- Next:
RE: linux-x86_64 and linux-x86 architectures with different include files Mark Rivers
- Index:
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
<2011>
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
|