From 94c780ccc4d0c411d83625e9130519b81b6b419a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Mar 2009 11:37:18 -0800 Subject: nfs-utils_1.1.2: Set compile flags to use flags_for_build when building tools. --- .../nfs-utils-tools-unset-cflags.patch | 92 ++++++++++++++++++++++ packages/nfs-utils/nfs-utils_1.1.2.bb | 3 +- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 packages/nfs-utils/nfs-utils-1.1.2/nfs-utils-tools-unset-cflags.patch diff --git a/packages/nfs-utils/nfs-utils-1.1.2/nfs-utils-tools-unset-cflags.patch b/packages/nfs-utils/nfs-utils-1.1.2/nfs-utils-tools-unset-cflags.patch new file mode 100644 index 0000000000..16bdebf12e --- /dev/null +++ b/packages/nfs-utils/nfs-utils-1.1.2/nfs-utils-tools-unset-cflags.patch @@ -0,0 +1,92 @@ +Index: nfs-utils-1.1.2/tools/Makefile.am +=================================================================== +--- nfs-utils-1.1.2.orig/tools/Makefile.am 2008-03-14 08:46:29.000000000 -0700 ++++ nfs-utils-1.1.2/tools/Makefile.am 2009-03-04 01:58:50.000000000 -0800 +@@ -5,7 +5,10 @@ + if CONFIG_RPCGEN + OPTDIRS += rpcgen + endif +- ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++CXXFLAGS=$(CXXFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + SUBDIRS = locktest rpcdebug nlmtest $(OPTDIRS) + + MAINTAINERCLEANFILES = Makefile.in +Index: nfs-utils-1.1.2/tools/locktest/Makefile.am +=================================================================== +--- nfs-utils-1.1.2.orig/tools/locktest/Makefile.am 2008-03-14 08:46:29.000000000 -0700 ++++ nfs-utils-1.1.2/tools/locktest/Makefile.am 2009-03-04 01:58:50.000000000 -0800 +@@ -1,12 +1,13 @@ + ## Process this file with automake to produce Makefile.in + + CC=$(CC_FOR_BUILD) ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++CXXFLAGS=$(CXXFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + LIBTOOL = @LIBTOOL@ --tag=CC + + 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 +Index: nfs-utils-1.1.2/tools/nlmtest/Makefile.am +=================================================================== +--- nfs-utils-1.1.2.orig/tools/nlmtest/Makefile.am 2008-03-14 08:46:29.000000000 -0700 ++++ nfs-utils-1.1.2/tools/nlmtest/Makefile.am 2009-03-04 01:58:50.000000000 -0800 +@@ -1,5 +1,8 @@ + ## Process this file with automake to produce Makefile.in +- ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++CXXFLAGS=$(CXXFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + EXTRA_DIST = \ + README \ + host.h \ +Index: nfs-utils-1.1.2/tools/rpcgen/Makefile.am +=================================================================== +--- nfs-utils-1.1.2.orig/tools/rpcgen/Makefile.am 2008-03-14 08:46:29.000000000 -0700 ++++ nfs-utils-1.1.2/tools/rpcgen/Makefile.am 2009-03-04 01:58:50.000000000 -0800 +@@ -1,6 +1,10 @@ + ## Process this file with automake to produce Makefile.in + + CC=$(CC_FOR_BUILD) ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++CXXFLAGS=$(CXXFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + LIBTOOL = @LIBTOOL@ --tag=CC + + noinst_PROGRAMS = rpcgen +@@ -9,10 +13,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 +Index: nfs-utils-1.1.2/tools/rpcdebug/Makefile.am +=================================================================== +--- nfs-utils-1.1.2.orig/tools/rpcdebug/Makefile.am 2009-03-04 02:01:41.000000000 -0800 ++++ nfs-utils-1.1.2/tools/rpcdebug/Makefile.am 2009-03-04 02:02:42.000000000 -0800 +@@ -1,6 +1,10 @@ + ## Process this file with automake to produce Makefile.in + + CC=$(CC_FOR_BUILD) ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++CXXFLAGS=$(CXXFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) + LIBTOOL = @LIBTOOL@ --tag=CC + + man8_MANS = rpcdebug.man diff --git a/packages/nfs-utils/nfs-utils_1.1.2.bb b/packages/nfs-utils/nfs-utils_1.1.2.bb index 353eb574ae..350c195d92 100644 --- a/packages/nfs-utils/nfs-utils_1.1.2.bb +++ b/packages/nfs-utils/nfs-utils_1.1.2.bb @@ -3,11 +3,12 @@ PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "3" +PR = "r4" DEPENDS = "e2fsprogs-libs tcp-wrappers libevent" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ + file://nfs-utils-tools-unset-cflags.patch;patch=1 \ file://nfsserver \ " -- cgit 1.2.3-korg