diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-11 12:07:53 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-11 13:55:41 +0300 |
| commit | 3902fa77e03cf1ca44345d477d3906ed39103378 (patch) | |
| tree | d058b4f805082062e3bae16bd8353e03eed9440c | |
| parent | 17f82be73d930e8a921512f630a933acf8e49ab0 (diff) | |
Fix compilation on 32 bits
The configuration needs some tweaks in this case.
Change-Id: Ica2d2925991e6564c181330e7fef6d4f6a5e364c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
| -rw-r--r-- | 3rdparty/elfutils/config.h | 12 | ||||
| -rw-r--r-- | 3rdparty/elfutils/elfutils.pri | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/3rdparty/elfutils/config.h b/3rdparty/elfutils/config.h index b9606cb..dfe2248 100644 --- a/3rdparty/elfutils/config.h +++ b/3rdparty/elfutils/config.h @@ -2,7 +2,7 @@ /* config.h.in. Generated from configure.ac by autoheader. */ /* Building with -fsanitize=undefined or not */ -#define CHECK_UNDEFINED false +#define CHECK_UNDEFINED 0 /* Should ar and ranlib use -D behavior by default? */ #define DEFAULT_AR_DETERMINISTIC false @@ -41,7 +41,7 @@ #define LIBEBL_SUBDIR "elfutils" /* Identifier for modules in the build. */ -#define MODVERSION "Build on zebra 2015-02-03T13:51:12+0100" +#define MODVERSION "Build for Qt Creator" /* Define to 32 or 64 if a specific implementation is wanted. */ /* #undef NATIVE_ELF */ @@ -68,7 +68,11 @@ #define PACKAGE_VERSION "0.163" /* The size of `long', as computed by sizeof. */ +#if QMAKE_ARCH == 64 #define SIZEOF_LONG 8 +#else +#define SIZEOF_LONG 4 +#endif /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -101,7 +105,9 @@ #endif /* Number of bits in a file offset, on hosts where this is settable. */ -/* #undef _FILE_OFFSET_BITS */ +#if QMAKE_ARCH == 32 +#define _FILE_OFFSET_BITS 64 +#endif /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ diff --git a/3rdparty/elfutils/elfutils.pri b/3rdparty/elfutils/elfutils.pri index 65153b1..bb849bd 100644 --- a/3rdparty/elfutils/elfutils.pri +++ b/3rdparty/elfutils/elfutils.pri @@ -2,6 +2,14 @@ VERSION = 0.163 QMAKE_CFLAGS += -std=gnu99 DEFINES += HAVE_CONFIG_H _GNU_SOURCE +equals(QT_ARCH, i386) { + DEFINES += QMAKE_ARCH=32 +} + +equals(QT_ARCH, x86_64) { + DEFINES += QMAKE_ARCH=64 +} + HEADERS += \ $$PWD/version.h \ $$PWD/config.h |