summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-02-20 14:03:44 +0000
committerJeroen Roovers <jer@gentoo.org>2014-02-20 14:03:44 +0000
commita1f9ca7bdac588d9dae432e0dab0f7dee69209e8 (patch)
tree27ae020eb13e0a4d3324ce8d628b8c35eaa04c9a /x11-misc
parentStable for HPPA (bug #501648). (diff)
downloadgentoo-2-a1f9ca7bdac588d9dae432e0dab0f7dee69209e8.tar.gz
gentoo-2-a1f9ca7bdac588d9dae432e0dab0f7dee69209e8.tar.bz2
gentoo-2-a1f9ca7bdac588d9dae432e0dab0f7dee69209e8.zip
Set C*FLAGS=-pthread (possibly fixes bug #501806 by Alex Barker).
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/synergy/ChangeLog6
-rw-r--r--x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch11
-rw-r--r--x11-misc/synergy/synergy-1.4.16_p1969.ebuild3
3 files changed, 18 insertions, 2 deletions
diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index b8d99040ab82..585a3d545d62 100644
--- a/x11-misc/synergy/ChangeLog
+++ b/x11-misc/synergy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/synergy
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.106 2014/02/19 12:02:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.107 2014/02/20 14:03:44 jer Exp $
+
+ 20 Feb 2014; Jeroen Roovers <jer@gentoo.org> synergy-1.4.16_p1969.ebuild,
+ +files/synergy-1.4.16_p1969-pthread.patch:
+ Set C*FLAGS=-pthread (possibly fixes bug #501806 by Alex Barker).
*synergy-1.4.16_p1969 (19 Feb 2014)
diff --git a/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch b/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch
new file mode 100644
index 000000000000..adddf2f73b67
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,6 +141,8 @@
+ check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
+ if (HAVE_PTHREAD)
+ list(APPEND libs pthread)
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+ else()
+ message(FATAL_ERROR "Missing library: pthread")
+ endif()
diff --git a/x11-misc/synergy/synergy-1.4.16_p1969.ebuild b/x11-misc/synergy/synergy-1.4.16_p1969.ebuild
index 9e4c387c4a2f..1bda807aace5 100644
--- a/x11-misc/synergy/synergy-1.4.16_p1969.ebuild
+++ b/x11-misc/synergy/synergy-1.4.16_p1969.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.16_p1969.ebuild,v 1.1 2014/02/19 12:02:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.16_p1969.ebuild,v 1.2 2014/02/20 14:03:44 jer Exp $
EAPI=5
inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
@@ -42,6 +42,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-1.4.15-cryptopp.patch"
+ "${FILESDIR}/${PN}-1.4.16_p1969-pthread.patch"
)
S=${WORKDIR}/${P/_p*/}-Source