| 1 |
keri 08/11/30 05:45:33 |
| 2 |
|
| 3 |
Modified: mercury-0.13.1-no-reconf.patch |
| 4 |
Log: |
| 5 |
Do not install redundant reconf script |
| 6 |
(Portage version: 2.1.4.5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: mercury-0.13.1-no-reconf.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- mercury-0.13.1-no-reconf.patch 21 Aug 2008 07:01:56 -0000 1.1 |
| 22 |
+++ mercury-0.13.1-no-reconf.patch 30 Nov 2008 05:45:33 -0000 1.2 |
| 23 |
@@ -1,6 +1,7 @@ |
| 24 |
+diff -ur mercury-compiler-0.13.1.orig/runtime/Mmakefile mercury-compiler-0.13.1/runtime/Mmakefile |
| 25 |
--- mercury-compiler-0.13.1.orig/runtime/Mmakefile 2006-11-15 03:09:20.000000000 +1300 |
| 26 |
-+++ mercury-compiler-0.13.1/runtime/Mmakefile 2006-12-04 21:37:11.000000000 +1300 |
| 27 |
-@@ -434,8 +437,6 @@ |
| 28 |
++++ mercury-compiler-0.13.1/runtime/Mmakefile 2008-11-30 18:05:17.000000000 +1300 |
| 29 |
+@@ -434,8 +434,6 @@ |
| 30 |
-[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_MODULE_DIR) |
| 31 |
-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR) |
| 32 |
-[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR) |
| 33 |
@@ -9,7 +10,7 @@ |
| 34 |
|
| 35 |
ifeq ($(findstring java,$(GRADE)),java) |
| 36 |
|
| 37 |
-@@ -481,7 +482,6 @@ |
| 38 |
+@@ -481,7 +479,6 @@ |
| 39 |
rm -f $(INSTALL_INC_DIR)/mercury_conf.h |
| 40 |
cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR) |
| 41 |
-chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h |
| 42 |
@@ -17,9 +18,18 @@ |
| 43 |
cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps |
| 44 |
|
| 45 |
.PHONY: install_init |
| 46 |
+diff -ur mercury-compiler-0.13.1.orig/scripts/Mmakefile mercury-compiler-0.13.1/scripts/Mmakefile |
| 47 |
--- mercury-compiler-0.13.1.orig/scripts/Mmakefile 2006-04-04 19:41:49.000000000 +1200 |
| 48 |
-+++ mercury-compiler-0.13.1/scripts/Mmakefile 2006-12-04 21:37:11.000000000 +1300 |
| 49 |
-@@ -26,16 +26,12 @@ |
| 50 |
++++ mercury-compiler-0.13.1/scripts/Mmakefile 2008-11-30 18:05:32.000000000 +1300 |
| 51 |
+@@ -15,7 +15,6 @@ |
| 52 |
+ #-----------------------------------------------------------------------------# |
| 53 |
+ |
| 54 |
+ NONCONF_SCRIPTS = \ |
| 55 |
+- mercury_cleanup_install \ |
| 56 |
+ mprof_merge_runs \ |
| 57 |
+ mtags \ |
| 58 |
+ mtc \ |
| 59 |
+@@ -26,16 +25,12 @@ |
| 60 |
canonical_grade \ |
| 61 |
mdb \ |
| 62 |
mdprof \ |
| 63 |
@@ -37,7 +47,7 @@ |
| 64 |
|
| 65 |
SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS) |
| 66 |
|
| 67 |
-@@ -103,8 +99,6 @@ |
| 68 |
+@@ -103,8 +98,6 @@ |
| 69 |
[ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb |
| 70 |
[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR) |
| 71 |
[ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR) |
| 72 |
@@ -46,7 +56,7 @@ |
| 73 |
|
| 74 |
.PHONY: install_mmake |
| 75 |
install_mmake: Mmake.vars Mmake.rules install_dirs |
| 76 |
-@@ -122,7 +116,6 @@ |
| 77 |
+@@ -122,7 +115,6 @@ |
| 78 |
-for file in $(SCRIPTS); do \ |
| 79 |
chmod u+w $(INSTALL_BINDIR)/$$file ;\ |
| 80 |
done |
Archives