From 5f854077c9522c9bb23da7277033fe47005c34ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Sun, 29 Apr 2007 21:22:37 +0000 Subject: [PATCH] Fix broken build with --as-needed, thanks to Matej Laitl (#176264). Package-Manager: portage-2.1.2.2 --- app-mobilephone/obexftp/ChangeLog | 7 ++++- app-mobilephone/obexftp/Manifest | 26 +++++++++++-------- .../files/obexftp-0.21-as-needed.patch | 10 +++++++ app-mobilephone/obexftp/obexftp-0.21.ebuild | 3 ++- 4 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog index a78997d0f877..5bf047737256 100644 --- a/app-mobilephone/obexftp/ChangeLog +++ b/app-mobilephone/obexftp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-mobilephone/obexftp # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.22 2007/04/17 22:03:48 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.23 2007/04/29 21:22:37 mrness Exp $ + + 29 Apr 2007; Alin Năstac + +files/obexftp-0.21-as-needed.patch, obexftp-0.21.ebuild: + Fix broken build with --as-needed, thanks to Matej Laitl (#176264). 17 Apr 2007; Alin Năstac obexftp-0.21.ebuild: Remove ruby USE flag (#174507). diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest index b2072650ea3d..58cd25670e08 100644 --- a/app-mobilephone/obexftp/Manifest +++ b/app-mobilephone/obexftp/Manifest @@ -5,6 +5,10 @@ AUX obexftp-0.19-cobex_write.patch 2292 RMD160 0ec6be346020f3f883c96c2764116276f MD5 6a6fe66463cf754e0bffe6c432546d25 files/obexftp-0.19-cobex_write.patch 2292 RMD160 0ec6be346020f3f883c96c2764116276f89fecf4 files/obexftp-0.19-cobex_write.patch 2292 SHA256 ba3fbfbc3cd40d9635429ee965e9a81f18d577597f2fcade5a706ef1b0c42392 files/obexftp-0.19-cobex_write.patch 2292 +AUX obexftp-0.21-as-needed.patch 396 RMD160 5c4c1409b9a57321e2730e3d91a92674be6a6561 SHA1 b4066135a7bd537d93762c23c403a46a082c1cd4 SHA256 6903575382e405c87ae5069441a711b93a15f731af9412253cdd790b8a88440e +MD5 16eed3f0c39f3d4cdf86b6d8870ef540 files/obexftp-0.21-as-needed.patch 396 +RMD160 5c4c1409b9a57321e2730e3d91a92674be6a6561 files/obexftp-0.21-as-needed.patch 396 +SHA256 6903575382e405c87ae5069441a711b93a15f731af9412253cdd790b8a88440e files/obexftp-0.21-as-needed.patch 396 AUX obexftp-0.21-cobex_write.patch 2292 RMD160 0589e7699bc4ff514f954e4d515465fded71b7ef SHA1 e48bfe29127ad74b199dfc9af103b6e91b0c58f5 SHA256 fd310fe90cf2b4211e394caeacae8d962c08a3233fa0da066b83f6a29144d6d9 MD5 22ff2b0139e04ee668962537a486e8ab files/obexftp-0.21-cobex_write.patch 2292 RMD160 0589e7699bc4ff514f954e4d515465fded71b7ef files/obexftp-0.21-cobex_write.patch 2292 @@ -23,14 +27,14 @@ EBUILD obexftp-0.19-r1.ebuild 1325 RMD160 9b88d8f81ec8bfb5927476b9c368759bce0592 MD5 05c51575b425f64154f79698d17ac1a9 obexftp-0.19-r1.ebuild 1325 RMD160 9b88d8f81ec8bfb5927476b9c368759bce0592dc obexftp-0.19-r1.ebuild 1325 SHA256 9aeb49c286856f3a19377c07af3ae661475a460e22385a4a816be06928690f4c obexftp-0.19-r1.ebuild 1325 -EBUILD obexftp-0.21.ebuild 1675 RMD160 9b70bc87c340e27b10d452c52aa07082ee3e913b SHA1 f95e818739546689c8d8f9a8e35624c8c0e742d6 SHA256 f5b822ba9f3f101a0dbebbe2b6d29b707ab18f1d732262f6c8bc7db4495f6564 -MD5 7af882673a65ffdfa775f5e6e63517c0 obexftp-0.21.ebuild 1675 -RMD160 9b70bc87c340e27b10d452c52aa07082ee3e913b obexftp-0.21.ebuild 1675 -SHA256 f5b822ba9f3f101a0dbebbe2b6d29b707ab18f1d732262f6c8bc7db4495f6564 obexftp-0.21.ebuild 1675 -MISC ChangeLog 7031 RMD160 eec094df90840598052ac3a57cb34c3e94e4647b SHA1 d9d7d1b7e54bb64d4411c17263005d47518eaa8e SHA256 5c20341c25063746e5bee535d00953c9046384205a158ed26086e25c53d78776 -MD5 ecb807e2960c278f60e256006682877b ChangeLog 7031 -RMD160 eec094df90840598052ac3a57cb34c3e94e4647b ChangeLog 7031 -SHA256 5c20341c25063746e5bee535d00953c9046384205a158ed26086e25c53d78776 ChangeLog 7031 +EBUILD obexftp-0.21.ebuild 1718 RMD160 24d3a62be7659b4735dbb8798f56d6e7ce5bafd5 SHA1 08003f1f6c0443eb22d16e61bae45b87bd854581 SHA256 a49b2121c0218f85b66881042620ad20591407319270954ec11c2ee6ab0290f0 +MD5 45ca8b51a0f40757080172390256b32e obexftp-0.21.ebuild 1718 +RMD160 24d3a62be7659b4735dbb8798f56d6e7ce5bafd5 obexftp-0.21.ebuild 1718 +SHA256 a49b2121c0218f85b66881042620ad20591407319270954ec11c2ee6ab0290f0 obexftp-0.21.ebuild 1718 +MISC ChangeLog 7239 RMD160 83b7aa5280325e285b77e197c983a149690c2c9c SHA1 d8ca7622af8826e9286c187e247f2e433dc7ecfc SHA256 ba980d20cc84059301097058cad1ba2bdfa234041e3f884136284d79c6ef159c +MD5 dc36884edc6b97ec01f61ecb9dad3c5c ChangeLog 7239 +RMD160 83b7aa5280325e285b77e197c983a149690c2c9c ChangeLog 7239 +SHA256 ba980d20cc84059301097058cad1ba2bdfa234041e3f884136284d79c6ef159c ChangeLog 7239 MISC metadata.xml 336 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 SHA1 2826721776ac855b8539336dbcad0750c1399171 SHA256 ac612b65bbad310c1953486d1ce87c081502ec1c90e3d348ae697dc8d3847aff MD5 1a820f941ddbd683086de6d92efbdf5c metadata.xml 336 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 metadata.xml 336 @@ -44,7 +48,7 @@ SHA256 dd7640ca20ce53410403c1fb5dac6d33a4b75fccebb9cfa96ddff446012239e6 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGJUROJnxX6mF440QRAsZ8AJsEFiK087wc5FJd7MKPVXEEU+xNZQCffLgm -bt0w1e5C+0RU2m9pG5BQ7mw= -=Z2jr +iD8DBQFGNQytJnxX6mF440QRAqbUAKCkZIwrrg4vnzucDZ2i/xv2dFcWngCgu73K +tzkTFPeQuy0Ym2AeiRtoWMM= +=heq2 -----END PGP SIGNATURE----- diff --git a/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch b/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch new file mode 100644 index 000000000000..b949f4f51a13 --- /dev/null +++ b/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch @@ -0,0 +1,10 @@ +diff -Nru obexftp-0.21.orig/obexftp/Makefile.am obexftp-0.21/obexftp/Makefile.am +--- obexftp-0.21.orig/obexftp/Makefile.am 2007-04-28 20:13:54.000000000 +0200 ++++ obexftp-0.21/obexftp/Makefile.am 2007-04-28 22:25:00.000000000 +0200 +@@ -26,3 +26,6 @@ + + libobexftp_la_LDFLAGS = -version-info $(OBEXFTP_VERSION) + ++libobexftp_la_LIBADD = ../multicobex/libmulticobex.la \ ++ ../bfb/libbfb.la ++ diff --git a/app-mobilephone/obexftp/obexftp-0.21.ebuild b/app-mobilephone/obexftp/obexftp-0.21.ebuild index 4f74969304da..c955047c68a8 100644 --- a/app-mobilephone/obexftp/obexftp-0.21.ebuild +++ b/app-mobilephone/obexftp/obexftp-0.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.21.ebuild,v 1.10 2007/04/17 22:03:48 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.21.ebuild,v 1.11 2007/04/29 21:22:37 mrness Exp $ WANT_AUTOMAKE="1.9" @@ -30,6 +30,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-cobex_write.patch" epatch "${FILESDIR}/${P}-sdp-detection.patch" + epatch "${FILESDIR}/${P}-as-needed.patch" use nls || epatch "${FILESDIR}/${P}-no_iconv.patch" cd "${S}" -- 2.26.2