diff options
| author |   Maurice van der Pot <griffon26@gentoo.org> | 2005-06-07 19:36:40 +0000 |
|---|---|---|
| committer | Maurice van der Pot <griffon26@gentoo.org> | 2005-06-07 19:36:40 +0000 |
| commit | ebee38d26c57e3d88bbedb601f70f2a3a2d438ad (patch) | |
| tree | 29a1fefb819f7164809ab5c69d0e127928edd934 /net-fs/am-utils/files | |
| parent | Fix DEPEND (sys-kernel/linux26-headers is no-longer in the tree). (diff) | |
| download | gentoo-2-ebee38d26c57e3d88bbedb601f70f2a3a2d438ad.tar.gz gentoo-2-ebee38d26c57e3d88bbedb601f70f2a3a2d438ad.tar.bz2 gentoo-2-ebee38d26c57e3d88bbedb601f70f2a3a2d438ad.zip | |
Added am-utils-6.0.10 closing bug #89334
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-fs/am-utils/files')
| -rw-r--r-- | net-fs/am-utils/files/am-utils-6.0.10-parallel-build.patch | 70 | ||||
| -rw-r--r-- | net-fs/am-utils/files/digest-am-utils-6.0.10 | 1 |
2 files changed, 71 insertions, 0 deletions
diff --git a/net-fs/am-utils/files/am-utils-6.0.10-parallel-build.patch b/net-fs/am-utils/files/am-utils-6.0.10-parallel-build.patch new file mode 100644 index 000000000000..c2eab6c06ee4 --- /dev/null +++ b/net-fs/am-utils/files/am-utils-6.0.10-parallel-build.patch @@ -0,0 +1,70 @@ +diff -ruN am-utils-6.0.10/amd/Makefile.am am-utils-6.0.10-fixed/amd/Makefile.am +--- am-utils-6.0.10/amd/Makefile.am 2005-03-15 03:07:48.000000000 +0100 ++++ am-utils-6.0.10-fixed/amd/Makefile.am 2005-05-28 23:48:24.850194336 +0200 +@@ -16,7 +16,12 @@ + # which will not generate the .h needs for the lex file from the yacc file. + # I took out the conf .y/.l files b/c of bad interaction between bsd44 make + # and automake-1.2 rules. ++ ++# sources needed: note .y and .l files have to be first + amd_SOURCES = \ ++ conf_parse.y \ ++ conf_tok.l \ ++ \ + am_ops.c \ + amd.c \ + amfs_auto.c \ +@@ -82,27 +87,29 @@ + # filesystem types this system supports. + # AMD_INFO_OBJS: a list of info_*.o objects added, depending on which map + # types this system supports. +-EXTRA_amd_OBJECTS = @AMD_FS_OBJS@ @AMD_INFO_OBJS@ conf_tok.o conf_parse.o ++EXTRA_amd_OBJECTS = @AMD_FS_OBJS@ @AMD_INFO_OBJS@ + LDADD = $(EXTRA_amd_OBJECTS) ../libamu/libamu.la + # must manually add f/lex library to LIBS, and not to LDADD. + LIBS = @LIBS@ @LEXLIB@ + + # additional files to distribute and clean +-EXTRA_DIST = conf_tok.l conf_parse.y ops_TEMPLATE.c $(man_MANS) ++EXTRA_DIST = ops_TEMPLATE.c $(man_MANS) + CLEANFILES = conf_tok.c conf_parse.c conf_parse.h + DISTCLEANFILES = build_version.h + ++# do not distribute files that should be generated by lex/yacc locally ++dist-hook: ++ (cd $(distdir) && rm -f conf_parse.c conf_parse.h conf_tok.c) ++ + INCLUDES = -I$(top_srcdir)/include + + # allow users to add their own flags via "configure --enable-am-flags=ARG" + AMU_CFLAGS = @AMU_CFLAGS@ + AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS) +-YACC = @YACC@ +-YFLAGS = -d ++AM_YFLAGS = -d + + # dependencies + $(PROGRAMS): $(LDADD) +-conf_tok.o: conf_parse.h + get_args.o: build_version.h + $(amd_OBJECTS) $(EXTRA_amd_OBJECTS): \ + ../config.h \ +@@ -115,18 +122,6 @@ + @AMU_NFS_PROT_HEADER@ \ + $(noinst_HEADERS) + +-# Must use my rules, b/c ones supplied by automake-1.2 don't work +-# with bsd44 make (they have built-in rules to build yacc/lex files). +-# Code generated by yacc/lex: +-conf_tok.c: $(srcdir)/conf_tok.l +- $(LEX) $? +- mv lex.yy.c conf_tok.c +- +-conf_parse.c conf_parse.h: $(srcdir)/conf_parse.y +- $(YACC) -d $? +- mv y.tab.c conf_parse.c +- mv y.tab.h conf_parse.h +- + # auto-generate build number + build_version.h: $(amd_SOURCES) $(EXTRA_amd_SOURCES) \ + ../config.h \ diff --git a/net-fs/am-utils/files/digest-am-utils-6.0.10 b/net-fs/am-utils/files/digest-am-utils-6.0.10 new file mode 100644 index 000000000000..73b34299fbf1 --- /dev/null +++ b/net-fs/am-utils/files/digest-am-utils-6.0.10 @@ -0,0 +1 @@ +MD5 ec26df84e2ef9d55c9e6ea3c648788d4 am-utils-6.0.10.tar.gz 1650526 |