diff options
| -rw-r--r-- | dev-lang/mercury/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-lang/mercury/Manifest | 36 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch | 55 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch | 59 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0_beta-libgrades.patch | 375 | ||||
| -rw-r--r-- | dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch | 47 | ||||
| -rw-r--r-- | dev-lang/mercury/mercury-0.13.0_beta20060811.ebuild | 36 |
7 files changed, 563 insertions, 55 deletions
diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog index caffeaf698ea..4f3a0ea9e041 100644 --- a/dev-lang/mercury/ChangeLog +++ b/dev-lang/mercury/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-lang/mercury # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.35 2006/08/12 03:23:28 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.36 2006/08/12 05:59:00 keri Exp $ + + 12 Aug 2006; Keri Harris <keri@gentoo.org> + +files/mercury-0.13.0_beta-LIBDIR.patch, + +files/mercury-0.13.0_beta-bootstrap.patch, + +files/mercury-0.13.0_beta-libgrades.patch, + files/mercury-0.13.0_beta-portage.patch, + mercury-0.13.0_beta20060811.ebuild: + Add two-stage bootstrap support. 12 Aug 2006; Keri Harris <keri@gentoo.org> -mercury-0.13.0_beta20060623.ebuild: diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index 9e7c69950b15..47fe6a4bca20 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -42,14 +42,26 @@ AUX mercury-0.13.0_beta-CFLAGS.patch 1387 RMD160 50beda679059cfa2f1c4c0868c34d7f MD5 978c7b688fa22fbf08bbd85f052cc603 files/mercury-0.13.0_beta-CFLAGS.patch 1387 RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 files/mercury-0.13.0_beta-CFLAGS.patch 1387 SHA256 aa3e882f2590d2962b2421495f92d1ae24030799e829f72caf5a55b17fcdea58 files/mercury-0.13.0_beta-CFLAGS.patch 1387 +AUX mercury-0.13.0_beta-LIBDIR.patch 2532 RMD160 81f976dc646a1cc8f2917388ca788f6aa6965df5 SHA1 194eb109e0ace3fde4e294cebdf1ac0530215902 SHA256 2ee03ae0663265ffefc765431939a0debafc32f9ea5aa1e0ab3a83f5b896ae6f +MD5 163d4559496e9293a1db517ad609a285 files/mercury-0.13.0_beta-LIBDIR.patch 2532 +RMD160 81f976dc646a1cc8f2917388ca788f6aa6965df5 files/mercury-0.13.0_beta-LIBDIR.patch 2532 +SHA256 2ee03ae0663265ffefc765431939a0debafc32f9ea5aa1e0ab3a83f5b896ae6f files/mercury-0.13.0_beta-LIBDIR.patch 2532 +AUX mercury-0.13.0_beta-bootstrap.patch 2283 RMD160 da2ca38e8b4a7a5df8bb6101c997fe7fff75dd44 SHA1 7126e13b280ad1208f74de245408f124a71f4fdc SHA256 994f71014eb3b9b79be52bb6f48e75d2d1858892705df561459e628febdcdb10 +MD5 65f204958406aa3d3de7b19bcf6902d1 files/mercury-0.13.0_beta-bootstrap.patch 2283 +RMD160 da2ca38e8b4a7a5df8bb6101c997fe7fff75dd44 files/mercury-0.13.0_beta-bootstrap.patch 2283 +SHA256 994f71014eb3b9b79be52bb6f48e75d2d1858892705df561459e628febdcdb10 files/mercury-0.13.0_beta-bootstrap.patch 2283 AUX mercury-0.13.0_beta-docs.patch 828 RMD160 451ce70dc6f2121f6585d3633693c289b584db47 SHA1 29556a9a7aa2d568c37f0a9df33f16c10bfee906 SHA256 0dd010fa6acdef885b2bca5d79c4bb7b2b3aba2b2569e17035de1fbd0d32cbf7 MD5 825e199f587b2ceb1521e68ac78ec58a files/mercury-0.13.0_beta-docs.patch 828 RMD160 451ce70dc6f2121f6585d3633693c289b584db47 files/mercury-0.13.0_beta-docs.patch 828 SHA256 0dd010fa6acdef885b2bca5d79c4bb7b2b3aba2b2569e17035de1fbd0d32cbf7 files/mercury-0.13.0_beta-docs.patch 828 -AUX mercury-0.13.0_beta-portage.patch 4230 RMD160 b2dcb76ff38bba0fde0d230e3e969d79c2f5be0e SHA1 db86c892762b2f6320671cb583e855de0184256e SHA256 282ede9e587274aba82985509eb1f18799f3f28aa5064dffb8b61fd24aabdd5b -MD5 2f52059ee2307e452ea7c8535375fabf files/mercury-0.13.0_beta-portage.patch 4230 -RMD160 b2dcb76ff38bba0fde0d230e3e969d79c2f5be0e files/mercury-0.13.0_beta-portage.patch 4230 -SHA256 282ede9e587274aba82985509eb1f18799f3f28aa5064dffb8b61fd24aabdd5b files/mercury-0.13.0_beta-portage.patch 4230 +AUX mercury-0.13.0_beta-libgrades.patch 14159 RMD160 17809af8c3d9d63bf3f3262bc17d46b0c38ec22e SHA1 97ee4f3d2a18b939ebcfb1930fbd30f83942c059 SHA256 49c706cdcdb3520bd0def117a00c287dda078d7c42aa91e977494b5db5d31df2 +MD5 26763e08a1559f216988e104d508722c files/mercury-0.13.0_beta-libgrades.patch 14159 +RMD160 17809af8c3d9d63bf3f3262bc17d46b0c38ec22e files/mercury-0.13.0_beta-libgrades.patch 14159 +SHA256 49c706cdcdb3520bd0def117a00c287dda078d7c42aa91e977494b5db5d31df2 files/mercury-0.13.0_beta-libgrades.patch 14159 +AUX mercury-0.13.0_beta-portage.patch 3220 RMD160 0e5aec01189d98f325f5c88758db146f9743a7cd SHA1 092aa9e197087cc6f02775c4f17f41b00da18521 SHA256 b8c7f5ecd648d6a9d93002aeaf827e07a46d526b9096f034655540d4de803d38 +MD5 bd18719001860ca3ac7e672013fa0ecb files/mercury-0.13.0_beta-portage.patch 3220 +RMD160 0e5aec01189d98f325f5c88758db146f9743a7cd files/mercury-0.13.0_beta-portage.patch 3220 +SHA256 b8c7f5ecd648d6a9d93002aeaf827e07a46d526b9096f034655540d4de803d38 files/mercury-0.13.0_beta-portage.patch 3220 AUX mercury-0.13.0_beta-tests.patch 3337 RMD160 de647925736743ba92a53406a08755bc730dc1ce SHA1 fa239fb6411688d467a11221893d537393fa67e6 SHA256 f8f18efe6c92d23859c11f6944fcbead3b72b7967c019705f7be2d8d9d616f99 MD5 9a7bd847f572b23244f6ee930a6f7f35 files/mercury-0.13.0_beta-tests.patch 3337 RMD160 de647925736743ba92a53406a08755bc730dc1ce files/mercury-0.13.0_beta-tests.patch 3337 @@ -74,14 +86,14 @@ EBUILD mercury-0.12.2.ebuild 1423 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb75 MD5 6f79d42347ca00bfe02253c965d88574 mercury-0.12.2.ebuild 1423 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 mercury-0.12.2.ebuild 1423 SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8 mercury-0.12.2.ebuild 1423 -EBUILD mercury-0.13.0_beta20060811.ebuild 2359 RMD160 e7e180a6345c5cbbeb806459343ddeaca62f12a6 SHA1 71d34cb33b95483e2565a439f70ede0339044e34 SHA256 77bb18993d137bfa19ee4c86988626d213ea784efe48f36b8c1fb47977de5541 -MD5 b1bb2eac768f5faf286bfee51f3b11c1 mercury-0.13.0_beta20060811.ebuild 2359 -RMD160 e7e180a6345c5cbbeb806459343ddeaca62f12a6 mercury-0.13.0_beta20060811.ebuild 2359 -SHA256 77bb18993d137bfa19ee4c86988626d213ea784efe48f36b8c1fb47977de5541 mercury-0.13.0_beta20060811.ebuild 2359 -MISC ChangeLog 6418 RMD160 61d67b8706683709cd1e6a5a4e9ef422618103ad SHA1 67cd607e4203aad00bf960872ed818f8660b9de5 SHA256 3915227e8e186eea3f6e71fd9c4a8dab0deb08810f7417ecb4445862633d9dfb -MD5 230f5134bcc157f242f12ad291ecaca3 ChangeLog 6418 -RMD160 61d67b8706683709cd1e6a5a4e9ef422618103ad ChangeLog 6418 -SHA256 3915227e8e186eea3f6e71fd9c4a8dab0deb08810f7417ecb4445862633d9dfb ChangeLog 6418 +EBUILD mercury-0.13.0_beta20060811.ebuild 2991 RMD160 b4e469127dfd9e85c0cbcbc191f538b82526b114 SHA1 a01453d1656d7ccc354be175acfb84964d662002 SHA256 9ba9cc2f8808ef035bd3e9571c837d6b96452a681010ef92bd026ff3e399e223 +MD5 a844f3b6eca9b0fe4706a79c7adefa10 mercury-0.13.0_beta20060811.ebuild 2991 +RMD160 b4e469127dfd9e85c0cbcbc191f538b82526b114 mercury-0.13.0_beta20060811.ebuild 2991 +SHA256 9ba9cc2f8808ef035bd3e9571c837d6b96452a681010ef92bd026ff3e399e223 mercury-0.13.0_beta20060811.ebuild 2991 +MISC ChangeLog 6715 RMD160 539ca9399ffb6adb4187d62a217d2c8ed31a7059 SHA1 aecfdb53dee19f92629e22477e9be8ac87cc4b84 SHA256 8f3037b3c94f76673b01ce48ae33fd4ce1dfae0b4fb87a911406d346cf5b4448 +MD5 9bcb84d0434b9aa745649ed53dceeeb4 ChangeLog 6715 +RMD160 539ca9399ffb6adb4187d62a217d2c8ed31a7059 ChangeLog 6715 +SHA256 8f3037b3c94f76673b01ce48ae33fd4ce1dfae0b4fb87a911406d346cf5b4448 ChangeLog 6715 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247 diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch new file mode 100644 index 000000000000..05c06d9a5532 --- /dev/null +++ b/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch @@ -0,0 +1,55 @@ +--- mercury-compiler-0.13.0-beta-2006-06-01.orig/configure 2006-06-01 22:35:57.000000000 +1200 ++++ mercury-compiler-0.13.0-beta-2006-06-01/configure 2006-06-09 19:14:47.000000000 +1200 +@@ -1609,7 +1609,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.13.0-beta-2006-06-01.orig/scripts/Mmake.vars.in 2006-05-23 18:46:54.000000000 +1200 ++++ mercury-compiler-0.13.0-beta-2006-06-01/scripts/Mmake.vars.in 2006-06-09 19:14:47.000000000 +1200 +@@ -717,18 +717,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.13.0-beta-2006-06-01.orig/scripts/mercury_config.in 2005-10-27 14:48:24.000000000 +1300 ++++ mercury-compiler-0.13.0-beta-2006-06-01/scripts/mercury_config.in 2006-06-09 19:14:47.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.13.0_beta-bootstrap.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch new file mode 100644 index 000000000000..6a45260c78ff --- /dev/null +++ b/dev-lang/mercury/files/mercury-0.13.0_beta-bootstrap.patch @@ -0,0 +1,59 @@ +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/configure 2006-08-11 22:37:07.000000000 +1200 ++++ mercury-compiler-0.13.0-beta-2006-08-11/configure 2006-08-12 16:22:17.000000000 +1200 +@@ -8977,34 +8977,34 @@ + + if test "$BEST_GRADE_FOR_COMPILER" != "$BOOTSTRAP_GRADE"; then + if test "$BOOTSTRAP_MC" = ""; then +- GRADE="$BOOTSTRAP_GRADE" +- { echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed +-**** cannot use grade \`$BEST_GRADE_FOR_COMPILER' +-**** using grade \`$GRADE' to compile the compiler +-**** after installation is complete you should reinstall +-**** from scratch so you can use the more efficient +-**** grade \`$BEST_GRADE_FOR_COMPILER'." >&5 +-echo "$as_me: WARNING: Mercury compiler not yet installed +-**** cannot use grade \`$BEST_GRADE_FOR_COMPILER' +-**** using grade \`$GRADE' to compile the compiler +-**** after installation is complete you should reinstall +-**** from scratch so you can use the more efficient +-**** grade \`$BEST_GRADE_FOR_COMPILER'." >&2;} ++ if test "$BOOTSTRAP_STAGE" = "1"; then ++ GRADE="$BOOTSTRAP_GRADE" ++ else ++ GRADE=$BEST_GRADE_FOR_COMPILER ++ find library compiler browser mdbcomp analysis \ ++ profiler deep_profiler \ ++ -name \*.c -o -name \*.c_date | \ ++ xargs rm > /dev/null 2>&1 ++ find -name \*.o -o -name \*.a -o -name \*.so | \ ++ xargs rm > /dev/null 2>&1 ++ rm -f compiler/mercury_compile profiler/mercury_profile ++ fi + + else +- GRADE=$BEST_GRADE_FOR_COMPILER +- echo "using grade \`$GRADE' to compile the compiler +- compiler and library will be rebuilt with new grade +- installation may take a long time" 1>&6 +- find library compiler browser mdbcomp analysis \ +- profiler deep_profiler \ +- -name \*.c -o -name \*.c_date | \ +- xargs rm > /dev/null 2>&1 ++ if test "$BOOTSTRAP_STAGE" = "1"; then ++ GRADE=$BEST_GRADE_FOR_COMPILER ++ find library compiler browser mdbcomp analysis \ ++ profiler deep_profiler \ ++ -name \*.c -o -name \*.c_date | \ ++ xargs rm > /dev/null 2>&1 ++ else ++ GRADE=$BEST_GRADE_FOR_COMPILER ++ fi + fi + else + GRADE=$BEST_GRADE_FOR_COMPILER +- echo "using grade \`$GRADE' to compile the compiler" 1>&6 + fi ++echo "using grade \`$GRADE' to compile the compiler" 1>&6 + + + #-----------------------------------------------------------------------------# diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-libgrades.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-libgrades.patch new file mode 100644 index 000000000000..9995dc08f751 --- /dev/null +++ b/dev-lang/mercury/files/mercury-0.13.0_beta-libgrades.patch @@ -0,0 +1,375 @@ +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/Mmakefile 2005-08-12 03:56:57.000000000 +1200 ++++ mercury-compiler-0.13.0-beta-2006-08-11/Mmakefile 2006-08-12 17:37:24.000000000 +1200 +@@ -281,6 +281,54 @@ + mdbcomp browser trace + +cd deep_profiler && $(SUBDIR_MMAKE) + ++libgrades: ++ +for grade in x $(LIBGRADES); do \ ++ if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then \ ++ gc_grade=`scripts/ml --grade $$grade --print-gc-grade`; \ ++ TWS=`/bin/pwd`/libgrades/$$grade; \ ++ /bin/rm -fr libgrades/$$grade; \ ++ mkdir -p libgrades/$$grade; \ ++ ( scripts/prepare_tmp_dir_fixed_part $$grade && \ ++ scripts/prepare_tmp_dir_grade_part $$grade ) && \ ++ ( cd libgrades/$$grade/boehm_gc && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade \ ++ WORKSPACE=$$TWS GC_GRADE=$$gc_grade \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ ( cd libgrades/$$grade/runtime && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ ( cd libgrades/$$grade/library && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ depend && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ ( cd libgrades/$$grade/mdbcomp && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ depend && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ ( cd libgrades/$$grade/browser && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ depend && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ ( cd libgrades/$$grade/trace && \ ++ $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ ++ MERCURY_COMPILER=$$TWS/compiler/mercury_compile \ ++ libgrade ) && \ ++ true || \ ++ exit 1; \ ++ fi; \ ++ done ++ + #-----------------------------------------------------------------------------# + + .PHONY: tags +@@ -483,28 +531,13 @@ + @echo + @echo "-- Installation complete." + @echo +- @echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH," +- @echo "-- $(INSTALL_MAN_DIR) to your MANPATH," +- @echo "-- and $(INSTALL_INFO_DIR) to your INFOPATH," +- @if test $(ENABLE_DEEP_PROFILER) != yes || \ +- cmp -s deep_profiler/mdprof_cgi \ +- $(INSTALL_CGI_DIR)/mdprof_cgi; \ +- then true ; else \ +- echo "-- to copy deep_profiler/mdprof_cgi" \ +- "to $(INSTALL_CGI_DIR),"; \ +- fi +- @echo "-- and to add the following lines to the \`.emacs' file" +- @echo "-- in your home directory:" +- @echo " (setq load-path (cons (expand-file-name " +- @echo " \"$(INSTALL_ELISP_DIR)\") load-path))" +- @echo " (autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)" + + .PHONY: install_main + install_main: all \ + install_scripts install_util install_runtime install_boehm_gc \ + install_library install_mdbcomp install_browser install_trace \ + install_compiler install_slice install_profiler \ +- install_deep_profiler install_doc install_config ++ install_deep_profiler install_doc + + .PHONY: install_scripts + install_scripts: scripts +@@ -569,7 +602,7 @@ + # .trans_opt .trans_opt_date .d .mh .mih .c_date .c .o .pic_o + + .PHONY: install_grades +-install_grades: all ++install_grades: all libgrades + # + # Use the newly installed compiler to build the libraries + # in various different grades. We need to override MC=mmc +@@ -577,44 +610,33 @@ + # runs the newly installed compiler, rather than using the + # bootstrap compiler. + # +- /bin/rm -fr tmp_dir +- scripts/prepare_tmp_dir_fixed_part + +for grade in x $(LIBGRADES); do \ + if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then \ + gc_grade=`scripts/ml --grade $$grade --print-gc-grade`; \ +- TWS=`/bin/pwd`/tmp_dir; \ +- scripts/prepare_tmp_dir_grade_part; \ +- ( cd tmp_dir/boehm_gc && \ ++ TWS=`/bin/pwd`/libgrades/$$grade; \ ++ ( cd libgrades/$$grade/boehm_gc && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade \ + WORKSPACE=$$TWS GC_GRADE=$$gc_grade \ + install_lib ) && \ +- ( cd tmp_dir/runtime && \ ++ ( cd libgrades/$$grade/runtime && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ + install_lib ) && \ +- ( cd tmp_dir/library && \ +- $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ +- depend && \ ++ ( cd libgrades/$$grade/library && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ + install_library ) && \ +- ( cd tmp_dir/mdbcomp && \ +- $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ +- depend && \ ++ ( cd libgrades/$$grade/mdbcomp && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ + install_library ) && \ +- ( cd tmp_dir/browser && \ +- $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ +- depend && \ ++ ( cd libgrades/$$grade/browser && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ + install_library ) && \ +- ( cd tmp_dir/trace && \ ++ ( cd libgrades/$$grade/trace && \ + $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS \ + install_lib ) && \ + true || \ +- { echo "To clean up from failed install, remove tmp_dir"; \ +- exit 1; }; \ ++ exit 1; \ + fi; \ + done +- if test ! -f .leave_tmp_dir; then rm -fr tmp_dir; fi + + .PHONY: install_split_library + install_split_library: scripts dep_library +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/boehm_gc/Mmakefile 2004-10-19 19:01:36.000000000 +1300 ++++ mercury-compiler-0.13.0-beta-2006-08-11/boehm_gc/Mmakefile 2006-08-12 17:28:05.000000000 +1200 +@@ -90,6 +90,9 @@ + .PHONY: force + force: + ++.PHONY: libgrade ++libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB) ++ + #-----------------------------------------------------------------------------# + + # installation rules +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/browser/Mmakefile 2005-12-16 18:49:31.000000000 +1300 ++++ mercury-compiler-0.13.0-beta-2006-08-11/browser/Mmakefile 2006-08-12 17:28:05.000000000 +1200 +@@ -186,6 +186,11 @@ + .PHONY: int3s + int3s: $(INT3S_TARGETS) + ++.PHONY: libgrade ++libgrade: \ ++ lib$(BROWSER_LIB_NAME).$A \ ++ lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB) ++ + #-----------------------------------------------------------------------------# + + tags: $(MTAGS) $($(BROWSER_LIB_NAME).ms) +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/library/Mmakefile 2006-01-10 18:30:36.000000000 +1300 ++++ mercury-compiler-0.13.0-beta-2006-08-11/library/Mmakefile 2006-08-12 17:28:05.000000000 +1200 +@@ -196,6 +196,9 @@ + trans_opts: $(STD_LIB_NAME).trans_opts + $(STD_LIB_NAME).trans_opts: $($(STD_LIB_NAME).trans_opts) + ++.PHONY: libgrade ++libgrade: lib$(STD_LIB_NAME) ++ + #-----------------------------------------------------------------------------# + + tags: $(MTAGS) $($(STD_LIB_NAME).ms) +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/mdbcomp/Mmakefile 2005-12-16 18:49:40.000000000 +1300 ++++ mercury-compiler-0.13.0-beta-2006-08-11/mdbcomp/Mmakefile 2006-08-12 17:28:05.000000000 +1200 +@@ -150,6 +150,12 @@ + .PHONY: int3s + int3s: $(INT3S_TARGETS) + ++.PHONY: libgrade ++libgrade: \ ++ lib$(MDBCOMP_LIB_NAME).$A \ ++ lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \ ++ all-ints ++ + #-----------------------------------------------------------------------------# + + tags: $(MTAGS) $($(MDBCOMP_LIB_NAME).ms) +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/runtime/Mmakefile 2006-03-30 18:13:48.000000000 +1200 ++++ mercury-compiler-0.13.0-beta-2006-08-11/runtime/Mmakefile 2006-08-12 17:28:05.000000000 +1200 +@@ -420,6 +420,9 @@ + @if test ! -f tags; then echo making tags; \ + ctags $(CFILES) $(HDRS) $(BODY_HDRS) $(LIB_DLL_H); fi + ++.PHONY: libgrade ++libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB) ++ + #-----------------------------------------------------------------------------# + + # installation rules +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/scripts/prepare_tmp_dir_fixed_part.in 2005-01-28 20:11:59.000000000 +1300 ++++ mercury-compiler-0.13.0-beta-2006-08-11/scripts/prepare_tmp_dir_fixed_part.in 2006-08-12 17:28:05.000000000 +1200 +@@ -12,18 +12,20 @@ + fi + wd=`/bin/pwd` + +-mkdir tmp_dir +-cp Mmake* tmp_dir +-cp Mercury.* tmp_dir +-cp VERSION tmp_dir +-cp config* tmp_dir +-cp aclocal.m4 tmp_dir +-mkdir tmp_dir/scripts +-cp scripts/* tmp_dir/scripts +-mkdir tmp_dir/tools +-cp tools/* tmp_dir/tools +-$ln_s $wd/compiler tmp_dir +-$ln_s $wd/analysis tmp_dir +-$ln_s $wd/robdd tmp_dir +-$ln_s $wd/util tmp_dir ++libgrade_dir=libgrades/$1 ++ ++mkdir -p $libgrade_dir ++cp Mmake* $libgrade_dir ++cp Mercury.* $libgrade_dir ++cp VERSION $libgrade_dir ++cp config* $libgrade_dir ++cp aclocal.m4 $libgrade_dir ++mkdir $libgrade_dir/scripts ++cp scripts/* $libgrade_dir/scripts ++mkdir $libgrade_dir/tools ++cp tools/* $libgrade_dir/tools ++$ln_s $wd/compiler $libgrade_dir ++$ln_s $wd/analysis $libgrade_dir ++$ln_s $wd/robdd $libgrade_dir ++$ln_s $wd/util $libgrade_dir + exit 0 +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/scripts/prepare_tmp_dir_grade_part 2005-05-20 18:15:20.000000000 +1200 ++++ mercury-compiler-0.13.0-beta-2006-08-11/scripts/prepare_tmp_dir_grade_part 2006-08-12 17:34:05.000000000 +1200 +@@ -5,55 +5,57 @@ + # Public License - see the file COPYING in the Mercury distribution. + #---------------------------------------------------------------------------# + +-rm -fr tmp_dir/boehm_gc +-rm -fr tmp_dir/runtime +-rm -fr tmp_dir/trace +-rm -fr tmp_dir/library +-rm -fr tmp_dir/mdbcomp +-rm -fr tmp_dir/browser +-mkdir tmp_dir/boehm_gc +-mkdir tmp_dir/boehm_gc/Mac_files +-mkdir tmp_dir/boehm_gc/cord +-mkdir tmp_dir/boehm_gc/include +-mkdir tmp_dir/boehm_gc/include/private +-cp boehm_gc/Makefile* tmp_dir/boehm_gc +-cp boehm_gc/Mmake* tmp_dir/boehm_gc +-cp boehm_gc/ac* tmp_dir/boehm_gc +-cp boehm_gc/*.[chsS] tmp_dir/boehm_gc +-cp boehm_gc/Mac_files/*.[ch] tmp_dir/boehm_gc/Mac_files +-cp boehm_gc/cord/*.[ch] tmp_dir/boehm_gc/cord +-cp boehm_gc/include/*.[ch] tmp_dir/boehm_gc/include +-cp boehm_gc/include/private/*.[ch] tmp_dir/boehm_gc/include/private +-mkdir tmp_dir/runtime +-mkdir tmp_dir/runtime/machdeps +-cp runtime/Mmake* tmp_dir/runtime +-cp runtime/.mgnuc* tmp_dir/runtime +-cp runtime/*.in tmp_dir/runtime +-cp runtime/*.[ch] tmp_dir/runtime +-cp runtime/*.il tmp_dir/runtime +-cp runtime/machdeps/*.h tmp_dir/runtime/machdeps +-mkdir tmp_dir/trace +-cp trace/Mmake* tmp_dir/trace +-cp trace/.mgnuc* tmp_dir/trace +-cp trace/*.[ch] tmp_dir/trace +-mkdir tmp_dir/library +-cp library/Mmake* tmp_dir/library +-cp library/Mercury.* tmp_dir/library +-cp library/.mgnuc* tmp_dir/library +-cp library/*FLAGS* tmp_dir/library +-cp library/print_extra_inits tmp_dir/library +-cp library/library_strong_name.sn tmp_dir/library +-cp library/*.m tmp_dir/library +-mkdir tmp_dir/mdbcomp +-cp mdbcomp/Mmake* tmp_dir/mdbcomp +-cp mdbcomp/Mercury.* tmp_dir/mdbcomp +-cp mdbcomp/.mgnuc* tmp_dir/mdbcomp +-cp mdbcomp/*FLAGS* tmp_dir/mdbcomp +-cp mdbcomp/*.m tmp_dir/mdbcomp +-mkdir tmp_dir/browser +-cp browser/Mmake* tmp_dir/browser +-cp browser/Mercury.* tmp_dir/browser +-cp browser/.mgnuc* tmp_dir/browser +-cp browser/*FLAGS* tmp_dir/browser +-cp browser/*.m tmp_dir/browser ++libgrade_dir=libgrades/$1 ++ ++rm -fr $libgrade_dir/boehm_gc ++rm -fr $libgrade_dir/runtime ++rm -fr $libgrade_dir/trace ++rm -fr $libgrade_dir/library ++rm -fr $libgrade_dir/mdbcomp ++rm -fr $libgrade_dir/browser ++mkdir $libgrade_dir/boehm_gc ++mkdir $libgrade_dir/boehm_gc/Mac_files ++mkdir $libgrade_dir/boehm_gc/cord ++mkdir $libgrade_dir/boehm_gc/include ++mkdir $libgrade_dir/boehm_gc/include/private ++cp boehm_gc/Makefile* $libgrade_dir/boehm_gc ++cp boehm_gc/Mmake* $libgrade_dir/boehm_gc ++cp boehm_gc/ac* $libgrade_dir/boehm_gc ++cp boehm_gc/*.[chsS] $libgrade_dir/boehm_gc ++cp boehm_gc/Mac_files/*.[ch] $libgrade_dir/boehm_gc/Mac_files ++cp boehm_gc/cord/*.[ch] $libgrade_dir/boehm_gc/cord ++cp boehm_gc/include/*.[ch] $libgrade_dir/boehm_gc/include ++cp boehm_gc/include/private/*.[ch] $libgrade_dir/boehm_gc/include/private ++mkdir $libgrade_dir/runtime ++mkdir $libgrade_dir/runtime/machdeps ++cp runtime/Mmake* $libgrade_dir/runtime ++cp runtime/.mgnuc* $libgrade_dir/runtime ++cp runtime/*.in $libgrade_dir/runtime ++cp runtime/*.[ch] $libgrade_dir/runtime ++cp runtime/*.il $libgrade_dir/runtime ++cp runtime/machdeps/*.h $libgrade_dir/runtime/machdeps ++mkdir $libgrade_dir/trace ++cp trace/Mmake* $libgrade_dir/trace ++cp trace/.mgnuc* $libgrade_dir/trace ++cp trace/*.[ch] $libgrade_dir/trace ++mkdir $libgrade_dir/library ++cp library/Mmake* $libgrade_dir/library ++cp library/Mercury.* $libgrade_dir/library ++cp library/.mgnuc* $libgrade_dir/library ++cp library/*FLAGS* $libgrade_dir/library ++cp library/print_extra_inits $libgrade_dir/library ++cp library/library_strong_name.sn $libgrade_dir/library ++cp library/*.m $libgrade_dir/library ++mkdir $libgrade_dir/mdbcomp ++cp mdbcomp/Mmake* $libgrade_dir/mdbcomp ++cp mdbcomp/Mercury.* $libgrade_dir/mdbcomp ++cp mdbcomp/.mgnuc* $libgrade_dir/mdbcomp ++cp mdbcomp/*FLAGS* $libgrade_dir/mdbcomp ++cp mdbcomp/*.m $libgrade_dir/mdbcomp ++mkdir $libgrade_dir/browser ++cp browser/Mmake* $libgrade_dir/browser ++cp browser/Mercury.* $libgrade_dir/browser ++cp browser/.mgnuc* $libgrade_dir/browser ++cp browser/*FLAGS* $libgrade_dir/browser ++cp browser/*.m $libgrade_dir/browser + exit 0 +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/trace/Mmakefile 2006-04-04 19:42:03.000000000 +1200 ++++ mercury-compiler-0.13.0-beta-2006-08-11/trace/Mmakefile 2006-08-12 17:28:05.000000000 +1200 +@@ -204,6 +204,9 @@ + @if test ! -f tags; then echo making tags; \ + ctags $(CFILES) $(HDRS) $(RUNTIME_DIR)/*.c $(RUNTIME_DIR)/*.h ; fi + ++.PHONY: libgrade ++libgrade: lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB) ++ + #-----------------------------------------------------------------------------# + + # installation rules +Only in mercury-compiler-0.13.0-beta-2006-08-11/trace: Mmakefile.orig diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch index d4b4cdfbd69b..6110bb776f4e 100644 --- a/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch +++ b/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch @@ -18,38 +18,6 @@ # `mmake clean' has a different meaning to the usual GNU standard `make clean': # it removes the .c files, which makes bootstrapping impossible unless you ---- mercury-compiler-0.13.0-beta-2006-06-09.orig/Mmakefile 2005-08-12 03:56:57.000000000 +1200 -+++ mercury-compiler-0.13.0-beta-2006-06-09/Mmakefile 2006-06-14 22:46:40.000000000 +1200 -@@ -483,28 +483,13 @@ - @echo - @echo "-- Installation complete." - @echo -- @echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH," -- @echo "-- $(INSTALL_MAN_DIR) to your MANPATH," -- @echo "-- and $(INSTALL_INFO_DIR) to your INFOPATH," -- @if test $(ENABLE_DEEP_PROFILER) != yes || \ -- cmp -s deep_profiler/mdprof_cgi \ -- $(INSTALL_CGI_DIR)/mdprof_cgi; \ -- then true ; else \ -- echo "-- to copy deep_profiler/mdprof_cgi" \ -- "to $(INSTALL_CGI_DIR),"; \ -- fi -- @echo "-- and to add the following lines to the \`.emacs' file" -- @echo "-- in your home directory:" -- @echo " (setq load-path (cons (expand-file-name " -- @echo " \"$(INSTALL_ELISP_DIR)\") load-path))" -- @echo " (autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)" - - .PHONY: install_main - install_main: all \ - install_scripts install_util install_runtime install_boehm_gc \ - install_library install_mdbcomp install_browser install_trace \ - install_compiler install_slice install_profiler \ -- install_deep_profiler install_doc install_config -+ install_deep_profiler install_doc - - .PHONY: install_scripts - install_scripts: scripts --- mercury-compiler-0.13.0-beta-2006-06-09.orig/runtime/Mmakefile 2006-03-30 18:13:48.000000000 +1200 +++ mercury-compiler-0.13.0-beta-2006-06-09/runtime/Mmakefile 2006-06-14 22:49:57.000000000 +1200 @@ -434,8 +434,6 @@ @@ -106,9 +74,18 @@ -rm -f $(INSTALL_BINDIR)/mmake.old .PHONY: install_config ---- mercury-compiler-0.13.0-beta-2006-06-15.orig/configure 2006-06-15 22:36:38.000000000 +1200 -+++ mercury-compiler-0.13.0-beta-2006-06-15/configure 2006-06-17 20:49:30.000000000 +1200 -@@ -9140,7 +9140,6 @@ +--- mercury-compiler-0.13.0-beta-2006-08-11.orig/configure 2006-08-11 22:37:07.000000000 +1200 ++++ mercury-compiler-0.13.0-beta-2006-08-11/configure 2006-08-12 16:14:59.000000000 +1200 +@@ -9048,7 +9048,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; +@@ -9148,7 +9148,6 @@ enable_mm_grades=no enable_dmm_grades=no enable_hlc_prof_grades=no diff --git a/dev-lang/mercury/mercury-0.13.0_beta20060811.ebuild b/dev-lang/mercury/mercury-0.13.0_beta20060811.ebuild index 62cc1ae0b503..48577d340023 100644 --- a/dev-lang/mercury/mercury-0.13.0_beta20060811.ebuild +++ b/dev-lang/mercury/mercury-0.13.0_beta20060811.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0_beta20060811.ebuild,v 1.1 2006/08/12 03:20:02 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0_beta20060811.ebuild,v 1.2 2006/08/12 05:59:00 keri Exp $ inherit eutils versionator @@ -33,6 +33,9 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P/${BETA_V}/beta}-portage.patch epatch "${FILESDIR}"/${P/${BETA_V}/beta}-CFLAGS.patch + epatch "${FILESDIR}"/${P/${BETA_V}/beta}-bootstrap.patch + epatch "${FILESDIR}"/${P/${BETA_V}/beta}-LIBDIR.patch + epatch "${FILESDIR}"/${P/${BETA_V}/beta}-libgrades.patch epatch "${FILESDIR}"/${P/${BETA_V}/beta}-docs.patch cd "${TESTDIR}" @@ -41,15 +44,35 @@ src_unpack() { } src_compile() { - econf \ - --disable-dotnet-grades \ + local myconf + myconf="--disable-dotnet-grades \ $(use_enable debug debug-grades) \ $(use_enable threads par-grades) \ $(use_enable !minimal most-grades) \ $(use_with readline) \ - PACKAGE_VERSION=${PV} \ - || die "econf failed" - emake || die "emake failed" + PACKAGE_VERSION=${PV}" + + einfo "Performing stage 1 bootstrap" + econf \ + ${myconf} \ + BOOTSTRAP_STAGE="1" \ + || die "econf stage 1 failed" + emake || die "emake stage 1 failed" + + einfo "Performing stage 2 bootstrap" + cp "${S}"/compiler/mercury_compile "${S}"/mercury_compile + econf \ + ${myconf} \ + BOOTSTRAP_STAGE="2" \ + || die "econf stage 2 failed" + emake \ + MERCURY_COMPILER="${S}"/mercury_compile \ + || die "emake stage 2 failed" + + einfo "Compiling libgrades" + emake \ + MERCURY_COMPILER="${S}"/compiler/mercury_compile \ + libgrades || die "emake libgrades failed" } src_test() { @@ -65,7 +88,6 @@ src_test() { src_install() { make \ - MERCURY_COMPILER="${D}"/usr/bin/${PN}_compile \ INSTALL_PREFIX="${D}"/usr \ INSTALL_MAN_DIR="${D}"/usr/share/man \ INSTALL_INFO_DIR="${D}"/usr/share/info \ |