In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/21a33adc37856aaedd4bf756d5dca47bdc4f7b50?hp=bb5b17cdb7d08a1d41edbdaefed408064d4cd453>
- Log ----------------------------------------------------------------- commit 21a33adc37856aaedd4bf756d5dca47bdc4f7b50 Author: James E Keenan <[email protected]> Date: Mon May 22 21:25:18 2017 -0400 When building with g++ on FreeBSD, explicitly set 'usedl' and 'dlsrc'. For: https://rt.perl.org/Ticket/Display.html?id=131337 Signed-off-by: James E Keenan <[email protected]> M hints/freebsd.sh commit 66c5e3f2ab554a89dfc00689602414ac21ea66f6 Author: James E Keenan <[email protected]> Date: Sun May 21 22:16:23 2017 -0400 Patch suggested by Craig Berry for RT 131337. M regexec.c ----------------------------------------------------------------------- Summary of changes: hints/freebsd.sh | 9 +++++++++ regexec.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/hints/freebsd.sh b/hints/freebsd.sh index e5ecea8db9..fc6d73f87b 100644 --- a/hints/freebsd.sh +++ b/hints/freebsd.sh @@ -320,3 +320,12 @@ d_printf_format_null='undef' # As of 10.3-RELEASE FreeBSD. See [perl #128867] d_uselocale='undef' + +# https://rt.perl.org/Ticket/Display.html?id=131337 +case "$cc" in +*g++*) + usedl='define' + dlsrc='dl_dlopen.xs' + ;; +esac + diff --git a/regexec.c b/regexec.c index 35b88d7ece..e63f15d13e 100644 --- a/regexec.c +++ b/regexec.c @@ -9750,6 +9750,8 @@ S_to_byte_substr(pTHX_ regexp *prog) return TRUE; } +#ifndef PERL_IN_XSUB_RE + bool Perl__is_grapheme(pTHX_ const U8 * strbeg, const U8 * s, const U8 * strend, const UV cp) { @@ -9805,6 +9807,7 @@ Perl__is_grapheme(pTHX_ const U8 * strbeg, const U8 * s, const U8 * strend, cons return isGCB(cp_gcb_val, next_cp_gcb_val, strbeg, s, TRUE); } +#endif -- Perl5 Master Repository
