[Pkg-owncloud-commits] [owncloud-client] 01/06: patch for hppa/alpha added

Sandro Knauß hefee at debian.org
Sat Dec 16 11:27:33 UTC 2017


This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch experimental
in repository owncloud-client.

commit 057e05bc41fc6175c158015181e145b975e65b63
Author: Sandro Knauß <hefee at debian.org>
Date:   Sat Dec 16 10:54:07 2017 +0100

    patch for hppa/alpha added
---
 debian/patches/fix-build-alpha_hppa.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/fix-build-alpha_hppa.patch b/debian/patches/fix-build-alpha_hppa.patch
new file mode 100644
index 0000000..6e2fd61
--- /dev/null
+++ b/debian/patches/fix-build-alpha_hppa.patch
@@ -0,0 +1,30 @@
+--- a/cmake/modules/Warnings.cmake
++++ b/cmake/modules/Warnings.cmake
+@@ -1,9 +1,14 @@
+ # (c) 2014 Copyright ownCloud GmbH
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING* file.
++include(CheckCXXCompilerFlag)
+ 
+ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long -Wno-gnu-zero-variadic-macro-arguments")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
++    check_cxx_compiler_flag("-Wno-gnu-zero-variadic-macro-arguments" SUPPORTS_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS_FLAG)
++    if (SUPPORTS_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS_FLAG)
++       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
++    endif()
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+ 
+     if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -13,7 +13,8 @@ if(WIN32)
+   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase")
+ elseif(UNIX AND NOT APPLE)
+-  if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
++  if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(alpha|parisc|hppa)")
++  elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+     if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9)
+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
diff --git a/debian/patches/series b/debian/patches/series
index 2ca8671..ab9b513 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0009-fix-installpath-of-dolphin-plugin.patch
 0010-Clear-csync-rename-mappings-after-reconcile.patch
 0011-Reconcile-Rename-maps-are-consistent-with-update-pha.patch
+fix-build-alpha_hppa.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list