summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2009-07-13 14:37:15 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2009-07-13 14:37:15 +0000
commitecc65e7698f3f1327530ffe7f18fbf7baae59c3a (patch)
tree502cd9e4ba496ee1c26ce65792170b8c232e223d /app-misc
parentkeyword ~x86-fbsd thanks to Davide Italiano <dav_it@gentoo.org>, bug #232250 (diff)
downloadgentoo-2-ecc65e7698f3f1327530ffe7f18fbf7baae59c3a.tar.gz
gentoo-2-ecc65e7698f3f1327530ffe7f18fbf7baae59c3a.tar.bz2
gentoo-2-ecc65e7698f3f1327530ffe7f18fbf7baae59c3a.zip
Fix linking issues, Bug #277656.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/activylircd/ChangeLog6
-rw-r--r--app-misc/activylircd/activylircd-0.4.ebuild9
-rw-r--r--app-misc/activylircd/files/activylircd-0.4-linking.patch25
3 files changed, 38 insertions, 2 deletions
diff --git a/app-misc/activylircd/ChangeLog b/app-misc/activylircd/ChangeLog
index 3b1ad67de243..010e57bee971 100644
--- a/app-misc/activylircd/ChangeLog
+++ b/app-misc/activylircd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/activylircd
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/activylircd/ChangeLog,v 1.2 2009/06/13 11:43:06 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/activylircd/ChangeLog,v 1.3 2009/07/13 14:37:15 zzam Exp $
+
+ 13 Jul 2009; Matthias Schwarzott <zzam@gentoo.org> activylircd-0.4.ebuild,
+ +files/activylircd-0.4-linking.patch:
+ Fix linking issues, Bug #277656.
13 Jun 2009; Matthias Schwarzott <zzam@gentoo.org> activylircd-0.4.ebuild:
Move activylircd to /usr/sbin. Fix manifest for changed tarball.
diff --git a/app-misc/activylircd/activylircd-0.4.ebuild b/app-misc/activylircd/activylircd-0.4.ebuild
index edc9dc40706e..a55acc85fe69 100644
--- a/app-misc/activylircd/activylircd-0.4.ebuild
+++ b/app-misc/activylircd/activylircd-0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/activylircd/activylircd-0.4.ebuild,v 1.2 2009/06/13 11:43:06 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/activylircd/activylircd-0.4.ebuild,v 1.3 2009/07/13 14:37:15 zzam Exp $
inherit eutils
@@ -13,6 +13,13 @@ SLOT="0"
KEYWORDS="~x86"
IUSE=""
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}/${P}-linking.patch" # Bug #277656
+}
+
src_install() {
dosbin activylircd
dobin key2xd eventmapper key2lircd key2xd
diff --git a/app-misc/activylircd/files/activylircd-0.4-linking.patch b/app-misc/activylircd/files/activylircd-0.4-linking.patch
new file mode 100644
index 000000000000..8ebd721fd38e
--- /dev/null
+++ b/app-misc/activylircd/files/activylircd-0.4-linking.patch
@@ -0,0 +1,25 @@
+Index: activylircd-0.4/Makefile
+===================================================================
+--- activylircd-0.4.orig/Makefile
++++ activylircd-0.4/Makefile
+@@ -14,16 +14,16 @@ names.h: /usr/include/linux/input.h genn
+ ./gennames $< > $@
+
+ activylircd: activylircd.c /usr/include/linux/input.h names.h Makefile
+- $(CC) $(CFLAGS) -o $@ $<
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+ key2lircd: key2lircd.c /usr/include/linux/input.h names.h Makefile
+- $(CC) $(CFLAGS) -o $@ $<
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+ eventmapper: eventmapper.c /usr/include/linux/input.h names.h Makefile
+- $(CC) $(CFLAGS) -o $@ $<
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+ key2xd: key2xd.c Makefile
+- $(CC) $(CFLAGS) -o $@ -lX11 -lXtst $<
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lX11 -lXtst
+
+ install: $(PROG)
+ install -v -t /usr/bin $(PROG)