diff options
Diffstat (limited to 'vlc/build/patches/qtbase_dont_tag_static_binaries.patch')
| -rw-r--r-- | vlc/build/patches/qtbase_dont_tag_static_binaries.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/vlc/build/patches/qtbase_dont_tag_static_binaries.patch b/vlc/build/patches/qtbase_dont_tag_static_binaries.patch new file mode 100644 index 00000000..ddef3116 --- /dev/null +++ b/vlc/build/patches/qtbase_dont_tag_static_binaries.patch @@ -0,0 +1,32 @@ +From 0cffe2135e7303bd103bdf888a345fe0a8b94cd6 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira <thiago.macieira@intel.com> +Date: Wed, 14 Sep 2016 11:29:37 -0700 +Subject: [PATCH] qversiontagging.h: Don't tag binaries in static mode + +Though there should have been no ill-effects, they happen. + +Task-number: QTBUG-52605 +Change-Id: I9093948278414644a416fffd147444078edc3183 +Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- + src/corelib/global/qversiontagging.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qversiontagging.h b/src/corelib/global/qversiontagging.h +index fa824d1c89e..b46bb7aa77d 100644 +--- a/src/corelib/global/qversiontagging.h ++++ b/src/corelib/global/qversiontagging.h +@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE + * There will only be one copy of the section in the output library or application. + */ + +-#if defined(QT_BUILD_CORE_LIB) || defined(QT_BOOTSTRAPPED) || defined(QT_NO_VERSION_TAGGING) ++#if defined(QT_BUILD_CORE_LIB) || defined(QT_BOOTSTRAPPED) || defined(QT_NO_VERSION_TAGGING) || defined(QT_STATIC) + // don't make tags in QtCore, bootstrapped systems or if the user asked not to + #elif defined(Q_CC_GNU) && !defined(Q_OS_ANDROID) + # if defined(Q_PROCESSOR_X86) && (defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD_KERNEL)) +-- +2.16.3 + + |