summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2006-06-09 08:53:24 +0000
committerKeri Harris <keri@gentoo.org>2006-06-09 08:53:24 +0000
commit7a8982def9e2bcd510c46518126fb27c51b8cc77 (patch)
treecbfd63becb2c67fc8173d45b1d6d53006f83eb34 /dev-lang/mercury/files
parentAdded ~ppc64 (diff)
downloadgentoo-2-7a8982def9e2bcd510c46518126fb27c51b8cc77.tar.gz
gentoo-2-7a8982def9e2bcd510c46518126fb27c51b8cc77.tar.bz2
gentoo-2-7a8982def9e2bcd510c46518126fb27c51b8cc77.zip
Add debug support to libgrades. Append ${P} to install_libdir so that mercury-extras can be upgraded.
(Portage version: 2.1_rc4-r3)
Diffstat (limited to 'dev-lang/mercury/files')
-rw-r--r--dev-lang/mercury/files/digest-mercury-0.12.2-r13
-rw-r--r--dev-lang/mercury/files/mercury-0.12.2-LIBDIR.patch55
-rw-r--r--dev-lang/mercury/files/mercury-0.12.2-portage.patch11
3 files changed, 69 insertions, 0 deletions
diff --git a/dev-lang/mercury/files/digest-mercury-0.12.2-r1 b/dev-lang/mercury/files/digest-mercury-0.12.2-r1
new file mode 100644
index 000000000000..8447aec3d358
--- /dev/null
+++ b/dev-lang/mercury/files/digest-mercury-0.12.2-r1
@@ -0,0 +1,3 @@
+MD5 49796cb9f475a0959d13ec7694777a94 mercury-compiler-0.12.2.tar.gz 15074997
+RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e mercury-compiler-0.12.2.tar.gz 15074997
+SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572 mercury-compiler-0.12.2.tar.gz 15074997
diff --git a/dev-lang/mercury/files/mercury-0.12.2-LIBDIR.patch b/dev-lang/mercury/files/mercury-0.12.2-LIBDIR.patch
new file mode 100644
index 000000000000..f81852240da8
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.12.2-LIBDIR.patch
@@ -0,0 +1,55 @@
+--- mercury-compiler-0.12.2.orig/configure 2006-01-25 17:24:01.000000000 +1300
++++ mercury-compiler-0.12.2/configure 2006-06-06 20:57:45.000000000 +1200
+@@ -1599,7 +1599,7 @@
+
+
+ PREFIX="`$CYGPATH $PREFIX`"
+-LIBDIR="`$CYGPATH $PREFIX/lib/mercury`"
++LIBDIR="`$CYGPATH $PREFIX/lib/mercury-$PACKAGE_VERSION`"
+ NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared}
+
+
+--- mercury-compiler-0.12.2.orig/scripts/Mmake.vars.in 2005-08-17 03:57:40.000000000 +1200
++++ mercury-compiler-0.12.2/scripts/Mmake.vars.in 2006-06-06 20:04:46.000000000 +1200
+@@ -716,18 +716,18 @@
+ INSTALL_PREFIX = @prefix@
+ FINAL_INSTALL_PREFIX = @prefix@
+ INSTALL_BINDIR = $(INSTALL_PREFIX)/bin
+-INSTALL_LIBDIR = $(INSTALL_PREFIX)/lib/mercury
+-FINAL_INSTALL_LIBDIR = $(FINAL_INSTALL_PREFIX)/lib/mercury
+-INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java
++INSTALL_LIBDIR = $(INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@
++FINAL_INSTALL_LIBDIR = $(FINAL_INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@
++INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/lib/java
+ INSTALL_INFO_DIR = $(INSTALL_PREFIX)/info
+-INSTALL_DVI_DIR = $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_TEXT_DIR = $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_PS_DIR = $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_PDF_DIR = $(INSTALL_PREFIX)/lib/mercury/doc
++INSTALL_DVI_DIR = $(INSTALL_LIBDIR)/doc
++INSTALL_TEXT_DIR = $(INSTALL_LIBDIR)/doc
++INSTALL_PS_DIR = $(INSTALL_LIBDIR)/doc
++INSTALL_PDF_DIR = $(INSTALL_LIBDIR)/doc
+ INSTALL_MAN_DIR = $(INSTALL_PREFIX)/man
+-INSTALL_HTML_DIR = $(INSTALL_PREFIX)/lib/mercury/html
+-INSTALL_MDB_DOC_DIR = $(INSTALL_PREFIX)/lib/mercury/mdb
+-INSTALL_ELISP_DIR = $(INSTALL_PREFIX)/lib/mercury/elisp
++INSTALL_HTML_DIR = $(INSTALL_LIBDIR)/html
++INSTALL_MDB_DOC_DIR = $(INSTALL_LIBDIR)/mdb
++INSTALL_ELISP_DIR = $(INSTALL_LIBDIR)/elisp
+ INSTALL_CGI_DIR = @CGIDIR@
+
+ # You should not need to override anything below here
+--- mercury-compiler-0.12.2.orig/scripts/mercury_config.in 2005-09-11 01:47:49.000000000 +1200
++++ mercury-compiler-0.12.2/scripts/mercury_config.in 2006-06-07 18:55:12.000000000 +1200
+@@ -90,8 +90,8 @@
+ shift
+ done
+
+-input_libdir="$input_prefix/lib/mercury"
+-output_libdir="$output_prefix/lib/mercury"
++input_libdir="$input_prefix/lib/mercury-@PACKAGE_VERSION@"
++output_libdir="$output_prefix/lib/mercury-@PACKAGE_VERSION@"
+
+ # mercury_config regenerates itself, so we can't just execute it in place.
+ case $recursive in
diff --git a/dev-lang/mercury/files/mercury-0.12.2-portage.patch b/dev-lang/mercury/files/mercury-0.12.2-portage.patch
index 75244325ca67..6379e4215a00 100644
--- a/dev-lang/mercury/files/mercury-0.12.2-portage.patch
+++ b/dev-lang/mercury/files/mercury-0.12.2-portage.patch
@@ -42,3 +42,14 @@
.PHONY: install_main
install_main: all \
+--- mercury-compiler-0.12.2.orig/configure 2006-01-25 17:24:01.000000000 +1300
++++ mercury-compiler-0.12.2/configure 2006-06-08 19:31:53.000000000 +1200
+@@ -8861,7 +8861,7 @@
+ # Check whether --enable-debug-grades or --disable-debug-grades was given.
+ if test "${enable_debug_grades+set}" = set; then
+ enableval="$enable_debug_grades"
+- enable_debug_grades="enableval"
++ enable_debug_grades="$enableval"
+ else
+ enable_debug_grades=yes
+ fi;