Date: Sunday, June 21, 2015 @ 18:50:41
Author: foutrelis
Revision: 135672
Fix build with GCC 5.1
Added:
lmms/trunk/make-werrror-optional.patch
Modified:
lmms/trunk/PKGBUILD
-----------------------------+
PKGBUILD | 14 +++++++++++---
make-werrror-optional.patch | 22 ++++++++++++++++++++++
2 files changed, 33 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-06-21 15:32:17 UTC (rev 135671)
+++ PKGBUILD 2015-06-21 16:50:41 UTC (rev 135672)
@@ -23,14 +23,22 @@
conflicts=('lmms-extras')
options=('!makeflags')
install=lmms.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/LMMS/${pkgname}/archive/v${pkgver}.tar.gz";)
-md5sums=('88d9e66d240b711c37315e3c9da644a1')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/LMMS/${pkgname}/archive/v${pkgver}.tar.gz";
+ "make-werrror-optional.patch")
+md5sums=('88d9e66d240b711c37315e3c9da644a1'
+ '2c6e51b665c34fa61dc8b23e129404a9')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
+ patch -Np1 -i ../make-werrror-optional.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
cmake . -DCMAKE_INSTALL_PREFIX=/usr -USE=vst
make
}
Added: make-werrror-optional.patch
===================================================================
--- make-werrror-optional.patch (rev 0)
+++ make-werrror-optional.patch 2015-06-21 16:50:41 UTC (rev 135672)
@@ -0,0 +1,22 @@
+From 9cc1a5931c34535436a2fb82e51031121b3a53d1 Mon Sep 17 00:00:00 2001
+From: Lukas W <lukas...@gmail.com>
+Date: Thu, 22 Jan 2015 12:39:20 +0100
+Subject: [PATCH] Make -Werror optional
+
+---
+ CMakeLists.txt | 3 ++-
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4cb7407..a526df3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -358,7 +358,8 @@
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in" "${CM
+
+ # set compiler flags
+ SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare
-Wno-strict-overflow")
+-IF(NOT LMMS_BUILD_APPLE)
++OPTION(USE_WERROR "Add -werror to the build flags. Stops the build on
warnings" OFF)
++IF(${USE_WERROR})
+ SET(WERROR_FLAGS "${WERROR_FLAGS} -Werror")
+ ENDIF()
+
