<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/0bcc2540a868f05d78b7ad9dc9ab7a3fd820eef0">https://github.com/macports/macports-ports/commit/0bcc2540a868f05d78b7ad9dc9ab7a3fd820eef0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0bcc2540a868f05d78b7ad9dc9ab7a3fd820eef0
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu Jul 27 19:01:46 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> mosml-dynlibs: for now, disable mysql module due to a broken code
</span>---
lang/mosml/Portfile | 14 ++----
lang/mosml/files/0002-mosml-dynlibs.patch | 51 +++-------------------
lang/mosml/files/0004-Address-lvalue-error.patch | 22 ----------
...h.patch => 0004-Fix-for-undeclared-flush.patch} | 0
... 0005-Placeholders-for-disabling-werrors.patch} | 13 ------
5 files changed, 10 insertions(+), 90 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 d3e4a7349ff..06a53a848ba 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;'>@@ -53,39 +53,33 @@ subport ${name}-dynlibs {
</span> openssl.branch 1.1
set pgs_v 14
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set mys_v 57
</span>
depends_lib-append \
port:mosml \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mysql${mys_v} \
</span> port:postgresql${pgs_v}
# https://github.com/kfl/mosml/issues/71
patchfiles-append \
0002-mosml-dynlibs.patch \
0003-Add-some-missing-headers.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-Address-lvalue-error.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0005-Fix-for-undeclared-flush.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0006-Placeholders-for-disabling-werrors.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-Fix-for-undeclared-flush.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0005-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 {mgd mmysql mpq mregex} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d {mgd 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@MYSQL@|mysql${mys_v}|g" ${worksrcpath}/src/dynlibs/mmysql/Makefile
</span>
if {[string match *clang* ${configure.compiler}]} {
reinplace "s|@WERROR@|-Wno-error=incompatible-pointer-types|" ${worksrcpath}/src/dynlibs/mgdbm/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@WERROR@|-Wno-error=discarded-qualifiers|" ${worksrcpath}/src/dynlibs/mmysql/Makefile
</span> reinplace "s|@WERROR@|-Wno-error=implicit-function-declaration|" ${worksrcpath}/src/dynlibs/mpq/Makefile ${worksrcpath}/src/dynlibs/mregex/Makefile
} elseif {[string match macports-gcc* ${configure.compiler}]} {
reinplace "s|@WERROR@|-Wno-incompatible-pointer-types|" ${worksrcpath}/src/dynlibs/mgdbm/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@WERROR@|-Wno-discarded-qualifiers|" ${worksrcpath}/src/dynlibs/mmysql/Makefile
</span> reinplace "s|@WERROR@|-Wno-implicit-function-declaration|" ${worksrcpath}/src/dynlibs/mpq/Makefile ${worksrcpath}/src/dynlibs/mregex/Makefile
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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;'>+ reinplace "s|@WERROR@||" ${worksrcpath}/src/dynlibs/mgdbm/Makefile ${worksrcpath}/src/dynlibs/mpq/Makefile ${worksrcpath}/src/dynlibs/mregex/Makefile
</span> }
}
<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 08b6874e9f5..6ed21feb2e4 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;'>@@ -22,7 +22,7 @@ diff --git src/dynlibs/Makefile src/dynlibs/Makefile
</span> index 603d412..0f714d6 100644
--- src/dynlibs/Makefile
+++ src/dynlibs/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,53 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,53 +1,36 @@
</span>
all:
+ cd crypt; make
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ index 603d412..0f714d6 100644
</span> - cd intinf; make
cd mgd; make
cd mgdbm; make
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cd mmysql; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd mmysql; make
</span> cd mpq; make
cd mregex; make
- cd msocket; make
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ index 603d412..0f714d6 100644
</span> + cd crypt; make install
cd mgd; make install
cd mgdbm; make install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cd mmysql; make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd mmysql; make install
</span> cd mpq; make install
cd mregex; make install
- cd msocket; make install
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ index 603d412..0f714d6 100644
</span> - cd intinf; make uninstall
cd mgd; make uninstall
cd mgdbm; make uninstall
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cd mmysql; make uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd mmysql; make uninstall
</span> cd mpq; make uninstall
cd mregex; make uninstall
- cd msocket; make uninstall
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ index 603d412..0f714d6 100644
</span> - cd intinf; make test
cd mgd; make test
cd mgdbm; make test
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cd mmysql; make test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd mmysql; make test
</span> cd mpq; make test
cd mregex; make test
- cd munix; make test
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ index 603d412..0f714d6 100644
</span> - cd intinf; make clean
cd mgd; make clean
cd mgdbm; make clean
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cd mmysql; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd mmysql; make clean
</span> cd mpq; make clean
cd mregex; make clean
- cd msocket; make clean
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,45 +167,6 @@ index 7218150..ff6627a 100644
</span>
uninstall:
${UNINSTALL_DATA} $(LIBDIR)/libmgdbm.so
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/dynlibs/mmysql/Makefile src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0853210..16202e5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,17 +5,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where to find the Mysql header file and compiled library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MYSQLLIBDIR=/usr/lib/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MYSQLINCDIR=/usr/include/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#MYSQLLIBDIR=/usr/local/lib/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#MYSQLINCDIR=/usr/local/include/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MYSQLLIBDIR=@PREFIX@/lib/@MYSQL@/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MYSQLINCDIR=@PREFIX@/include/@MYSQL@/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS= -Dunix -O2 $(OPTS) -I$(INCDIR) -I ${MYSQLINCDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MOSMLTOOLS=@PREFIX@/bin/camlrunm $(TOOLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLC=mosmlc -c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLL=mosmlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLLEX=mosmllex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,11 +25,10 @@ mmysql.o: mmysql.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -c -o mmysql.o mmysql.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmmysql.so: mmysql.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(DYNLD) -o libmmysql.so mmysql.o -L${MYSQLLIBDIR} -lmysqlclient -lnsl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# $(DYNLD) -o libmmysql.so mmysql.o -L${MYSQLLIBDIR} -lmysqlclient
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(DYNLD) -o libmmysql.so mmysql.o -L${MYSQLLIBDIR} -lmysqlclient
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${INSTALL_DATA} libmmysql.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${INSTALL_DATA} libmmysql.so $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uninstall:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${UNINSTALL_DATA} $(LIBDIR)/libmmysql.so
</span> diff --git src/dynlibs/mpq/Makefile src/dynlibs/mpq/Makefile
index 8d8cec4..5cc0044 100644
--- src/dynlibs/mpq/Makefile
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bc6df63da6d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/files/0004-Address-lvalue-error.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6a910c2115c9a9722a64baee9f2f427d804685c9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 26 Jul 2023 14:39:16 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Address lvalue error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/dynlibs/mmysql/mmysql.c src/dynlibs/mmysql/mmysql.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 083771c..621c6ab 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/dynlibs/mmysql/mmysql.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/dynlibs/mmysql/mmysql.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,9 +76,9 @@ void dbresult_finalize(value dbresval)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MYSQL_ROW_OFFSET* index = DBresultindex_val(dbresval);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (dbres != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mysql_free_result(dbres);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DBresult_val(dbresval) = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DBresult_val(dbresval) == NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stat_free((char*)index);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DBresultindex_val(dbresval) = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DBresultindex_val(dbresval) == NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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/0004-Fix-for-undeclared-flush.patch
</span>similarity index 100%
rename from lang/mosml/files/0005-Fix-for-undeclared-flush.patch
rename to lang/mosml/files/0004-Fix-for-undeclared-flush.patch
<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/0005-Placeholders-for-disabling-werrors.patch
</span>similarity index 77%
rename from lang/mosml/files/0006-Placeholders-for-disabling-werrors.patch
rename to lang/mosml/files/0005-Placeholders-for-disabling-werrors.patch
<span style='display:block; white-space:pre;color:#808080;'>index 061ab141405..ed4b90292c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/files/0006-Placeholders-for-disabling-werrors.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/files/0005-Placeholders-for-disabling-werrors.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,19 +17,6 @@ index 7218150..3fb006e 100644
</span> CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDBMINCDIR}
BASELIBS=-lm -ldl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/dynlibs/mmysql/Makefile src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0853210..3e1796f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,7 +12,7 @@ MYSQLINCDIR=/usr/include/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OPTS=-fno-defer-pop @WERROR@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS= -Dunix -O2 $(OPTS) -I$(INCDIR) -I ${MYSQLINCDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span> diff --git src/dynlibs/mpq/Makefile src/dynlibs/mpq/Makefile
index 8d8cec4..c5b4474 100644
--- src/dynlibs/mpq/Makefile
</pre><pre style='margin:0'>
</pre>