diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2012-11-30 05:17:41 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2012-11-30 05:17:41 +0000 |
| commit | b61d35b15b47c5e53150fe49c0c8cb5c8d81c7f5 (patch) | |
| tree | 259e4cc8e9235077eb6bd9ec2b57167e531b442e /sci-visualization/epix/files | |
| parent | keyword ~amd64-linux (diff) | |
| download | gentoo-2-b61d35b15b47c5e53150fe49c0c8cb5c8d81c7f5.tar.gz gentoo-2-b61d35b15b47c5e53150fe49c0c8cb5c8d81c7f5.tar.bz2 gentoo-2-b61d35b15b47c5e53150fe49c0c8cb5c8d81c7f5.zip | |
Respect AR (bug #443136) and rename bash-completion file
(Portage version: 2.2.01.21313-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-visualization/epix/files')
| -rw-r--r-- | sci-visualization/epix/files/epix-1.2.10-autotools.patch | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/sci-visualization/epix/files/epix-1.2.10-autotools.patch b/sci-visualization/epix/files/epix-1.2.10-autotools.patch index a7b815b0e444..03f93cd26c9c 100644 --- a/sci-visualization/epix/files/epix-1.2.10-autotools.patch +++ b/sci-visualization/epix/files/epix-1.2.10-autotools.patch @@ -1,6 +1,17 @@ +diff -Nur epix-1.2.10.orig/configure.ac epix-1.2.10/configure.ac +--- epix-1.2.10.orig/configure.ac 2012-11-29 21:04:20.411280150 -0800 ++++ epix-1.2.10/configure.ac 2012-11-29 21:14:00.462163755 -0800 +@@ -9,6 +9,7 @@ + dnl Checks for programs. + AC_PROG_CXX + AC_PROG_LN_S ++AM_PROG_AR + AC_PROG_RANLIB + AC_PROG_MAKE_SET + AC_PROG_INSTALL diff -Nur epix-1.2.10.orig/doc/Makefile.am epix-1.2.10/doc/Makefile.am ---- epix-1.2.10.orig/doc/Makefile.am 2012-04-25 05:01:04.000000000 +0100 -+++ epix-1.2.10/doc/Makefile.am 2012-04-25 05:01:27.000000000 +0100 +--- epix-1.2.10.orig/doc/Makefile.am 2012-11-29 21:04:20.414280167 -0800 ++++ epix-1.2.10/doc/Makefile.am 2012-11-29 21:04:30.491329674 -0800 @@ -1,7 +1,7 @@ # Makefile.am for ePiX v1.x "doc" directory # @@ -37,8 +48,8 @@ diff -Nur epix-1.2.10.orig/doc/Makefile.am epix-1.2.10/doc/Makefile.am epix.info: manual-stamp epix.texi makeinfo epix.texi 2>&1 >/dev/null diff -Nur epix-1.2.10.orig/Makefile.am epix-1.2.10/Makefile.am ---- epix-1.2.10.orig/Makefile.am 2012-04-25 05:01:04.000000000 +0100 -+++ epix-1.2.10/Makefile.am 2012-04-25 05:01:27.000000000 +0100 +--- epix-1.2.10.orig/Makefile.am 2012-11-29 21:04:20.415280173 -0800 ++++ epix-1.2.10/Makefile.am 2012-11-29 21:05:52.489734436 -0800 @@ -56,7 +56,7 @@ EPIX_CONFFILES = bash_completions $(EPIX_EL) @@ -48,9 +59,21 @@ diff -Nur epix-1.2.10.orig/Makefile.am epix-1.2.10/Makefile.am README THANKS VERSION EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \ +@@ -85,11 +85,6 @@ + -e 's%@RUNTIME_COMPILER\@%$(CXX)%;' $< > $@-local + chmod a+x $@ $@-local + +-# libepix.a +-libepix.a: $(libepix_a_OBJECTS) +- ar -ru libepix.a $(libepix_a_OBJECTS) +- $(RANLIB) libepix.a +- + # object file dependencies + $(libepix_a_LIBADD): %.o: %.cc %.h + diff -Nur epix-1.2.10.orig/samples/Makefile.am epix-1.2.10/samples/Makefile.am ---- epix-1.2.10.orig/samples/Makefile.am 2012-04-25 05:01:04.000000000 +0100 -+++ epix-1.2.10/samples/Makefile.am 2012-04-25 05:01:27.000000000 +0100 +--- epix-1.2.10.orig/samples/Makefile.am 2012-11-29 21:04:20.416280179 -0800 ++++ epix-1.2.10/samples/Makefile.am 2012-11-29 21:04:30.491329674 -0800 @@ -7,7 +7,7 @@ CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp |