From df16a1c51acd42bf8f2b82c111a28300665d2ded Mon Sep 17 00:00:00 2001
From: Alf Gaida <agaida@siduction.org>
Date: Mon, 2 Jan 2017 00:47:41 +0100
Subject: [PATCH] Adding upstream version 0.3.1.

Signed-off-by: Alf Gaida <agaida@siduction.org>
---
 CHANGELOG                                | 10 +++++++++-
 CMakeLists.txt                           |  6 +++---
 README.md                                |  4 ++--
 cmake/modules/LXQtCompilerSettings.cmake | 10 ++++++++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 63ae733..5b94ad7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,15 @@
 
-lxqt-build-tools-0.3.0 / 2016-12-06
+lxqt-build-tools-0.3.1 / 2017-01-01
 ===================================
 
+  * Bump LXQT_PATCH_VERSION and build tools version (#13)
+  * 32 64 bit ness (#12)
+  * Use "gcc-ar" and "gcc-ranlib" tools when building static libs with gcc link-time optimization. (#11)
+
+0.3.0 / 2016-12-06
+==================
+
+  * Release 0.3.0: Update changelog
   * Adds an FindXCB CMake module
   * FindUDev: Add VERSION_STRING support
   * FindUDev: Set REQUIRED_VARS
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f604433..8431500 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,13 +5,13 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 option(WITH_XDG_DIRS_FALLBACK "Use our XDG_CONFIG_DIRS fallback" ON)
 
 set(LXQT_BUILD_TOOLS_MAJOR_VERSION 0)
-set(LXQT_BUILD_TOOLS_MINOR_VERSION 2)
-set(LXQT_BUILD_TOOLS_PATCH_VERSION 0)
+set(LXQT_BUILD_TOOLS_MINOR_VERSION 3)
+set(LXQT_BUILD_TOOLS_PATCH_VERSION 1)
 set(LXQT_BUILD_TOOLS_VERSION ${LXQT_BUILD_TOOLS_MAJOR_VERSION}.${LXQT_BUILD_TOOLS_MINOR_VERSION}${LXQT_BUILD_TOOLS_PATCH_VERSION})
 
 set(LXQT_MAJOR_VERSION 0)
 set(LXQT_MINOR_VERSION 11)
-set(LXQT_PATCH_VERSION 0)
+set(LXQT_PATCH_VERSION 1)
 set(LXQT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PATCH_VERSION})
 
 include(CMakePackageConfigHelpers)
diff --git a/README.md b/README.md
index 3b4a5b0..f4c333a 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,6 @@ Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` ha
 
 To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual. (Strictly speaking `make` isn't even needed right now. On the other hand it doesn't hurt so packagers may just include it in case it'll be needed one day.)
 
-### Binary packages
+## Packagers
 
-The repository was introduced in September 2016 and binary packages are rare so far. On Arch Linux an [AUR](https://aur.archlinux.org/) package [lxqt-build-tools-git](https://aur.archlinux.org/packages/lxqt-build-tools-git/) can be used to build current checkouts of branch `master`.
+Please keep in mind that lxqt-build-tools are arch dependend - the package picks up **32/64bit-ness** at build time of the package - so the package has to be built for the respective architecture, arch: all will **not** fly.
diff --git a/cmake/modules/LXQtCompilerSettings.cmake b/cmake/modules/LXQtCompilerSettings.cmake
index a2a029b..c0694de 100644
--- a/cmake/modules/LXQtCompilerSettings.cmake
+++ b/cmake/modules/LXQtCompilerSettings.cmake
@@ -145,6 +145,16 @@ if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COMPILER_IS_CLANGCXX)
     # -flto: use link-time optimizations to generate more efficient code
     if (CMAKE_COMPILER_IS_GNUCXX)
         set(LTO_FLAGS "-flto -fuse-linker-plugin")
+        # When building static libraries with LTO in gcc >= 4.9,
+        # "gcc-ar" and "gcc-ranlib" should be used instead of "ar" and "ranlib".
+        # references:
+        #   https://gcc.gnu.org/gcc-4.9/changes.html
+        #   http://hubicka.blogspot.tw/2014/04/linktime-optimization-in-gcc-2-firefox.html
+        #   https://github.com/monero-project/monero/pull/1065/commits/1855213c8fb8f8727f4107716aab8e7ba826462b
+        if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0")  # gcc >= 4.9
+            set(CMAKE_AR "gcc-ar")
+            set(CMAKE_RANLIB "gcc-ranlib")
+        endif()
     elseif (LXQT_COMPILER_IS_CLANGCXX)
         # The link-time optimization of clang++/llvm seems to be too aggrassive.
         # After testing, it breaks the signal/slots of QObject sometimes.