cirros-testvm/src-cirros/buildroot-2015.05/package/nfs-utils/0002-Patch-taken-from-Gentoo.patch

   1 From 971389625c9602085d399d8ae7fc42b75efcfb7c 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/rpcdebug/Makefile.am |    7 +++----
  10  tools/rpcgen/Makefile.am   |    8 +++-----
  11  3 files changed, 9 insertions(+), 13 deletions(-)
  12
  13 diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
  14 index 3156815..efe6fcd 100644
  15 --- a/tools/locktest/Makefile.am
  16 +++ b/tools/locktest/Makefile.am
  17 @@ -1,12 +1,11 @@
  18  ## Process this file with automake to produce Makefile.in
  19
  20  CC=$(CC_FOR_BUILD)
  21 -LIBTOOL = @LIBTOOL@ --tag=CC
  22 +CFLAGS=$(CFLAGS_FOR_BUILD)
  23 +CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
  24 +LDFLAGS=$(LDFLAGS_FOR_BUILD)
  25
  26  noinst_PROGRAMS = testlk
  27  testlk_SOURCES = testlk.c
  28 -testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
  29 -testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
  30 -testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
  31
  32  MAINTAINERCLEANFILES = Makefile.in
  33 diff --git a/tools/rpcdebug/Makefile.am b/tools/rpcdebug/Makefile.am
  34 index 39b70c9..0056597 100644
  35 --- a/tools/rpcdebug/Makefile.am
  36 +++ b/tools/rpcdebug/Makefile.am
  37 @@ -1,15 +1,14 @@
  38  ## Process this file with automake to produce Makefile.in
  39
  40  CC=$(CC_FOR_BUILD)
  41 -LIBTOOL = @LIBTOOL@ --tag=CC
  42 +CFLAGS=$(CFLAGS_FOR_BUILD)
  43 +CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
  44 +LDFLAGS=$(LDFLAGS_FOR_BUILD)
  45
  46  man8_MANS = rpcdebug.man
  47  EXTRA_DIST = $(man8_MANS)
  48
  49  sbin_PROGRAMS = rpcdebug
  50  rpcdebug_SOURCES = rpcdebug.c
  51 -rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
  52 -rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
  53 -rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
  54
  55  MAINTAINERCLEANFILES = Makefile.in
  56 diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
  57 index 8a9ec89..5a5b4d3 100644
  58 --- a/tools/rpcgen/Makefile.am
  59 +++ b/tools/rpcgen/Makefile.am
  60 @@ -1,7 +1,9 @@
  61  ## Process this file with automake to produce Makefile.in
  62
  63  CC=$(CC_FOR_BUILD)
  64 -LIBTOOL = @LIBTOOL@ --tag=CC
  65 +CFLAGS=$(CFLAGS_FOR_BUILD)
  66 +CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
  67 +LDFLAGS=$(LDFLAGS_FOR_BUILD)
  68
  69  noinst_PROGRAMS = rpcgen
  70  rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
  71 @@ -9,10 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
  72                  rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
  73                  rpc_scan.h rpc_util.h
  74
  75 -rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
  76 -rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
  77 -rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
  78 -rpcgen_LDADD=$(LIBTIRPC)
  79
  80  MAINTAINERCLEANFILES = Makefile.in
  81
  82 --
  83 1.7.9.5
  84