diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2013-10-26 15:59:06 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2013-10-26 15:59:06 +0000 |
| commit | c1b79d83f10183e8eb61b23aa82c312b26cd6c86 (patch) | |
| tree | 9b3d2f4101000c35eaaeb08eae9a3e3bba37c9b6 /x11-misc/synergy | |
| parent | Version bump (bug #489444 by Patrick). (diff) | |
| download | gentoo-2-c1b79d83f10183e8eb61b23aa82c312b26cd6c86.tar.gz gentoo-2-c1b79d83f10183e8eb61b23aa82c312b26cd6c86.tar.bz2 gentoo-2-c1b79d83f10183e8eb61b23aa82c312b26cd6c86.zip | |
Append -pthread to CXXFLAGS not CFLAGS (bug #486174 by Vincent de Phily).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc/synergy')
| -rw-r--r-- | x11-misc/synergy/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/synergy/files/synergy-1.4.12-pthread.patch | 12 | ||||
| -rw-r--r-- | x11-misc/synergy/synergy-1.4.12.ebuild | 7 | ||||
| -rw-r--r-- | x11-misc/synergy/synergy-1.4.15.ebuild | 7 |
4 files changed, 27 insertions, 5 deletions
diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog index 7748fab29171..bf01ab1b6fd3 100644 --- a/x11-misc/synergy/ChangeLog +++ b/x11-misc/synergy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/synergy # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.99 2013/10/26 15:36:48 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.100 2013/10/26 15:59:06 jer Exp $ + + 26 Oct 2013; Jeroen Roovers <jer@gentoo.org> synergy-1.4.12.ebuild, + synergy-1.4.15.ebuild, +files/synergy-1.4.12-pthread.patch: + Append -pthread to CXXFLAGS not CFLAGS (bug #486174 by Vincent de Phily). *synergy-1.4.15 (26 Oct 2013) diff --git a/x11-misc/synergy/files/synergy-1.4.12-pthread.patch b/x11-misc/synergy/files/synergy-1.4.12-pthread.patch new file mode 100644 index 000000000000..bb1a23a6cccc --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.4.12-pthread.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +140,8 @@ + # pthread is used on both Linux and Mac + 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 (HAVE_PTHREAD) + message(FATAL_ERROR "Missing library: pthread") + endif() diff --git a/x11-misc/synergy/synergy-1.4.12.ebuild b/x11-misc/synergy/synergy-1.4.12.ebuild index a697b59c6de9..dea03f2d1f57 100644 --- a/x11-misc/synergy/synergy-1.4.12.ebuild +++ b/x11-misc/synergy/synergy-1.4.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.12.ebuild,v 1.3 2013/09/24 19:35:31 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.12.ebuild,v 1.4 2013/10/26 15:59:06 jer Exp $ EAPI=5 @@ -39,7 +39,10 @@ RDEPEND="${COMMON_DEPEND} qt4? ( !x11-misc/qsynergy ) " -PATCHES=( "${FILESDIR}/${P}-cryptopp.patch" ) +PATCHES=( + "${FILESDIR}/${P}-pthread.patch" + "${FILESDIR}/${P}-cryptopp.patch" +) S=${WORKDIR}/${P}-Source diff --git a/x11-misc/synergy/synergy-1.4.15.ebuild b/x11-misc/synergy/synergy-1.4.15.ebuild index d7d5693eb7e7..06efe4ab5313 100644 --- a/x11-misc/synergy/synergy-1.4.15.ebuild +++ b/x11-misc/synergy/synergy-1.4.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.15.ebuild,v 1.1 2013/10/26 15:36:48 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.15.ebuild,v 1.2 2013/10/26 15:59:06 jer Exp $ EAPI=5 @@ -39,7 +39,10 @@ RDEPEND="${COMMON_DEPEND} qt4? ( !x11-misc/qsynergy ) " -PATCHES=( "${FILESDIR}/${P}-cryptopp.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.4.12-pthread.patch" + "${FILESDIR}/${P}-cryptopp.patch" +) S=${WORKDIR}/${P}-Source |