From 7efa0bf5dced0a634223aa181f9932f29bbbdefc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 14 May 2014 09:49:03 +0200 Subject: allow autoreconf --- package/nfs-utils/Makefile | 3 +- package/nfs-utils/patches/patch-tools_Makefile_am | 10 +++++ package/nfs-utils/patches/patch-tools_Makefile_in | 20 --------- .../patches/patch-tools_rpcgen_Makefile_am | 25 +++++++++++ .../patches/patch-tools_rpcgen_Makefile_in | 48 ---------------------- .../nfs-utils/patches/patch-utils_mountd_fsloc_c | 6 +-- 6 files changed, 40 insertions(+), 72 deletions(-) create mode 100644 package/nfs-utils/patches/patch-tools_Makefile_am delete mode 100644 package/nfs-utils/patches/patch-tools_Makefile_in create mode 100644 package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am delete mode 100644 package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in (limited to 'package/nfs-utils') diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 1bc5f7b69..0e39aba21 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 3ac3726eda563946d1f44ac3e5b61d56 PKG_DESCR:= network filesystem utilities PKG_SECTION:= net/fs PKG_DEPENDS:= keyutils libtirpc rpcbind libdevmapper libpthread -PKG_BUILDDEP:= keyutils libtirpc lvm +PKG_BUILDDEP:= autotool keyutils libtirpc lvm PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} @@ -34,6 +34,7 @@ $(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${P $(eval $(call PKG_template,NFS_UTILS_CLIENT,nfs-utils-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_CLIENT},${PKGSD_NFS_UTILS_CLIENT},${PKG_SECTION})) $(eval $(call PKG_template,NFS_UTILS_SERVER,nfs-utils-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_NFS_UTILS_SERVER},${PKGSD_NFS_UTILS_SERVER},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf ifeq ($(ADK_PACKAGE_NFS_UTILS_SERVER_V4),y) CONFIGURE_ARGS+= --enable-nfsv4 \ --disable-nfsv41 \ diff --git a/package/nfs-utils/patches/patch-tools_Makefile_am b/package/nfs-utils/patches/patch-tools_Makefile_am new file mode 100644 index 000000000..dda2eeba5 --- /dev/null +++ b/package/nfs-utils/patches/patch-tools_Makefile_am @@ -0,0 +1,10 @@ +--- nfs-utils-1.3.0.orig/tools/Makefile.am 2014-03-25 16:12:07.000000000 +0100 ++++ nfs-utils-1.3.0/tools/Makefile.am 2014-05-13 21:09:39.000000000 +0200 +@@ -6,6 +6,6 @@ if CONFIG_RPCGEN + OPTDIRS += rpcgen + endif + +-SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS) ++SUBDIRS = $(OPTDIRS) + + MAINTAINERCLEANFILES = Makefile.in diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in deleted file mode 100644 index e0c95feb8..000000000 --- a/package/nfs-utils/patches/patch-tools_Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- nfs-utils-1.2.9.orig/tools/Makefile.in 2013-11-05 21:58:15.000000000 +0100 -+++ nfs-utils-1.2.9/tools/Makefile.in 2014-02-19 13:46:55.000000000 +0100 -@@ -156,7 +156,7 @@ am__define_uniq_tagged_files = \ - done | $(am__uniquify_input)` - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcgen -+DIST_SUBDIRS = rpcgen - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - am__relativize = \ - dir0=`pwd`; \ -@@ -361,7 +361,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - OPTDIRS = $(am__append_1) --SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS) -+SUBDIRS = rpcgen - MAINTAINERCLEANFILES = Makefile.in - all: all-recursive - diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am new file mode 100644 index 000000000..45cc4bb47 --- /dev/null +++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_am @@ -0,0 +1,25 @@ +--- nfs-utils-1.3.0.orig/tools/rpcgen/Makefile.am 2014-03-25 16:12:07.000000000 +0100 ++++ nfs-utils-1.3.0/tools/rpcgen/Makefile.am 2014-05-13 21:22:49.000000000 +0200 +@@ -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,11 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout. + 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) +-rpcgen_LDADD=$(LIBTIRPC) +- + MAINTAINERCLEANFILES = Makefile.in + + EXTRA_DIST = rpcgen.new.1 diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in deleted file mode 100644 index 6ff8efbf8..000000000 --- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in +++ /dev/null @@ -1,48 +0,0 @@ ---- nfs-utils-1.2.9.orig/tools/rpcgen/Makefile.in 2013-11-05 21:58:16.000000000 +0100 -+++ nfs-utils-1.2.9/tools/rpcgen/Makefile.in 2014-02-21 17:06:36.000000000 +0100 -@@ -119,8 +119,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent - am__v_lt_1 = - rpcgen_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \ -- $(rpcgen_LDFLAGS) $(LDFLAGS) -o $@ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS_FOR_BUILD) \ -+ $(rpcgen_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -187,7 +187,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ - ALLOCA = @ALLOCA@ - AMTAR = @AMTAR@ - AM_CFLAGS = @AM_CFLAGS@ --AM_CPPFLAGS = @AM_CPPFLAGS@ -+AM_CPPFLAGS = - AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ - AR = @AR@ - AUTOCONF = @AUTOCONF@ -@@ -197,7 +197,7 @@ AWK = @AWK@ - CC = $(CC_FOR_BUILD) - CCDEPMODE = @CCDEPMODE@ - CC_FOR_BUILD = @CC_FOR_BUILD@ --CFLAGS = @CFLAGS@ -+CFLAGS = - CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ -@@ -367,7 +367,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout. - rpcgen_CFLAGS = $(CFLAGS_FOR_BUILD) - rpcgen_CPPLAGS = $(CPPFLAGS_FOR_BUILD) - rpcgen_LDFLAGS = $(LDFLAGS_FOR_BUILD) --rpcgen_LDADD = $(LIBTIRPC) - MAINTAINERCLEANFILES = Makefile.in - EXTRA_DIST = rpcgen.new.1 - all: all-am -@@ -416,7 +415,7 @@ clean-noinstPROGRAMS: - - rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) $(EXTRA_rpcgen_DEPENDENCIES) - @rm -f rpcgen$(EXEEXT) -- $(AM_V_CCLD)$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS) -+ $(AM_V_CCLD)$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) diff --git a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c index 7cb0c4ca0..799a95801 100644 --- a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c +++ b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c @@ -1,6 +1,6 @@ ---- nfs-utils-1.2.9.orig/utils/mountd/fsloc.c 2013-11-05 21:41:27.000000000 +0100 -+++ nfs-utils-1.2.9/utils/mountd/fsloc.c 2014-02-21 17:01:23.000000000 +0100 -@@ -127,7 +127,7 @@ static struct servers *method_list(char +--- nfs-utils-1.3.0.orig/utils/mountd/fsloc.c 2014-03-25 16:12:07.000000000 +0100 ++++ nfs-utils-1.3.0/utils/mountd/fsloc.c 2014-05-13 20:23:33.000000000 +0200 +@@ -127,7 +127,7 @@ static struct servers *method_list(char bool v6esc = false; xlog(L_NOTICE, "method_list(%s)", data); -- cgit v1.2.3