| 1 |
bicatali 12/11/30 05:17:41 |
| 2 |
|
| 3 |
Modified: epix-1.2.10-autotools.patch |
| 4 |
Log: |
| 5 |
Respect AR (bug #443136) and rename bash-completion file |
| 6 |
|
| 7 |
(Portage version: 2.2.01.21313-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sci-visualization/epix/files/epix-1.2.10-autotools.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/epix/files/epix-1.2.10-autotools.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/epix/files/epix-1.2.10-autotools.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/epix/files/epix-1.2.10-autotools.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: epix-1.2.10-autotools.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/epix/files/epix-1.2.10-autotools.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- epix-1.2.10-autotools.patch 25 Apr 2012 15:26:39 -0000 1.1 |
| 23 |
+++ epix-1.2.10-autotools.patch 30 Nov 2012 05:17:41 -0000 1.2 |
| 24 |
@@ -1,6 +1,17 @@ |
| 25 |
+diff -Nur epix-1.2.10.orig/configure.ac epix-1.2.10/configure.ac |
| 26 |
+--- epix-1.2.10.orig/configure.ac 2012-11-29 21:04:20.411280150 -0800 |
| 27 |
++++ epix-1.2.10/configure.ac 2012-11-29 21:14:00.462163755 -0800 |
| 28 |
+@@ -9,6 +9,7 @@ |
| 29 |
+ dnl Checks for programs. |
| 30 |
+ AC_PROG_CXX |
| 31 |
+ AC_PROG_LN_S |
| 32 |
++AM_PROG_AR |
| 33 |
+ AC_PROG_RANLIB |
| 34 |
+ AC_PROG_MAKE_SET |
| 35 |
+ AC_PROG_INSTALL |
| 36 |
diff -Nur epix-1.2.10.orig/doc/Makefile.am epix-1.2.10/doc/Makefile.am |
| 37 |
---- epix-1.2.10.orig/doc/Makefile.am 2012-04-25 05:01:04.000000000 +0100 |
| 38 |
-+++ epix-1.2.10/doc/Makefile.am 2012-04-25 05:01:27.000000000 +0100 |
| 39 |
+--- epix-1.2.10.orig/doc/Makefile.am 2012-11-29 21:04:20.414280167 -0800 |
| 40 |
++++ epix-1.2.10/doc/Makefile.am 2012-11-29 21:04:30.491329674 -0800 |
| 41 |
@@ -1,7 +1,7 @@ |
| 42 |
# Makefile.am for ePiX v1.x "doc" directory |
| 43 |
# |
| 44 |
@@ -37,8 +48,8 @@ |
| 45 |
epix.info: manual-stamp epix.texi |
| 46 |
makeinfo epix.texi 2>&1 >/dev/null |
| 47 |
diff -Nur epix-1.2.10.orig/Makefile.am epix-1.2.10/Makefile.am |
| 48 |
---- epix-1.2.10.orig/Makefile.am 2012-04-25 05:01:04.000000000 +0100 |
| 49 |
-+++ epix-1.2.10/Makefile.am 2012-04-25 05:01:27.000000000 +0100 |
| 50 |
+--- epix-1.2.10.orig/Makefile.am 2012-11-29 21:04:20.415280173 -0800 |
| 51 |
++++ epix-1.2.10/Makefile.am 2012-11-29 21:05:52.489734436 -0800 |
| 52 |
@@ -56,7 +56,7 @@ |
| 53 |
|
| 54 |
EPIX_CONFFILES = bash_completions $(EPIX_EL) |
| 55 |
@@ -48,9 +59,21 @@ |
| 56 |
README THANKS VERSION |
| 57 |
|
| 58 |
EXTRA_DIST = $(bin_SCRIPTS) $(man_MANS) $(EPIX_CONFFILES) $(EPIX_NOTEFILES) \ |
| 59 |
+@@ -85,11 +85,6 @@ |
| 60 |
+ -e 's%@RUNTIME_COMPILER\@%$(CXX)%;' $< > $@-local |
| 61 |
+ chmod a+x $@ $@-local |
| 62 |
+ |
| 63 |
+-# libepix.a |
| 64 |
+-libepix.a: $(libepix_a_OBJECTS) |
| 65 |
+- ar -ru libepix.a $(libepix_a_OBJECTS) |
| 66 |
+- $(RANLIB) libepix.a |
| 67 |
+- |
| 68 |
+ # object file dependencies |
| 69 |
+ $(libepix_a_LIBADD): %.o: %.cc %.h |
| 70 |
+ |
| 71 |
diff -Nur epix-1.2.10.orig/samples/Makefile.am epix-1.2.10/samples/Makefile.am |
| 72 |
---- epix-1.2.10.orig/samples/Makefile.am 2012-04-25 05:01:04.000000000 +0100 |
| 73 |
-+++ epix-1.2.10/samples/Makefile.am 2012-04-25 05:01:27.000000000 +0100 |
| 74 |
+--- epix-1.2.10.orig/samples/Makefile.am 2012-11-29 21:04:20.416280179 -0800 |
| 75 |
++++ epix-1.2.10/samples/Makefile.am 2012-11-29 21:04:30.491329674 -0800 |
| 76 |
@@ -7,7 +7,7 @@ |
| 77 |
CLEANFILES = *~ *.eepic *.eps sample_src.tar sample_src.tar.gz sample-stamp |
Archives