<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/baaffeb3a3642dca8e6fbbbbb0096794557c9a53">https://github.com/macports/macports-ports/commit/baaffeb3a3642dca8e6fbbbbb0096794557c9a53</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new baaffeb3a36 edbrowse: Use MacPorts LDFLAGS
</span>baaffeb3a36 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit baaffeb3a3642dca8e6fbbbbb0096794557c9a53
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 21 03:51:14 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> edbrowse: Use MacPorts LDFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Needed for legacysupport to work.
</span>---
www/edbrowse/Portfile | 2 +-
www/edbrowse/files/use-CFLAGS-LDFLAGS.patch | 41 +++++++++++++++++++++++++++++
www/edbrowse/files/use-CFLAGS.patch | 21 ---------------
3 files changed, 42 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/edbrowse/Portfile b/www/edbrowse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index afde821e805..3ea6e9b76c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/edbrowse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/edbrowse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +79,7 @@ post-extract {
</span> patch.dir ${workpath}
patchfiles build-quickjs.patch \
docdir.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use-CFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use-CFLAGS-LDFLAGS.patch
</span>
post-patch {
reinplace "s|@DOCDIR@|${docdir}|g" ${worksrcpath}/doc/man-${name}-freebsd.1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/edbrowse/files/use-CFLAGS-LDFLAGS.patch b/www/edbrowse/files/use-CFLAGS-LDFLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6617a805150
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/edbrowse/files/use-CFLAGS-LDFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't override MacPorts CFLAGS and LDFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- edbrowse/src/makefile.orig 2022-03-12 23:41:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ edbrowse/src/makefile 2022-06-21 03:48:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += $(DEBUGFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Libraries and linker flags for edbrowse.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS += $(STRIP) $(LINKER_LIBS) -lpthread -lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LDFLAGS for quickjs loading.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QUICKJS_LDFLAGS = $(QUICKJS_DIR)/libquickjs.a -ldl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- quickjs/Makefile.orig 2021-03-27 05:00:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ quickjs/Makefile 2022-06-21 03:24:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef CONFIG_CLANG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HOST_CC=clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=$(CROSS_PREFIX)clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wextra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wno-sign-compare
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wno-missing-field-initializers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +87,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HOST_CC=gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=$(CROSS_PREFIX)gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wno-array-bounds -Wno-format-truncation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef CONFIG_LTO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AR=$(CROSS_PREFIX)gcc-ar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,7 +112,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_SMALL=$(CFLAGS) -Os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_OPT=$(CFLAGS) -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_NOLTO:=$(CFLAGS_OPT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LDFLAGS=-g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS+=-g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef CONFIG_LTO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_SMALL+=-flto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_OPT+=-flto
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/edbrowse/files/use-CFLAGS.patch b/www/edbrowse/files/use-CFLAGS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4b07b2bee1b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/edbrowse/files/use-CFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't override MacPorts CFLAGS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- quickjs/Makefile.orig 2021-03-27 05:00:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ quickjs/Makefile 2022-06-20 23:10:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifdef CONFIG_CLANG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HOST_CC=clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=$(CROSS_PREFIX)clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -Wextra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -Wno-sign-compare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -Wno-missing-field-initializers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,7 +87,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HOST_CC=gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=$(CROSS_PREFIX)gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -Wno-array-bounds -Wno-format-truncation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifdef CONFIG_LTO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AR=$(CROSS_PREFIX)gcc-ar
</span></pre><pre style='margin:0'>
</pre>