<pre style='margin:0'>
Jeremy L (nerdling) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e7161c213e5690ef7e3132146daca5e2c056762d">https://github.com/macports/macports-ports/commit/e7161c213e5690ef7e3132146daca5e2c056762d</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 e7161c2 lilypond-devel: update to 2.19.82, new variant 'mactex'
</span>e7161c2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7161c213e5690ef7e3132146daca5e2c056762d
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Wed Nov 28 07:27:02 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> lilypond-devel: update to 2.19.82, new variant 'mactex'
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This is a complete overhaul of the Portfile. Other noteworthy changes:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> . Fix list of dependencies.
</span><span style='display:block; white-space:pre;color:#404040;'> . Add minor fix from (forthcoming) upstream to remove repeated compiler
</span><span style='display:block; white-space:pre;color:#404040;'> warning.
</span><span style='display:block; white-space:pre;color:#404040;'> . Update compiler whitelist.
</span><span style='display:block; white-space:pre;color:#404040;'> . Add option for using URW fonts.
</span>---
textproc/lilypond-devel/Portfile | 129 ++++++++++++++++++---
.../files/patch-no-Wstrict-prototypes-warning.diff | 52 +++++++++
2 files changed, 163 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond-devel/Portfile b/textproc/lilypond-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 48de653..1aeac2d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lilypond-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,11 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
name lilypond-devel
set my_name lilypond
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.19.80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.19.82
</span> revision 4
set branch [join [lrange [split ${version} .] 0 1] .]
categories textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,59 +22,151 @@ long_description Lilypond is a unix-based automated engraving system that \
</span> homepage http://lilypond.org/
conflicts lilypond
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.linuxaudio.org/lilypond/sources/v${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://lilypond.org/download/sources/v${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# master_sites http://download.linuxaudio.org/lilypond/sources/v${branch}/
</span> distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f0d923cec535cf8a133f2c801082db6120f01ad6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3679db30a3f74ce8668691952fb0dd58d8ad6bad099017e815ca3e4312261453
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 71f199afa24a75cfde53337c2140e96c74d7857d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a5679cddb3e415828642f75027997596b814922aadb1fa633c8f973238ae291b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17407520
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:t1utils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:t1utils \
</span> port:bison \
port:texi2html \
port:netpbm \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flex \
</span> port:fontforge \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:fontconfig \
</span> port:freetype \
port:gettext \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:ghostscript \
port:gmp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mftrace \
</span> port:guile18 \
port:texinfo \
path:lib/pkgconfig/pango.pc:pango \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:t1utils \
</span> port:texlive \
port:texlive-fonts-recommended \
port:texlive-lang-cyrillic \
port:texlive-metapost \
port:dblatex \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:urw-core35-fonts
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd autoconf -f && ./configure
</span> configure.python ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-scripts-build-mf2pt1.pl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set lilyponddevel.texgyredir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set lilyponddevel.mactex_bin ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set lilyponddevel.temp ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mactex description {Allow lilypond-devel to use MacTeX or another\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ external TeXLive installation instead of MacPorts TeXLive tools. To\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install the 'mactex' variant the path to the TeX distribution's\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ binary directory (for example '/Library/TeX/texbin') must be added\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to 'binpath' in 'macports.conf' *before* installing this port.} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find the binary directory of the external TeX distribution by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # searching the kpsewhich program in the path. We assume that all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # other binaries of the distribution are in this directory, too.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[auto_execok kpsewhich] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lilyponddevel.temp {*}[auto_execok kpsewhich]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lilyponddevel.mactex_bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file dirname [file normalize ${lilyponddevel.temp}]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${lilyponddevel.mactex_bin} eq "."} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Cannot find MacTeX or external TeXLive\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installation; aborting. Have you added the path to\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ your TeX distribution's binary directory to 'binpath'\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in 'macports.conf'?"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${lilyponddevel.mactex_bin} eq \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file dirname [file normalize "${prefix}/bin/kpsewhich"]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Variant 'mactex' doesn't work with\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installed MacPorts TeXLive packages. Either\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall them or don't use the 'mactex' variant of\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lilyponddevel."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lilyponddevel.have_texgyre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [regexp -line {installed: *Yes} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [exec ${lilyponddevel.mactex_bin}/tlmgr info --only-installed tex-gyre]]
</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;'>+ if {${lilyponddevel.have_texgyre}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lilyponddevel.texgyredir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file dirname \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [exec ${lilyponddevel.mactex_bin}/kpsewhich texgyreschola-regular.otf]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "TeXLive package 'tex-gyre' not\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installed; aborting. Please install it, then\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try again"
</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;background:#e0ffe0;'>+ depends_lib-delete port:texlive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-fonts-recommended \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-lang-cyrillic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-metapost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
</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;'>+patchfiles patch-scripts-build-mf2pt1.pl.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-Wstrict-prototypes-warning.diff
</span> post-patch {
reinplace s|__vector|lily_vector|g ${worksrcpath}/flower/include/std-vector.hh
# Use guile18 header files
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|libguile\.h|libguile18.h|g ${worksrcpath}/configure \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|libguile\.h|libguile18.h|g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/aclocal.m4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure.ac \
</span> ${worksrcpath}/lily/include/lily-guile.hh
# help fontforge date calculation
reinplace s|20110222|2011-02-22|g ${worksrcpath}/configure
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://lists.gnu.org/archive/html/bug-lilypond/2016-07/msg00071.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# lilypond currently relies on a g++ extension (which appears to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# non-standard C++) that prevents compilation with clang, cf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://lists.gnu.org/archive/html/bug-lilypond/2016-07/msg00071.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and the thread starting with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# http://lists.llvm.org/pipermail/cfe-users/2018-November/001417.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# According to one of the main developers of lilypond, it is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# possible to circumvent this issue without rewriting a considerable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# amount of code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # blacklist any clang compiler and any old gcc (a better expression is needed)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *clang* *llvm-gcc* *apple-gcc* gcc gcc-3.3 gcc-4.0 gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.whitelist macports-gcc-6 macports-gcc-5 macports-gcc-4.9 macports-gcc-4.8 macports-gcc-4.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *clang* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *llvm-gcc* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *apple-gcc* \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc-3.3 gcc-4.0 gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.whitelist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.9 macports-gcc-4.8 macports-gcc-4.7
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --with-texgyre-dir=${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts \
</span> --enable-documentation
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset mactex]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-texgyre-dir=${lilyponddevel.texgyredir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> configure.env LTDL_LIBRARY_PATH=${prefix}/lib \
PYTHON_CONFIG=${configure.python}-config \
GUILE=${prefix}/bin/guile18 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond-devel/files/patch-no-Wstrict-prototypes-warning.diff b/textproc/lilypond-devel/files/patch-no-Wstrict-prototypes-warning.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4f4a162
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lilypond-devel/files/patch-no-Wstrict-prototypes-warning.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,52 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git aclocal.m4 aclocal.m4.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1228f6ca29c6208a89c19bdf8aee3f651a9c3dcb..7295aa9cf6126b121cac9b57db3c74ca76989f95 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aclocal.m4.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1121,17 +1121,37 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_PROGS(PYTHON_CONFIG, `basename $PYTHON`-config, no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Clean out junk: http://bugs.python.org/issue3290
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Python headers may need some -f* flags, leave them in.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # We want the sed commands to look like 's/-[WDOm][[:alnum:][:punct:]][[:alnum:][:punct:]]*//g' and 's/-arch [^[:space:]]*//g', but automake eats brackets.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/-[[WDOm]][[[:alnum:][:punct:]]][[[:alnum:][:punct:]]]*//g' | sed -e 's/-arch @<:@^@<:@:space:@:>@@:>@*//g'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # The above sed BRE matches parts of legal options, stipping down part of that option, resulting in invalid gcc arguments. Gentoo Bug #415793
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # For instance, '-floop-stip-mime' becomes '-floop-strip', and '-fvect-cost-model' becomes '-fvect-cost'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Tentative fix to require a non alphanumeric character before the initial hyphen of the BRE or the hyphen being the first character in the string.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/\(^\|[[^[:alnum:]]]\)-[[WDOm]][[[:alnum:][:punct:]]][[[:alnum:][:punct:]]]*//g' | sed -e 's/-arch @<:@^@<:@:space:@:>@@:>@*//g'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # We massage $PYTHON_CFLAGS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # . Clean out junk (http://bugs.python.org/issue3290).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # . Python headers may need some '-f*' flags, leave them in.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # . Since we are later on adding $PYTHON_CFLAGS to $CPPFLAGS, remove
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # the '-Wstrict-prototypes' warning, which is not valid for C++,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # and which some ports of Python add (for example macports).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # This leads to the following BREs for sed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # s/-[WDOm][[:alnum:][:punct:]][[:alnum:][:punct:]]*//g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # s/-arch [^[:space:]]*//g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # s/-Wstrict-prototypes//g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # However, the first BRE strips off parts of valid options, thus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # resulting in invalid gcc arguments (Gentoo bug #415793). For
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # instance, '-floop-strip-mime' becomes '-floop-strip', and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # '-fvect-cost-model' becomes '-fvect-cost'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Our tentative fix is to require a non-alphanumeric character
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # before the initial hyphen of the BRE or the hyphen being the first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # character in the string.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl To prevent m4 eating brackets we add one more level of brackets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl for proper quoting.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | sed -e 's/\(^\|[^[:alnum:]]\)-[WDOm][[:alnum:][:punct:]][[:alnum:][:punct:]]*//g' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -e 's/-arch [^[:space:]]*//g' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -e 's/-Wstrict-prototypes//g'`]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</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;'>+ if test -z "$PYTHON_CFLAGS" -a "$cross_compiling" = "no"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ changequote(<<, >>)#dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # alternatively, for python >= 2.0
</span></pre><pre style='margin:0'>
</pre>