From f97a1b50ba51be5fa31cc54dba829a9e77609160 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 13 Feb 2012 20:59:26 -0800 Subject: [PATCH 1/2] fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still needs to be tested on all build machines. --- doc/ChangeLog | 8 ++++++++ qmake.inc.in | 3 +++ src/libfwbuilder/qmake.inc.in | 3 +++ src/libfwbuilder/src/fwbuilder/uint128.h | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 720f412a7..72d70f92b 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +2012-02-13 Vadim Kurland + + * qmake.inc.in (QMAKE_CXXFLAGS_DEBUG): fix for SF bug #3468802. + Need to define macro __STDC_FORMAT_MACROS. This still needs to be + tested on all build machines. + + build 3594 + 2012-01-02 Vadim Kurland * PolicyCompiler_ipt.cpp (specialCaseAddressRangeInRE::processNext): diff --git a/qmake.inc.in b/qmake.inc.in index 6bf27e005..3e31fd6da 100644 --- a/qmake.inc.in +++ b/qmake.inc.in @@ -67,6 +67,9 @@ unix { CONFIG += warn_on + QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS + QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS + } } diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in index b4f15bb4d..a8114cff6 100644 --- a/src/libfwbuilder/qmake.inc.in +++ b/src/libfwbuilder/qmake.inc.in @@ -34,6 +34,9 @@ unix { QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@ + QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS + QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS + exec_prefix = @EXEC_PREFIX@ DESTDIR = diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h index 0a2e7a4c3..b00ab47e6 100644 --- a/src/libfwbuilder/src/fwbuilder/uint128.h +++ b/src/libfwbuilder/src/fwbuilder/uint128.h @@ -36,7 +36,7 @@ #include -#define __STDC_FORMAT_MACROS +// #define __STDC_FORMAT_MACROS #include // for sprintf formats for "long long" // convinience macro From 878f18d63f6a85d31c06d502835fd7e3a24dc394 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 13 Feb 2012 21:40:03 -0800 Subject: [PATCH 2/2] need to define macros for all OS --- qmake.inc.in | 7 +++---- src/libfwbuilder/qmake.inc.in | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/qmake.inc.in b/qmake.inc.in index 3e31fd6da..ceabe17bd 100644 --- a/qmake.inc.in +++ b/qmake.inc.in @@ -66,10 +66,6 @@ unix { PKGLOCALEDIR = $$res.path/locale CONFIG += warn_on - - QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS - QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS - } } @@ -81,6 +77,9 @@ FWB_SIG = $$(FWB_SIG) if (isEmpty(FWB_SIG)) { FWB_SIG=26932 } DEFINES += FWB_SIG=$$FWB_SIG +QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS +QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS + exists(qmake2.inc) { include(qmake2.inc) } diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in index a8114cff6..a73207ce1 100644 --- a/src/libfwbuilder/qmake.inc.in +++ b/src/libfwbuilder/qmake.inc.in @@ -34,9 +34,6 @@ unix { QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@ - QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS - QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS - exec_prefix = @EXEC_PREFIX@ DESTDIR = @@ -46,6 +43,9 @@ unix { doc.path = @DOCDIR@ } +QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS +QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS + exists(qmake2.inc) { include( qmake2.inc) }