diff options
Diffstat (limited to 'package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in')
| -rw-r--r-- | package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in | 84 |
1 files changed, 20 insertions, 64 deletions
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in index 5aa76ea22..d6b448e59 100644 --- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in +++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in @@ -1,70 +1,26 @@ ---- nfs-utils-1.2.8.orig/tools/rpcgen/Makefile.in 2013-04-22 18:48:22.000000000 +0200 -+++ nfs-utils-1.2.8/tools/rpcgen/Makefile.in 2013-08-13 11:04:51.000000000 +0200 -@@ -87,21 +87,21 @@ rpcgen_OBJECTS = $(am_rpcgen_OBJECTS) - am__DEPENDENCIES_1 = - rpcgen_DEPENDENCIES = $(am__DEPENDENCIES_1) - rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \ +--- 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-19 20:12:32.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 $@ -+ --mode=link $(CCLD) $(rpcgen_CFLAGS) \ -+ $(rpcgen_LDFLAGS) -o $@ - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) - LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) \ -+ -o $@ - SOURCES = $(rpcgen_SOURCES) - DIST_SOURCES = $(rpcgen_SOURCES) - am__can_run_installinfo = \ -@@ -117,7 +117,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ - ALLOCA = @ALLOCA@ - AMTAR = @AMTAR@ - AM_CFLAGS = @AM_CFLAGS@ --AM_CPPFLAGS = @AM_CPPFLAGS@ -+AM_CPPFLAGS = - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -126,10 +126,10 @@ AWK = @AWK@ ++ $(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 +@@ -197,7 +197,7 @@ AWK = @AWK@ CC = $(CC_FOR_BUILD) CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ -+CFLAGS = ++CFLAGS = CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = - CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -@@ -167,10 +167,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P - K5VERS = @K5VERS@ - KRBCFLAGS = @KRBCFLAGS@ - KRBDIR = @KRBDIR@ --KRBLDFLAGS = @KRBLDFLAGS@ -+KRBLDFLAGS = - KRBLIBS = @KRBLIBS@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = - LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ - LIBBLKID = @LIBBLKID@ - LIBBSD = @LIBBSD@ -@@ -296,7 +296,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout. + 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) @@ -72,12 +28,12 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = rpcgen.new.1 all: all-am -@@ -344,7 +343,7 @@ clean-noinstPROGRAMS: - rm -f $$list +@@ -416,7 +415,7 @@ clean-noinstPROGRAMS: + rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) $(EXTRA_rpcgen_DEPENDENCIES) @rm -f rpcgen$(EXEEXT) -- $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS) -+ $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) +- $(AM_V_CCLD)$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) mostlyclean-compile: -rm -f *.$(OBJEXT) |