<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/933ad385d3d8e0a9b0b78b38713a05569ab7ea64">https://github.com/macports/macports-ports/commit/933ad385d3d8e0a9b0b78b38713a05569ab7ea64</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 933ad385d3d libreoffice: move pkg-config calls to pre-configure
</span>933ad385d3d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 933ad385d3d8e0a9b0b78b38713a05569ab7ea64
</span>Author: Andrew Udvare <audvare@gmail.com>
AuthorDate: Wed Feb 10 22:05:55 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> libreoffice: move pkg-config calls to pre-configure
</span>---
office/libreoffice/Portfile | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/libreoffice/Portfile b/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b95040e348d..c686af170b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/libreoffice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,18 +166,20 @@ use_xcode yes
</span> configure.env-append \
"LCMS2_CFLAGS=-I${prefix}/include -DCMS_NO_REGISTER_KEYWORD=1" \
PYTHON=${prefix}/bin/python${pyver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PYTHON_CFLAGS and PYTHON_LIBS have to be non-empty
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_cflags [exec pkg-config --cflags python-${pyver}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_libs [exec pkg-config --libs python-${pyver}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${python_cflags} == ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_cflags "-I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${python_libs} == ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_libs "-L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # PYTHON_CFLAGS and PYTHON_LIBS have to be non-empty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_cflags [exec pkg-config --cflags python-${pyver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_libs [exec pkg-config --libs python-${pyver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python_cflags} == ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_cflags "-I${prefix}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python_libs} == ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_libs "-L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_CFLAGS=${python_cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_LIBS=${python_libs}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_CFLAGS=${python_cflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_LIBS=${python_libs}
</span> # Most arguments are from
# https://wiki.documentfoundation.org/LibreOffice_Vanilla_for_Mac#LibreOffice_Vanilla
configure.args-append \
</pre><pre style='margin:0'>
</pre>