package/nfs-utils/0001-Patch-taken-from-Gentoo.patch

   1 From 5796ca01e33596d4102dd714349c908fecc331c0 Mon Sep 17 00:00:00 2001
   2 From: Gustavo Zacarias <gustavo@zacarias.com.ar>
   3 Date: Sat, 10 Nov 2012 18:56:12 +0100
   4 Subject: [PATCH] Patch taken from Gentoo
   5
   6 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
   7 ---
   8  tools/locktest/Makefile.am | 7 +++----
   9  tools/rpcgen/Makefile.am   | 8 +++-----
  10  2 files changed, 6 insertions(+), 9 deletions(-)
  11
  12 diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
  13 index 3156815..efe6fcd 100644
  14 --- a/tools/locktest/Makefile.am
  15 +++ b/tools/locktest/Makefile.am
  16 @@ -1,12 +1,11 @@
  17  ## Process this file with automake to produce Makefile.in
  18
  19  CC=$(CC_FOR_BUILD)
  20 -LIBTOOL = @LIBTOOL@ --tag=CC
  21 +CFLAGS=$(CFLAGS_FOR_BUILD)
  22 +CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
  23 +LDFLAGS=$(LDFLAGS_FOR_BUILD)
  24
  25  noinst_PROGRAMS = testlk
  26  testlk_SOURCES = testlk.c
  27 -testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
  28 -testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
  29 -testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
  30
  31  MAINTAINERCLEANFILES = Makefile.in
  32 diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
  33 index 8a9ec89..5a5b4d3 100644
  34 --- a/tools/rpcgen/Makefile.am
  35 +++ b/tools/rpcgen/Makefile.am
  36 @@ -1,7 +1,9 @@
  37  ## Process this file with automake to produce Makefile.in
  38
  39  CC=$(CC_FOR_BUILD)
  40 -LIBTOOL = @LIBTOOL@ --tag=CC
  41 +CFLAGS=$(CFLAGS_FOR_BUILD)
  42 +CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
  43 +LDFLAGS=$(LDFLAGS_FOR_BUILD)
  44
  45  noinst_PROGRAMS = rpcgen
  46  rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
  47 @@ -9,10 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
  48                  rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
  49                  rpc_scan.h rpc_util.h
  50
  51 -rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
  52 -rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
  53 -rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
  54 -rpcgen_LDADD=$(LIBTIRPC)
  55
  56  MAINTAINERCLEANFILES = Makefile.in
  57
  58 --
  59 2.1.0
  60