diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-09-02 21:02:07 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-09-02 21:02:07 +0000 |
commit | 28e45d969c0fc96287d3169905e7a413d72db140 (patch) | |
tree | b24cd75fea44232aecb45f42d0b68ff94b300c34 | |
parent | media-gfx/gimp: Set precedence of Gimp on PDF files to zero (bug #321111) (diff) | |
download | historical-28e45d969c0fc96287d3169905e7a413d72db140.tar.gz historical-28e45d969c0fc96287d3169905e7a413d72db140.tar.bz2 historical-28e45d969c0fc96287d3169905e7a413d72db140.zip |
Fix cross-compiling with native helper tools.
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
-rw-r--r-- | net-fs/nfs-utils/ChangeLog | 6 | ||||
-rw-r--r-- | net-fs/nfs-utils/Manifest | 11 | ||||
-rw-r--r-- | net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch | 68 | ||||
-rw-r--r-- | net-fs/nfs-utils/nfs-utils-1.2.4.ebuild | 3 |
4 files changed, 81 insertions, 7 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index d5514f5a64b0..c31d20da9856 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-fs/nfs-utils # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.187 2011/09/02 19:27:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.188 2011/09/02 21:02:07 vapier Exp $ + + 02 Sep 2011; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.4.ebuild, + +files/nfs-utils-1.2.4-cross-build.patch: + Fix cross-compiling with native helper tools. 02 Sep 2011; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.4.ebuild, +files/nfs-utils-1.2.4-nfsidmap.patch, metadata.xml: diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index c35c20511194..20fe824cdc3e 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -10,6 +10,7 @@ AUX nfs-utils-1.2.2-nfsv4.patch 479 RMD160 2715fbde5c36a4e34af0d79b8760329bd2b18 AUX nfs-utils-1.2.2-optional-libcap.patch 2213 RMD160 7182147365404bc6f4caa676018bfc45b90570ad SHA1 99f09ff9b5590346ef367ee9683bc94272eac2ce SHA256 75135cc2c90aacc7adb43c6ced308099ac5b2d9c8cfcc74d395ead4dc583a75a AUX nfs-utils-1.2.3-ti-rpc-static-ports.patch 10290 RMD160 079daaf913c61b1ff6dac7bef0d3522c377c37ef SHA1 386f76c3e957ef61706db4708423a96b39557374 SHA256 8f188be765d5aa41eaa9d15df7cf0dc6b7ba29413866e8ada6c54973b0a942e9 AUX nfs-utils-1.2.4-conditional.patch 756 RMD160 494cb4a74986b041b8ecb2208c6db64b350eba2f SHA1 6fc45d7edd4a38940e73d4262cc91d92054a0d41 SHA256 b911b2ae5a87fdcb8c906e49c6787853daed6bd79179f3ee2f67c7a10b761d7e +AUX nfs-utils-1.2.4-cross-build.patch 1883 RMD160 d6e079286b6a8f0f92c77c1e79db56080dfc707d SHA1 8001614e7ab582ccffce59519b03aa7d1d43939d SHA256 ec7792cf496d66d82476c92be89ae58cd21add1888837827b8114a35b5f0b150 AUX nfs-utils-1.2.4-exportfs-skip-dir.patch 1079 RMD160 062c6897c9d939df8b4b6bb12da55712e41e2baa SHA1 f6e974c4cf03a35e143ff838e9e531ce4d6a9524 SHA256 16476adcec288a302fded2c8e1dbfc8012a57f98a6710a182623c45c889f85e4 AUX nfs-utils-1.2.4-exportfs-xlog.patch 1757 RMD160 0da3208e243bcd794faa9e189fbd983dd949fa3f SHA1 9081b7b193d3e54ef246c5dc96b6d650699a536d SHA256 b9a7bcb4c4f619dee1b4a7faabbeb07875ff0e8ba04a97a77cd4cd2dbaac51ce AUX nfs-utils-1.2.4-nfsidmap.patch 1925 RMD160 f11d80ee9ce99beb250301573630b2a6710d6892 SHA1 7b7ff10bcc2b053e3cd6fc9897a5238eb9cf726a SHA256 ae15774002b877a75376c176bb313ca950100ba95be2d1641b1dacb8aaa0c33c @@ -37,13 +38,13 @@ EBUILD nfs-utils-1.2.1.ebuild 3120 RMD160 c97608ea950bb115875d1c2058112b67e50015 EBUILD nfs-utils-1.2.2-r2.ebuild 3387 RMD160 957cda2a26635d233322f2ca62a4466bbe2ad537 SHA1 bd0fc823c4e79d0c5a0025f31f9a416a3411da78 SHA256 9dd1368b530d093538f6adb4715ec6634fe050e664b6ae0b004f65a8fae9c4f4 EBUILD nfs-utils-1.2.3-r1.ebuild 3243 RMD160 fd7ff6d183dab514a48bb361d52d6e7aaf88f66a SHA1 0622a8f2007e56295f5090e02f75550ce59f59f4 SHA256 5660e204ebd82df18a3ea663115dd821bc73828192e9e54862b5bb01121c81b0 EBUILD nfs-utils-1.2.3.ebuild 3150 RMD160 03ce5a05c2bc11e3d0fa87c86faf590329307531 SHA1 2293dc44577dd9d4c91f0e234e22301989810d12 SHA256 b1c484e0cc4b032cd44ff66d9e73866e0dfcea87c22917994f2aa6312db1bcba -EBUILD nfs-utils-1.2.4.ebuild 3539 RMD160 205b79466b47cb8c0fb4be62412a98979db3756b SHA1 74b03095f9f7535aed1fa9438b32a1b871162f37 SHA256 c279e384c5c1294c7440bf58329a2f88ba66dfcab78ad6eef69f30c4882e9103 -MISC ChangeLog 29751 RMD160 02a23c7cc647e750eb7d001ddecb23d9426b6bfb SHA1 639acbd7bc3dc3924a00fc909c52168a6e036533 SHA256 5698fa16ca1f1183c082a8cda1a410f3c0af4b4fa958143b75ceef4ae7112432 +EBUILD nfs-utils-1.2.4.ebuild 3591 RMD160 70a43cb84b86646874e88895f882ea0f962ae243 SHA1 486129b664b42342e66e9d5c1aca5cf87cd0d5c6 SHA256 22b50837c49fda5cd097298c307947c9efb0bc344896c630d343332ac4df63b6 +MISC ChangeLog 29918 RMD160 4acbf5e5fd64b4e7d203775860c5d231e6496a1e SHA1 f210b4749542c51542e34d8f8a3bc19a5136a378 SHA256 13df55761931673ce46bece016a5650760819687ee4471fd158c7491709f9109 MISC metadata.xml 530 RMD160 a57266554db20273338db07f0f895de97ee9b6d6 SHA1 3fd1043140c05d3f9d81a671acaf46d566e06af5 SHA256 97600ac996d2c56119c2ee41073ac83f8c732fff5931ecdbe5b66090e31d13af -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk5hLhgACgkQaC/OocHi7JaYkAD7BaeZJIJjJIJKD6Tz1Chb8clY -8DP9XEUZ6OTLTA0vwEgA/0FdjvbPU+xClIuqhDqZ9535cjcpqpSQu6dmXi2StLck -=JFQD +iF4EAREIAAYFAk5hRFYACgkQaC/OocHi7JZLHwD/e7V5OXhaW3GSu7xH3wT9wU1D +z/4bbFyLlnzFdehUbW4A+gLsDaftiQyjjSOU3LSWRJFHFkKURoJnoABwLu77dH0L +=BfA1 -----END PGP SIGNATURE----- diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch new file mode 100644 index 000000000000..c8f5fb9ee8fe --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch @@ -0,0 +1,68 @@ +this is kind of hacky, but automake doesn't make this easy +for us atm, so hack away :( + +(recent autotools will always add $(CFLAGS)/etc... to the compile) + +--- a/tools/locktest/Makefile.am ++++ b/tools/locktest/Makefile.am +@@ -1,12 +1,11 @@ + ## Process this file with automake to produce Makefile.in + + CC=$(CC_FOR_BUILD) +-LIBTOOL = @LIBTOOL@ --tag=CC ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + + noinst_PROGRAMS = testlk + testlk_SOURCES = testlk.c +-testlk_CFLAGS=$(CFLAGS_FOR_BUILD) +-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) +-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD) + + MAINTAINERCLEANFILES = Makefile.in +--- a/tools/rpcdebug/Makefile.am ++++ b/tools/rpcdebug/Makefile.am +@@ -1,15 +1,14 @@ + ## Process this file with automake to produce Makefile.in + + CC=$(CC_FOR_BUILD) +-LIBTOOL = @LIBTOOL@ --tag=CC ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + + man8_MANS = rpcdebug.man + EXTRA_DIST = $(man8_MANS) + + sbin_PROGRAMS = rpcdebug + rpcdebug_SOURCES = rpcdebug.c +-rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD) +-rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include +-rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD) + + MAINTAINERCLEANFILES = Makefile.in +--- a/tools/rpcgen/Makefile.am ++++ b/tools/rpcgen/Makefile.am +@@ -1,7 +1,9 @@ + ## Process this file with automake to produce Makefile.in + + CC=$(CC_FOR_BUILD) +-LIBTOOL = @LIBTOOL@ --tag=CC ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + + noinst_PROGRAMS = rpcgen + rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \ +@@ -9,10 +11,6 @@ + rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \ + rpc_scan.h rpc_util.h + +-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD) +-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD) +-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD) +- + MAINTAINERCLEANFILES = Makefile.in + + EXTRA_DIST = rpcgen.new.1 diff --git a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild index 3438e77e8233..451ab8ba54a2 100644 --- a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild,v 1.3 2011/09/02 19:27:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild,v 1.4 2011/09/02 21:02:07 vapier Exp $ EAPI="2" @@ -50,6 +50,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-exportfs-skip-dir.patch epatch "${FILESDIR}"/${P}-conditional.patch epatch "${FILESDIR}"/${PN}-1.2.4-nfsidmap.patch + epatch "${FILESDIR}"/${PN}-1.2.4-cross-build.patch eautoreconf } |