Instill LDFLAGS respect into build system. Closes bug #339537 by Diego Elio "Flameeyes" Pettenò.

(Portage version: 2.1.9.19/cvs/Linux x86_64)

3 files changed, 236 insertions, 1 deletions

diff --git a/net-wireless/irda-utils/ChangeLog b/net-wireless/irda-utils/ChangeLog
index 0cc4ffbf9302..9d268669dc41 100644
--- a/net-wireless/irda-utils/ChangeLog
+++ b/net-wireless/irda-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/irda-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.36 2010/06/29 16:08:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.37 2010/10/17 13:39:56 chainsaw Exp $
+
+*irda-utils-0.9.18-r4 (17 Oct 2010)
+
+  17 Oct 2010; <chainsaw@gentoo.org> +irda-utils-0.9.18-r4.ebuild,
+  +files/irda-utils-0.9.18-ldflags.patch:
+  Instill LDFLAGS respect into build system. Closes bug #339537 by Diego
+  Elio "Flameeyes" Pettenò.
 
   29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   irda-utils-0.9.18-r3.ebuild, +files/irda-utils-0.9.18-asneeded.patch:
diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-ldflags.patch b/net-wireless/irda-utils/files/irda-utils-0.9.18-ldflags.patch
new file mode 100644
index 000000000000..a194c31cfedb
--- /dev/null
+++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-ldflags.patch
@@ -0,0 +1,132 @@
+diff -uNr irda-utils-0.9.18.ORIG/findchip/Makefile irda-utils-0.9.18/findchip/Makefile
+--- irda-utils-0.9.18.ORIG/findchip/Makefile	2010-10-17 14:30:57.000000000 +0100
++++ irda-utils-0.9.18/findchip/Makefile	2010-10-17 14:31:21.000000000 +0100
+@@ -47,7 +47,7 @@
+ 
+ findchip: $(OBJS)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(OBJS) $(CFLAGS) -o $@
++	$(ECMD)$(CC) $(OBJS) $(CFLAGS) -o $@ $(LDFLAGS)
+ 
+ 
+ clean:
+@@ -65,5 +65,5 @@
+ 
+ gfindchip: gfindchip.c 
+ 	$(prn_cc)
+-	$(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags`  $< -o $@ `gtk-config --libs`
++	$(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags`  $< -o $@ `gtk-config --libs` $(LDFLAGS)
+ 
+diff -uNr irda-utils-0.9.18.ORIG/irattach/Makefile irda-utils-0.9.18/irattach/Makefile
+--- irda-utils-0.9.18.ORIG/irattach/Makefile	2010-10-17 14:30:57.000000000 +0100
++++ irda-utils-0.9.18/irattach/Makefile	2010-10-17 14:31:21.000000000 +0100
+@@ -49,13 +49,13 @@
+ 
+ irattach: irattach.o util.o
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
++	$(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@ $(LDFLAGS)
+ 
+ 
+ 
+ dongle_attach: dongle_attach.o
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
++	$(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@ $(LDFLAGS)
+ 
+ 
+ install: $(TARGETS)
+diff -uNr irda-utils-0.9.18.ORIG/irdadump/Makefile irda-utils-0.9.18/irdadump/Makefile
+--- irda-utils-0.9.18.ORIG/irdadump/Makefile	2010-10-17 14:30:57.000000000 +0100
++++ irda-utils-0.9.18/irdadump/Makefile	2010-10-17 14:31:31.000000000 +0100
+@@ -40,7 +40,7 @@
+ 
+ irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) `pkg-config --libs glib-2.0`
++	$(ECMD)$(CC) $(CFLAGS) -o  $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) `pkg-config --libs glib-2.0` $(LDFLAGS)
+ 
+ 
+ .c.o:
+diff -uNr irda-utils-0.9.18.ORIG/irdaping/Makefile irda-utils-0.9.18/irdaping/Makefile
+--- irda-utils-0.9.18.ORIG/irdaping/Makefile	2010-10-17 14:30:57.000000000 +0100
++++ irda-utils-0.9.18/irdaping/Makefile	2010-10-17 14:31:21.000000000 +0100
+@@ -56,7 +56,7 @@
+ 
+ irdaping: $(OBJS)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
++	$(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS)
+ 
+ 
+ .c.o:
+diff -uNr irda-utils-0.9.18.ORIG/irnetd/Makefile irda-utils-0.9.18/irnetd/Makefile
+--- irda-utils-0.9.18.ORIG/irnetd/Makefile	2010-10-17 14:30:57.000000000 +0100
++++ irda-utils-0.9.18/irnetd/Makefile	2010-10-17 14:31:21.000000000 +0100
+@@ -50,7 +50,7 @@
+ 
+ irnetd: $(OBJS)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
++	$(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS)
+ 
+ 
+ install: irnetd
+diff -uNr irda-utils-0.9.18.ORIG/irsockets/Makefile irda-utils-0.9.18/irsockets/Makefile
+--- irda-utils-0.9.18.ORIG/irsockets/Makefile	2010-10-17 14:30:57.000000000 +0100
++++ irda-utils-0.9.18/irsockets/Makefile	2010-10-17 14:31:21.000000000 +0100
+@@ -54,7 +54,7 @@
+ 
+ %: %.o
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS)
++	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS)
+ 
+ 
+ %.o: %.c
+diff -uNr irda-utils-0.9.18.ORIG/psion/Makefile irda-utils-0.9.18/psion/Makefile
+--- irda-utils-0.9.18.ORIG/psion/Makefile	2010-10-17 14:30:57.000000000 +0100
++++ irda-utils-0.9.18/psion/Makefile	2010-10-17 14:31:21.000000000 +0100
+@@ -25,4 +25,4 @@
+ CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
+ irpsion5: 
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
+\ No newline at end of file
++	$(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@ $(LDFLAGS)
+diff -uNr irda-utils-0.9.18.ORIG/smcinit/Makefile irda-utils-0.9.18/smcinit/Makefile
+--- irda-utils-0.9.18.ORIG/smcinit/Makefile	2010-10-17 14:30:57.000000000 +0100
++++ irda-utils-0.9.18/smcinit/Makefile	2010-10-17 14:31:21.000000000 +0100
+@@ -26,17 +26,17 @@
+ 
+ smcinit: smcinit.o
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) -o $@ $^ $(LIBS) -lpci
++	$(ECMD)$(CC) -o $@ $^ $(LIBS) -lpci $(LDFLAGS)
+ 
+ 
+ tosh1800-smcinit: tosh1800-smcinit.o
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci
++	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci $(LDFLAGS)
+ 
+ 
+ tosh2450-smcinit: tosh2450-smcinit.o
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci
++	$(ECMD)$(CC) $(XCFLAGS) -o $@ $^ $(LIBS) -lpci $(LDFLAGS)
+ 
+ 
+ %o: %c
+diff -uNr irda-utils-0.9.18.ORIG/tekram/Makefile irda-utils-0.9.18/tekram/Makefile
+--- irda-utils-0.9.18.ORIG/tekram/Makefile	2010-10-17 14:30:57.000000000 +0100
++++ irda-utils-0.9.18/tekram/Makefile	2010-10-17 14:31:21.000000000 +0100
+@@ -55,7 +55,7 @@
+ 
+ irkbd: $(OBJS)
+ 	$(prn_cc_o)
+-	$(ECMD)$(CC) $(OBJS) -o $@
++	$(ECMD)$(CC) $(OBJS) -o $@ $(LDFLAGS)
+ 
+ 
+ .c.o:
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild
new file mode 100644
index 000000000000..a4ec69ed53a4
--- /dev/null
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r4.ebuild,v 1.1 2010/10/17 13:39:56 chainsaw Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="IrDA management and handling utilities"
+HOMEPAGE="http://irda.sourceforge.net"
+SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
+IUSE=""
+
+RDEPEND="=dev-libs/glib-2*
+	>=sys-apps/pciutils-2.2.7-r1
+	sys-process/procps
+	sys-apps/setserial
+	sys-apps/grep
+	sys-fs/udev"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	!app-laptop/smcinit"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/irda-utils-rh1.patch \
+		"${FILESDIR}"/${P}-makefile.diff \
+		"${FILESDIR}"/${P}-smcinit.diff \
+		"${FILESDIR}"/${P}-io.h.diff \
+		"${FILESDIR}"/${P}-dofail.patch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+
+	# fix crosscompile, respect CFLAGS (Bug 200295)
+	sed -i -e "/^CC/s:gcc:$(tc-getCC):" \
+		-e "/^LD/s:ld:$(tc-getLD):" \
+		-e "/^AR/s:ar:$(tc-getAR):" \
+		-e "/^RANLIB/s:ranlib:$(tc-getRANLIB):" \
+		-e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile
+
+	# fix compile when pciutils is compiled with USE=zlib (Bug 200295)
+	sed -i -e "s:-lpci:$(pkg-config --libs libpci):g" smcinit/Makefile
+
+	# disable etc subdir in Makefile
+	sed -i -e "s:^\(DIRS.*=.* \)etc \(.*\):\1\2:g" Makefile
+
+	# disable write_pid(), because we don't need it
+	sed -i -e "s:\(write_pid();\):/* \1 */:g" irattach/util.c
+
+	append-flags "-fno-strict-aliasing"
+}
+
+src_compile() {
+	emake RPM_OPT_FLAGS="${CFLAGS}" RPM_BUILD_ROOT="${D}" ROOT="${D}" \
+		|| die "emake failed"
+}
+
+src_install () {
+	dodir /usr/bin
+	dodir /usr/sbin
+
+	emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \
+		MANDIR="${D}usr/share/man"	|| die "emake install failed"
+
+	newdoc ethereal/README     README.wireshark
+	newdoc irattach/README     README.irattach
+	newdoc irdadump/README     README.irdadump
+	newdoc irdaping/README     README.irdaping
+	newdoc irsockets/README    README.irsockets
+	newdoc tekram/README       README.tekram
+	newdoc smcinit/README      README.smcinit
+	newdoc smcinit/README.Peri README.smcinit.Peri
+	newdoc smcinit/README.Rob  README.smcinit.Rob
+	newdoc smcinit/README.Tom  README.smcinit.Tom
+	newdoc irattach/ChangeLog  ChangeLog.irattach
+	newdoc irdadump/ChangeLog  ChangeLog.irdadump
+	newdoc smcinit/ChangeLog   ChangeLog.smcinit
+	dohtml smcinit/RobMiller-irda.html
+	dodoc README
+
+	newconfd "${FILESDIR}/irda.confd" irda
+	newinitd "${FILESDIR}/irda.initd" irda
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}/irda.modsd" irda.conf
+
+	insinto /etc/udev/rules.d
+	newins "${FILESDIR}/irda.rules" 53-irda.rules
+	exeinto /lib/udev
+	newexe "${FILESDIR}/irda-setup.sh" irda-setup
+	newexe "${FILESDIR}/irda-usb.sh" irda-usb
+}