Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs-utils-1.2.4-cross-build.patch
Date: Fri, 02 Sep 2011 21:02:18
Message-Id: 20110902210207.94CDF2004C@flycatcher.gentoo.org
1 vapier 11/09/02 21:02:07
2
3 Added: nfs-utils-1.2.4-cross-build.patch
4 Log:
5 Fix cross-compiling with native helper tools.
6
7 (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.2.4-cross-build.patch?rev=1.1&content-type=text/plain
14
15 Index: nfs-utils-1.2.4-cross-build.patch
16 ===================================================================
17 this is kind of hacky, but automake doesn't make this easy
18 for us atm, so hack away :(
19
20 (recent autotools will always add $(CFLAGS)/etc... to the compile)
21
22 --- a/tools/locktest/Makefile.am
23 +++ b/tools/locktest/Makefile.am
24 @@ -1,12 +1,11 @@
25 ## Process this file with automake to produce Makefile.in
26
27 CC=$(CC_FOR_BUILD)
28 -LIBTOOL = @LIBTOOL@ --tag=CC
29 +CFLAGS=$(CFLAGS_FOR_BUILD)
30 +CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
31 +LDFLAGS=$(LDFLAGS_FOR_BUILD)
32
33 noinst_PROGRAMS = testlk
34 testlk_SOURCES = testlk.c
35 -testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
36 -testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
37 -testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
38
39 MAINTAINERCLEANFILES = Makefile.in
40 --- a/tools/rpcdebug/Makefile.am
41 +++ b/tools/rpcdebug/Makefile.am
42 @@ -1,15 +1,14 @@
43 ## Process this file with automake to produce Makefile.in
44
45 CC=$(CC_FOR_BUILD)
46 -LIBTOOL = @LIBTOOL@ --tag=CC
47 +CFLAGS=$(CFLAGS_FOR_BUILD)
48 +CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
49 +LDFLAGS=$(LDFLAGS_FOR_BUILD)
50
51 man8_MANS = rpcdebug.man
52 EXTRA_DIST = $(man8_MANS)
53
54 sbin_PROGRAMS = rpcdebug
55 rpcdebug_SOURCES = rpcdebug.c
56 -rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
57 -rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
58 -rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
59
60 MAINTAINERCLEANFILES = Makefile.in
61 --- a/tools/rpcgen/Makefile.am
62 +++ b/tools/rpcgen/Makefile.am
63 @@ -1,7 +1,9 @@
64 ## Process this file with automake to produce Makefile.in
65
66 CC=$(CC_FOR_BUILD)
67 -LIBTOOL = @LIBTOOL@ --tag=CC
68 +CFLAGS=$(CFLAGS_FOR_BUILD)
69 +CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
70 +LDFLAGS=$(LDFLAGS_FOR_BUILD)
71
72 noinst_PROGRAMS = rpcgen
73 rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
74 @@ -9,10 +11,6 @@
75 rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
76 rpc_scan.h rpc_util.h
77
78 -rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
79 -rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
80 -rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
81 -
82 MAINTAINERCLEANFILES = Makefile.in
83
84 EXTRA_DIST = rpcgen.new.1