[Gsrc-commit] trunk r9501: mercury 22.01.7

[Carl Hansen]

------------------------------------------------------------
revno: 9501
revision-id: carlhansen@gnu.org-20230830184014-wbc5f27d8kyv9ulz
parent: carlhansen@gnu.org-20230830151106-tj1qcy67kzd19y7y
committer: carlhansen@gnu.org
branch nick: trunk
timestamp: Wed 2023-08-30 11:40:14 -0700
message:
  mercury 22.01.7
removed:
  pkg/other/mercury/files/       files-20230115012141-fx5cg7zcyq7jvx40-1
  pkg/other/mercury/files/mercury.22.01.6.patch 
mercury.22.01.6.patc-20230702185647-yantdp5df7gkr306-1
modified:
  pkg/other/mercury/Makefile     makefile-20181109194009-h0l0v02nsc5pw6mc-3
  pkg/other/mercury/sha256sums   sha256sums-20181109194009-h0l0v02nsc5pw6mc-4

=== modified file 'pkg/other/mercury/Makefile'
--- a/pkg/other/mercury/Makefile        2023-07-03 02:18:48 +0000
+++ b/pkg/other/mercury/Makefile        2023-08-30 18:40:14 +0000
@@ -21,7 +21,7 @@
 
 NAME =    Mercury
 GARNAME = mercury
-GARVERSION = 22.01.6
+GARVERSION = 22.01.7
 HOME_URL = http://www.mercurylang.org/
 DESCRIPTION =  Mercury logic-functional programming language 
 define BLURB
@@ -44,7 +44,7 @@
 
 BUILDDEPS =
 LIBDEPS =
-PATCHFILES =  mercury.22.01.6.patch
+#PATCHFILES =  mercury.22.01.6.patch
 
 ######################################################################
 
@@ -56,13 +56,13 @@
 ## Configuration options  ##
 # important
 # Does "minimal install. The READMEs may help about additions.
-#
+
 CONFIGURE_ARGS =  --enable-minimal-install  --prefix=$(prefix)
 
 #BUILD_ARGS =  CFLAGS=\"--warn-no-array-parameter -Wno-array-parameter\"
 
 # bug work-around
-BUILD_ARGS =  CFLAGS="-Wno-format-overflow"
+BUILD_ARGS =  CFLAGS="-Wno-format-overflow -I./runtime/ -I../runtime"
 #BUILD_ARGS = 
 
 #INSTALL_SCRIPTS = prefix
@@ -77,6 +77,6 @@
        echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
        echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-#jinstall-prefix:      
-#j     $(MAKE) install --prefix=$(prefix)
+#install-prefix:       
+#      $(MAKE) install --prefix=$(prefix)
 

=== removed directory 'pkg/other/mercury/files'
=== removed file 'pkg/other/mercury/files/mercury.22.01.6.patch'
--- a/pkg/other/mercury/files/mercury.22.01.6.patch     2023-07-03 02:18:48 
+0000
+++ b/pkg/other/mercury/files/mercury.22.01.6.patch     1970-01-01 00:00:00 
+0000
@@ -1,56 +0,0 @@
-diff -x config.log -x config.status -ru 
tmp/mercury-srcdist-22.01.6/util/info_to_mdb.c 
work/mercury-srcdist-22.01.6/util/info_to_mdb.c
---- tmp/mercury-srcdist-22.01.6/util/info_to_mdb.c     2020-10-10 
20:28:49.000000000 -0700
-+++ work/mercury-srcdist-22.01.6/util/info_to_mdb.c    2023-07-02 
11:51:10.388818251 -0700
-@@ -16,7 +16,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
--#include "mercury_std.h"
-+#include "../runtime/mercury_std.h"
- 
- #define MAXLINELEN  160
- 
-diff -x config.log -x config.status -ru 
tmp/mercury-srcdist-22.01.6/util/mdemangle.c 
work/mercury-srcdist-22.01.6/util/mdemangle.c
---- tmp/mercury-srcdist-22.01.6/util/mdemangle.c       2023-05-09 
21:57:19.000000000 -0700
-+++ work/mercury-srcdist-22.01.6/util/mdemangle.c      2023-07-02 
11:51:10.388818251 -0700
-@@ -25,7 +25,7 @@
- */
- 
- /* mercury_std.h includes mercury_regs.h, and must precede system headers */
--#include "mercury_std.h"
-+#include "../runtime/mercury_std.h"
- #include <ctype.h>
- #include <string.h>
- #include <stdlib.h>
-diff -x config.log -x config.status -ru 
tmp/mercury-srcdist-22.01.6/util/mkinit.c 
work/mercury-srcdist-22.01.6/util/mkinit.c
---- tmp/mercury-srcdist-22.01.6/util/mkinit.c  2022-03-27 04:56:19.000000000 
-0700
-+++ work/mercury-srcdist-22.01.6/util/mkinit.c 2023-07-02 11:51:10.388818251 
-0700
-@@ -33,9 +33,9 @@
- /////////////////////////////////////////////////////////////////////////////
- 
- // mercury_std.h includes mercury_regs.h, and must precede system headers.
--#include    "mercury_conf.h"
--#include    "mercury_std.h"
--#include    "mercury_array_macros.h"
-+#include    "../runtime/mercury_conf.h"
-+#include    "../runtime/mercury_std.h"
-+#include    "../runtime/mercury_array_macros.h"
- #include    "mkinit_common.h"
- 
- #include    <stdio.h>
-diff -x config.log -x config.status -ru 
tmp/mercury-srcdist-22.01.6/util/mkinit_common.c 
work/mercury-srcdist-22.01.6/util/mkinit_common.c
---- tmp/mercury-srcdist-22.01.6/util/mkinit_common.c   2023-05-09 
21:57:19.000000000 -0700
-+++ work/mercury-srcdist-22.01.6/util/mkinit_common.c  2023-07-02 
11:51:10.388818251 -0700
-@@ -16,9 +16,9 @@
- */
- 
- /* mercury_std.h includes mercury_regs.h, and must precede system headers */
--#include    "mercury_conf.h"
--#include    "mercury_std.h"
--#include    "mercury_array_macros.h"
-+#include    "../runtime/mercury_conf.h"
-+#include    "../runtime/mercury_std.h"
-+#include    "../runtime/mercury_array_macros.h"
- #include    "mkinit_common.h"
- 
- #include    <stdio.h>

=== modified file 'pkg/other/mercury/sha256sums'
--- a/pkg/other/mercury/sha256sums      2023-07-03 02:18:48 +0000
+++ b/pkg/other/mercury/sha256sums      2023-08-30 18:40:14 +0000
@@ -1,2 +1,1 @@
-5fd56bfb82d5bbf2a1aae61028a61492a19ae4f8e713334170442fe8c805cc46  
download/mercury-srcdist-22.01.6.tar.xz
-e0ebe07bfa2a24946cacce1cb8f626b3272368ff400984ca1488e553a4afa18b  
download/mercury.22.01.6.patch
+61b8b24319d245b62f6388d9be1468488ce66b02ad8e3343c695451bc5459df7  
download/mercury-srcdist-22.01.7.tar.xz