<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f6bcba1838dfb6349bfcf1e67ecbb410faa781e6">https://github.com/macports/macports-ports/commit/f6bcba1838dfb6349bfcf1e67ecbb410faa781e6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f6bcba1838dfb6349bfcf1e67ecbb410faa781e6
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Jul 26 16:27:33 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> Fix -dynlibs subport for new compilers
</span>---
lang/mosml/Portfile | 22 +++++++-
lang/mosml/files/0001-mosml.patch | 2 +-
lang/mosml/files/0002-mosml-dynlibs.patch | 2 +-
.../files/0003-Add-some-missing-headers.patch | 38 ++++++++++++++
lang/mosml/files/0004-Address-lvalue-error.patch | 22 ++++++++
.../files/0005-Fix-for-undeclared-flush.patch | 19 +++++++
.../0006-Placeholders-for-disabling-werrors.patch | 58 ++++++++++++++++++++++
7 files changed, 159 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/Portfile b/lang/mosml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c23c2f7fcbe..d3e4a7349ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,16 +60,33 @@ subport ${name}-dynlibs {
</span> port:mysql${mys_v} \
port:postgresql${pgs_v}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/kfl/mosml/issues/71
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-mosml-dynlibs.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-mosml-dynlibs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-Add-some-missing-headers.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-Address-lvalue-error.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0005-Fix-for-undeclared-flush.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-Placeholders-for-disabling-werrors.patch
</span>
post-patch {
reinplace "s|@DESTDIR@|${destroot}|" ${worksrcpath}/src/Makefile.inc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d {intinf mgd mgdbm mmysql mpq mregex msocket} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d {mgd mmysql mpq mregex} {
</span> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/dynlibs/${d}/Makefile
}
reinplace "s|@PGSQL@|postgresql${pgs_v}|g" ${worksrcpath}/src/dynlibs/mpq/Makefile
reinplace "s|@MYSQL@|mysql${mys_v}|g" ${worksrcpath}/src/dynlibs/mmysql/Makefile
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@WERROR@|-Wno-error=incompatible-pointer-types|" ${worksrcpath}/src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@WERROR@|-Wno-error=discarded-qualifiers|" ${worksrcpath}/src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@WERROR@|-Wno-error=implicit-function-declaration|" ${worksrcpath}/src/dynlibs/mpq/Makefile ${worksrcpath}/src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[string match macports-gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@WERROR@|-Wno-incompatible-pointer-types|" ${worksrcpath}/src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@WERROR@|-Wno-discarded-qualifiers|" ${worksrcpath}/src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@WERROR@|-Wno-implicit-function-declaration|" ${worksrcpath}/src/dynlibs/mpq/Makefile ${worksrcpath}/src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@WERROR@||" ${worksrcpath}/src/dynlibs/mgdbm/Makefile ${worksrcpath}/src/dynlibs/mmysql/Makefile ${worksrcpath}/src/dynlibs/mpq/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
build.dir ${worksrcpath}/src/dynlibs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +96,7 @@ subport ${name}-dynlibs {
</span> CAMLRT="${prefix}/lib/mosml"
build.target all
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-destroot {
xinstall -d ${destroot}${prefix}/lib/mosml
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/0001-mosml.patch b/lang/mosml/files/0001-mosml.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index ceb8f18e859..3fe01d1c65c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/files/0001-mosml.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/files/0001-mosml.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 0fc5c76fd8e648c4da769c36dd0c86540c598b45 Mon Sep 17 00:00:00 2001
From: barracuda156 <vital.had@gmail.com>
Date: Wed, 26 Jul 2023 05:25:18 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] Fix Makefile.inc for Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix Makefile.inc for Darwin
</span>
diff --git src/Makefile.inc src/Makefile.inc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/0002-mosml-dynlibs.patch b/lang/mosml/files/0002-mosml-dynlibs.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c1edc1c8250..08b6874e9f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/files/0002-mosml-dynlibs.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/files/0002-mosml-dynlibs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 3129d7168c1e91511f8f9505709f5f2defca9a5b Mon Sep 17 00:00:00 2001
From: barracuda156 <vital.had@gmail.com>
Date: Wed, 26 Jul 2023 08:41:30 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/2] Fix dynlibs build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix dynlibs build
</span>
diff --git src/Makefile.inc src/Makefile.inc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/0003-Add-some-missing-headers.patch b/lang/mosml/files/0003-Add-some-missing-headers.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b6efa2b742f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/files/0003-Add-some-missing-headers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From c3c3018155f35af5585f79c8c178f4d88165a22d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Jul 2023 14:05:08 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Add some missing headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mgd/mgd.c src/dynlibs/mgd/mgd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 859bf3d..0e9f4a8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mgd/mgd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mgd/mgd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Moscow ML specific includes: */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <alloc.h> /* For alloc_tuple, ... */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <mlvalues.h> /* For Val_unit, Long_val, String_val, ... */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mlvalues.h> /* For Val_unit, Long_val, String_val, ... */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <fail.h> /* for failwith */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <memory.h> /* for modify */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Representation of images.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mmysql/mmysql.c src/dynlibs/mmysql/mmysql.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e8c079a..083771c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mmysql/mmysql.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mmysql/mmysql.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,11 +3,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sestoft@dina.kvl.dk 1999-08-07, 2000-05-30, 2002-07-25 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/0004-Address-lvalue-error.patch b/lang/mosml/files/0004-Address-lvalue-error.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bc6df63da6d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/files/0004-Address-lvalue-error.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6a910c2115c9a9722a64baee9f2f427d804685c9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Jul 2023 14:39:16 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Address lvalue error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mmysql/mmysql.c src/dynlibs/mmysql/mmysql.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 083771c..621c6ab 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mmysql/mmysql.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mmysql/mmysql.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,9 +76,9 @@ void dbresult_finalize(value dbresval)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MYSQL_ROW_OFFSET* index = DBresultindex_val(dbresval);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dbres != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mysql_free_result(dbres);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DBresult_val(dbresval) = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DBresult_val(dbresval) == NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stat_free((char*)index);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DBresultindex_val(dbresval) = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DBresultindex_val(dbresval) == NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/0005-Fix-for-undeclared-flush.patch b/lang/mosml/files/0005-Fix-for-undeclared-flush.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..45441cb2dba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/files/0005-Fix-for-undeclared-flush.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d4a227203487a2097339cf31e8be11f5f2718e4c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Jul 2023 14:57:24 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix for undeclared flush
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mgd/mgd.c src/dynlibs/mgd/mgd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0e9f4a8..95a54e1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mgd/mgd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mgd/mgd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,7 +123,7 @@ EXTERNML value mgd_tostdoutpng(value im)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stdout, "Content-type: image/png\n\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdImagePng(Image_val(im), stdout);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(WIN32) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fflush(stdout);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flush(stdout);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/0006-Placeholders-for-disabling-werrors.patch b/lang/mosml/files/0006-Placeholders-for-disabling-werrors.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..061ab141405
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/files/0006-Placeholders-for-disabling-werrors.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f5d859928130323a016696a8c2ffcd0ffb16b181 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Jul 2023 16:19:22 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Placeholders for disabling werrors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mgdbm/Makefile src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7218150..3fb006e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@ GDBMINCDIR=${HOME}/c/gdbm-1.7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPTS=-fno-defer-pop @WERROR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDBMINCDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BASELIBS=-lm -ldl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mmysql/Makefile src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0853210..3e1796f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@ MYSQLINCDIR=/usr/include/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPTS=-fno-defer-pop @WERROR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS= -Dunix -O2 $(OPTS) -I$(INCDIR) -I ${MYSQLINCDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mpq/Makefile src/dynlibs/mpq/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8d8cec4..c5b4474 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mpq/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mpq/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@ PGSQLINCDIR=/usr/include/postgresql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPTS=-fno-defer-pop @WERROR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${PGSQLINCDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mregex/Makefile src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2fd659b..1f0675c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPTS=-fno-defer-pop @WERROR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span></pre><pre style='margin:0'>
</pre>