[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r9383: update mercury to 22.01.6
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r9383: update mercury to 22.01.6 |
|
Date: |
Sun, 2 Jul 2023 22:18:53 -0400 (EDT) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 9383
revision-id: carlhansen1234@gmail.com-20230703021848-gdnf6u5rooe725te
parent: carlhansen1234@gmail.com-20230703014112-apr64qgfk71tuuus
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Sun 2023-07-02 19:18:48 -0700
message:
update mercury to 22.01.6
removed:
pkg/other/mercury/files/mercury.22.01.5.patch
mercury.22.01.5.patc-20230115012141-fx5cg7zcyq7jvx40-2
added:
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/config.mk config.mk-20181109194009-h0l0v02nsc5pw6mc-2
pkg/other/mercury/sha256sums sha256sums-20181109194009-h0l0v02nsc5pw6mc-4
=== modified file 'pkg/other/mercury/Makefile'
--- a/pkg/other/mercury/Makefile 2023-04-21 00:35:01 +0000
+++ b/pkg/other/mercury/Makefile 2023-07-03 02:18:48 +0000
@@ -1,4 +1,4 @@
-# Copyright ©2018,2019,2020,2021,2022 Carl Hansen <carlhansen@gnu.org>
+# Copyright ©2018-2023 Carl Hansen <carlhansen@gnu.org>
#
# This file is part of GSRC, the GNU Source Release Collection.
# http://www.gnu.org/software/gsrc
@@ -21,7 +21,7 @@
NAME = Mercury
GARNAME = mercury
-GARVERSION = 22.01.5
+GARVERSION = 22.01.6
HOME_URL = http://www.mercurylang.org/
DESCRIPTION = Mercury logic-functional programming language
define BLURB
@@ -44,20 +44,32 @@
BUILDDEPS =
LIBDEPS =
-PATCHFILES = mercury.22.01.5.patch
+PATCHFILES = mercury.22.01.6.patch
-#DESTDIR = $(packageprefix)
######################################################################
include ../../../gar/gar.lib/autotools.mk
+include ../../../gar/varb.mk
include config.mk
+
+## Configuration options ##
# important
# Does "minimal install. The READMEs may help about additions.
#
-.PHONY: pre-install pre-build
-
-pre-build:
+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 =
+
+#INSTALL_SCRIPTS = prefix
+
+.PHONY: install-prefix post-build
+
+post-build:
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo Read the READMEs in the source to see if you need do something
@@ -65,4 +77,6 @@
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#jinstall-prefix:
+#j $(MAKE) install --prefix=$(prefix)
=== modified file 'pkg/other/mercury/config.mk'
--- a/pkg/other/mercury/config.mk 2022-04-29 01:57:43 +0000
+++ b/pkg/other/mercury/config.mk 2023-07-03 02:18:48 +0000
@@ -1,8 +1,10 @@
## Configuration options ##
## adjust as needed
-CONFIGURE_OPTS ?= --enable-minimal-install
-BUILD_OPTS ?= CFLAGS+="--warn-no-array-parameter -Wno-array-parameter"
+CONFIGURE_OPTS ?=
+BUILD_OPTS ?=
+#CONFIGURE_OPTS ?= --enable-minimal-install
+#BUILD_OPTS ?= CFLAGS+="--warn-no-array-parameter -Wno-array-parameter"
=== removed file 'pkg/other/mercury/files/mercury.22.01.5.patch'
--- a/pkg/other/mercury/files/mercury.22.01.5.patch 2023-01-15 07:01:24
+0000
+++ b/pkg/other/mercury/files/mercury.22.01.5.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.1/util/info_to_mdb.c
work/mercury-srcdist-22.01.1/util/info_to_mdb.c
---- tmp/mercury-srcdist-22.01.1/util/info_to_mdb.c 2020-10-10
20:28:49.000000000 -0700
-+++ work/mercury-srcdist-22.01.1/util/info_to_mdb.c 2022-04-28
17:39:38.124995557 -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.1/util/mdemangle.c
work/mercury-srcdist-22.01.1/util/mdemangle.c
---- tmp/mercury-srcdist-22.01.1/util/mdemangle.c 2020-10-10
20:28:49.000000000 -0700
-+++ work/mercury-srcdist-22.01.1/util/mdemangle.c 2022-04-28
17:38:07.751578956 -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.1/util/mkinit.c
work/mercury-srcdist-22.01.1/util/mkinit.c
---- tmp/mercury-srcdist-22.01.1/util/mkinit.c 2022-03-27 04:56:19.000000000
-0700
-+++ work/mercury-srcdist-22.01.1/util/mkinit.c 2022-04-28 17:35:21.903814431
-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.1/util/mkinit_common.c
work/mercury-srcdist-22.01.1/util/mkinit_common.c
---- tmp/mercury-srcdist-22.01.1/util/mkinit_common.c 2020-10-27
01:57:07.000000000 -0700
-+++ work/mercury-srcdist-22.01.1/util/mkinit_common.c 2022-04-28
17:37:27.390392899 -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>
=== added file 'pkg/other/mercury/files/mercury.22.01.6.patch'
--- a/pkg/other/mercury/files/mercury.22.01.6.patch 1970-01-01 00:00:00
+0000
+++ b/pkg/other/mercury/files/mercury.22.01.6.patch 2023-07-03 02:18:48
+0000
@@ -0,0 +1,56 @@
+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-01-15 07:01:24 +0000
+++ b/pkg/other/mercury/sha256sums 2023-07-03 02:18:48 +0000
@@ -1,2 +1,2 @@
-73c0ff72c88184779436a9f2a6169e8e918fdc48fcba8aefa550c96addb114a6
download/mercury-srcdist-22.01.5.tar.xz
-3a47b089068199843af502b9a997c9be1d9472e14f90ff8ef50b43899ace8d41
download/mercury.22.01.5.patch
+5fd56bfb82d5bbf2a1aae61028a61492a19ae4f8e713334170442fe8c805cc46
download/mercury-srcdist-22.01.6.tar.xz
+e0ebe07bfa2a24946cacce1cb8f626b3272368ff400984ca1488e553a4afa18b
download/mercury.22.01.6.patch
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r9383: update mercury to 22.01.6,
Carl Hansen <=