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

Package-Manager: portage-2.1.9.19/cvs/Linux x86_64

4 files changed, 249 insertions, 2 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/Manifest b/net-wireless/irda-utils/Manifest
index a1b0098b3bd5..2c28bc81da7c 100644
--- a/net-wireless/irda-utils/Manifest
+++ b/net-wireless/irda-utils/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX irda-setup.sh 1638 RMD160 5077d15ac4f9145e62f409d828894c58da353794 SHA1 42617a7f696d13102569804bc6547989acefed78 SHA256 378deb51b9a6321013b57d243ff7b8301078dc7fde2959820bd2d50ef5478076
 AUX irda-usb.sh 1287 RMD160 3296f936476b79819c3d98b57b31518545a394ed SHA1 3e5018aa908bfb6d38979baf7c254241f79a9acd SHA256 3a7189528975249d1701e833f68f301d011150b3b7c0ff1e795bbffc0cf5fecf
 AUX irda-utils-0.9.18-asneeded.patch 415 RMD160 5f0bba27e531149208de76d69f771e8d30b07745 SHA1 0ce5d0bd9f7ce655262f1f2bc27a9d2756f2fa12 SHA256 28ba1a4d0c5cffde05dc82d9fc55a8366756dfd1f35686cffd133a184e5d8025
 AUX irda-utils-0.9.18-dofail.patch 770 RMD160 2ce3f073b2fe7edc6e1e3167f3863a25cd092ae4 SHA1 45f5db713f7fad1b3ad5489e4462e0cbe333c2f8 SHA256 206deac43962b8240a1d1b898aac91418204c5deec8bd2a11c778bed01926b75
 AUX irda-utils-0.9.18-io.h.diff 1604 RMD160 51a71ec4a5388cceb76aeeb24709a39f62e2cb91 SHA1 416b0229a2cc53ef2f030eba1089aac6dd786fec SHA256 41ad319946969d3ef3951894433420203666924d97c50acf571f89bd79adde99
+AUX irda-utils-0.9.18-ldflags.patch 4537 RMD160 4fb6a711e590ee496351831f8213d037bf07fdd8 SHA1 07504c7d0e47fe77385889927dd866d2e571786a SHA256 97057e86e26c938ded7c326a907e6ab0be3a6a54363dff9e979d3aa0c983faee
 AUX irda-utils-0.9.18-makefile.diff 298 RMD160 daa1b92b0e1db4afd844944dcf6574e677382a07 SHA1 3fe858ead185931a73db6c37f70e98f3061c4b40 SHA256 1ed15399f8b1b8bb92b0c7b7e263030382a8b9b743bcfcaf86e5babdb31c0174
 AUX irda-utils-0.9.18-smcinit.diff 509 RMD160 d5887378dd3e5c051889b67d82e5c998f1132dfe SHA1 90f2ed5ec73c678fcc35f3c6540a7e3959e8d606 SHA256 fb1ee401db2630d24ca263c7f1612db723e6c836616a336d2c5a463130355b68
 AUX irda-utils-rh1.patch 444 RMD160 97a24330f9b3c639f9d53ad25008d07b59391af6 SHA1 7fbbb6438b1057eaad65597dff29a1727d09573e SHA256 725cd43b05dfc9f05f49ee8d3a81050d3421639c8440092c4d9bed5de1c31b30
@@ -12,5 +16,13 @@ AUX irda.modsd 1976 RMD160 9d07a7b21a56e2174d19a7cb038ce7b08feed76f SHA1 9a1902f
 AUX irda.rules 683 RMD160 df3346e3b5daaa5cc4722f226afbc4d4ee359842 SHA1 16a67ccfeeeeeadd6d1e2bc96df6f62114c1c2f1 SHA256 bdd65537e3cf460d750d595aeee06f52ca292ea6ac68e74784f8defb64dc9202
 DIST irda-utils-0.9.18.tar.gz 168390 RMD160 440e5b1e013a639431bc247f0005699edabd3607 SHA1 00cd918e373a1f7735dbf8af3a29ade4564ff763 SHA256 61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6
 EBUILD irda-utils-0.9.18-r3.ebuild 2824 RMD160 8695b3246e7935fc7de17be9869c2c5131d559a7 SHA1 7b782edcfea73d940f2ab642a9a295125f36f7ad SHA256 f14930ddeb9912b99a7cd3abec519456e59cf5679b55525ba485ec903c675906
-MISC ChangeLog 7706 RMD160 49c22769d1b893eb1c114f9a73c60700e3e15a3f SHA1 8d51cd15de46221f9c0b8235ad4ed465aa440fd0 SHA256 a7960e4a84b7a717eda3538b1901a0c176baf03a95791864accf20671d5c8310
+EBUILD irda-utils-0.9.18-r4.ebuild 2863 RMD160 8759e589500081b9b8350ba9256596855f9e7a77 SHA1 6e128d786bf5a9ccf30dd4a6a7cfcd1a43b8324c SHA256 ee59cbebb212cd7936407883e810a3e61e67088a86702adbe96f47d040560955
+MISC ChangeLog 7954 RMD160 bf0498008a5ee4c180dcca3d4829c42435bc4182 SHA1 ddf3f25b2b5bc582f25a0caee689bde97694408d SHA256 b97e7ee0e5ba537a92b4e7c20c8ac0836715ec19e3987533bc1f8f71857b748f
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky6/LcACgkQp5vW4rUFj5oewQCgs5RsS8daJzc+ru0+UqHn+sgu
+5KIAoL4uaQtPtfil+GmCAk1sZ91tK2yb
+=JJ70
+-----END PGP SIGNATURE-----
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
+}