<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a1e4d4bbbeb67c72a38e67df4bb9a1066b7932c4">https://github.com/macports/macports-ports/commit/a1e4d4bbbeb67c72a38e67df4bb9a1066b7932c4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a1e4d4bbbeb67c72a38e67df4bb9a1066b7932c4
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Thu Mar 19 15:39:56 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> multimedia/audacious-core: fix build failure due to installed version in less invasive way.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Instead of reordering variables in the build system, split out -L and -l
</span><span style='display:block; white-space:pre;color:#404040;'> flags into LDFLAGS (or the equivalent) and LIBS.
</span>---
...h-buildsys-fix-link-order-and-make-verbose.diff | 61 ++++++++++++++++++++--
1 file changed, 56 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/audacious-core/files/patch-buildsys-fix-link-order-and-make-verbose.diff b/multimedia/audacious-core/files/patch-buildsys-fix-link-order-and-make-verbose.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0763340..88ffbfb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/audacious-core/files/patch-buildsys-fix-link-order-and-make-verbose.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/audacious-core/files/patch-buildsys-fix-link-order-and-make-verbose.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@
</span> ${LINK_STATUS}
out="$@"; \
- if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; \
</span> + if [ "$${?}" -eq "0" ]; then \
${LINK_OK}; \
else \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@
</span> ${LINK_STATUS}
out="$@"; \
- if ${LD} -o $@ ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${LIB_LDFLAGS} ${LIB_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS}; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LD} -o $@ ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${LIB_LDFLAGS} ${LIB_LDFLAGS_INSTALL_NAME} ${LIBS} ${LDFLAGS}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LD} -o $@ ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${LIB_LDFLAGS} ${LIB_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS}; \
</span> + if [ "$${?}" -eq "0" ]; then \
${LINK_OK}; \
else \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@
</span> ${LINK_STATUS}
out="$@"; \
- if ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LIBS} ${LDFLAGS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; \
</span> + if [ "$${?}" -eq "0" ]; then \
${LINK_OK}; \
else \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@
</span> ${MORPHOS_LIB} ${MORPHOS_LIB_NOINST}: ${EXT_DEPS} ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA}
${LINK_STATUS}
- if ${LD} -o $@ ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA} -nostartfiles ${LDFLAGS} ${LIBS}; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LD} -o $@ ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA} -nostartfiles ${LIBS} ${LDFLAGS}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LD} -o $@ ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA} -nostartfiles ${LDFLAGS} ${LIBS}; \
</span> + if [ "$${?}" -eq "0" ]; then \
${LINK_OK}; \
else \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,7 @@
</span> ${LINK_STATUS}
out="$@"; \
- if ${LD} -o $@ ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${LD} -o $@ ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LIBS} ${LDFLAGS}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${LD} -o $@ ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; \
</span> + if [ "$${?}" -eq "0" ]; then \
${LINK_OK}; \
else \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -620,3 +620,54 @@
</span> ${DELETE_OK}; \
else \
${DELETE_FAILED}; \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/audacious/Makefile.old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/audacious/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,9 @@ CPPFLAGS := -I.. -I../.. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CPPFLAGS} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GLIB_CFLAGS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS := -L../libaudcore -laudcore \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS := -L../libaudcore $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS := -laudcore \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${LIBS} -lm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${LIBINTL} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GLIB_LIBS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libaudgui/Makefile.old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libaudgui/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,9 @@ CPPFLAGS := -I.. -I../.. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += ${LIB_CFLAGS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS := -L../libaudcore -laudcore \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_LDFLAGS := -L../libaudcore $(LIB_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS := -laudcore \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${LIBS} -lm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GLIB_LIBS} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GTK_LIBS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libaudqt/Makefile.old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libaudqt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,9 @@ CPPFLAGS := -I.. -I../.. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += ${LIB_CFLAGS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS := -L../libaudcore -laudcore \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_LDFLAGS := -L../libaudcore $(LIB_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS := -laudcore \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${LIBS} -lm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${QT_LIBS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libaudtag/Makefile.old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libaudtag/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,8 @@ CPPFLAGS := -I.. -I../.. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += ${LIB_CFLAGS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS := -L../libaudcore -laudcore \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_LDFLAGS := -L../libaudcore $(LIB_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS := -laudcore \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${LIBS} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GLIB_LIBS}
</span></pre><pre style='margin:0'>
</pre>