diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-08-14 23:23:45 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-08-14 23:23:45 +0000 |
| commit | 3abc0bc2ad466600d3fcdf0c9201dd929823517f (patch) | |
| tree | 020ade31232b630d763eb62a2ee3d7456ebb5d25 /app-misc/cwiid | |
| parent | Backporting test fixes from meep-1.2, hopefully fixing bug #423247 (diff) | |
| download | gentoo-2-3abc0bc2ad466600d3fcdf0c9201dd929823517f.tar.gz gentoo-2-3abc0bc2ad466600d3fcdf0c9201dd929823517f.tar.bz2 gentoo-2-3abc0bc2ad466600d3fcdf0c9201dd929823517f.zip | |
fix underlinking wrt #367349
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/cwiid')
| -rw-r--r-- | app-misc/cwiid/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/cwiid/cwiid-20110107-r1.ebuild | 5 | ||||
| -rw-r--r-- | app-misc/cwiid/files/cwiid-20110107-underlinking.patch | 31 |
3 files changed, 40 insertions, 4 deletions
diff --git a/app-misc/cwiid/ChangeLog b/app-misc/cwiid/ChangeLog index c6e5f9652d6e..ea98337132e0 100644 --- a/app-misc/cwiid/ChangeLog +++ b/app-misc/cwiid/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/cwiid -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/cwiid/ChangeLog,v 1.3 2011/03/28 01:04:35 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/cwiid/ChangeLog,v 1.4 2012/08/14 23:23:45 hasufell Exp $ + + 14 Aug 2012; Julian Ospald <hasufell@gentoo.org> cwiid-20110107-r1.ebuild, + +files/cwiid-20110107-underlinking.patch: + fix underlinking wrt #367349 28 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> cwiid-20110107-r1.ebuild: Install 60-cwiid.rules to /lib/udev instead of /etc/udev. diff --git a/app-misc/cwiid/cwiid-20110107-r1.ebuild b/app-misc/cwiid/cwiid-20110107-r1.ebuild index b63685dd38c4..b049706873c1 100644 --- a/app-misc/cwiid/cwiid-20110107-r1.ebuild +++ b/app-misc/cwiid/cwiid-20110107-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/cwiid/cwiid-20110107-r1.ebuild,v 1.2 2011/03/28 01:04:35 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/cwiid/cwiid-20110107-r1.ebuild,v 1.3 2012/08/14 23:23:45 hasufell Exp $ EAPI="3" @@ -51,6 +51,7 @@ src_prepare() { # Fix broken build system sed -i "s:--disable-ldconfig:--without-ldconfig:g" "${S}"/configure.ac || die sed -i "s:enable_ldconfig:with_ldconfig:g" "${S}"/configure.ac || die + epatch "${FILESDIR}"/${P}-underlinking.patch eautoreconf } src_configure() { diff --git a/app-misc/cwiid/files/cwiid-20110107-underlinking.patch b/app-misc/cwiid/files/cwiid-20110107-underlinking.patch new file mode 100644 index 000000000000..b60f379fc9cc --- /dev/null +++ b/app-misc/cwiid/files/cwiid-20110107-underlinking.patch @@ -0,0 +1,31 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Tue Aug 14 23:04:03 UTC 2012 +Subject: build system + +fix build for linkers that don't permit underlinking + +--- configure.ac ++++ configure.ac +@@ -69,6 +69,8 @@ + AC_MSG_ERROR([linux/uinput.h]), + [#include <linux/input.h>]) + ++PKG_CHECK_MODULES([BLUETOOTH], [bluez]) ++ + AC_ISC_POSIX + + AC_ARG_WITH(cwiid-config-dir,AC_HELP_STRING([--with-cwiid-config-dir], +--- wmdemo/Makefile.in ++++ wmdemo/Makefile.in +@@ -6,9 +6,9 @@ + + SOURCES = wmdemo.c + +-CFLAGS += -I@top_builddir@/libcwiid ++CFLAGS += -I@top_builddir@/libcwiid @BLUETOOTH_CFLAGS@ + LDFLAGS += -L@top_builddir@/libcwiid +-LDLIBS += -lcwiid ++LDLIBS += -lcwiid @BLUETOOTH_LIBS@ + INST_DIR = @bindir@ + + include $(COMMON)/include/app.mak |