mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 08:38:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow perl to build with the re extension is static

Browse Source 
Previously configuring with -Uusedl built successfully, but didn't
with -Dstatic_ext=re, now both build successfully.

Fixes #21550
This commit is contained in:
Tony Cook 2024-01-25 08:48:01 +11:00
parent 93ed5f02b2
commit 3b03ffb49b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/re/Makefile.PL
View File

@ -28,6 +28,13 @@ foreach my $tuple (@files) {
} }
my $defines = '-DPERL_EXT_RE_BUILD -DPERL_EXT_RE_DEBUG -DPERL_EXT'; my $defines = '-DPERL_EXT_RE_BUILD -DPERL_EXT_RE_DEBUG -DPERL_EXT';
my %args;
for my $arg (@ARGV) {
$args{$1} = $2 if $arg =~ /^(\w+)=(.*)$/;
}
if ($args{LINKTYPE} eq "static") {
$defines .= ' -DPERL_EXT_RE_STATIC';
}
my @libs; my @libs;
if ($^O eq 'cygwin' && $Config{usequadmath}) { if ($^O eq 'cygwin' && $Config{usequadmath}) {

4
regcomp.h
View File

@ -1559,12 +1559,12 @@ typedef enum {
* and this is not a DEBUGGING enabled build (identified by * and this is not a DEBUGGING enabled build (identified by
* DEBUGGING_RE_ONLY being defined) * DEBUGGING_RE_ONLY being defined)
*/ */
#if ( defined(USE_DYNAMIC_LOADING) && defined(DEBUGGING)) || \ #if ( !defined(PERL_EXT_RE_STATIC) && defined(DEBUGGING)) || \
( defined(PERL_EXT_RE_BUILD) && defined(DEBUGGING_RE_ONLY)) || \ ( defined(PERL_EXT_RE_BUILD) && defined(DEBUGGING_RE_ONLY)) || \
(!defined(PERL_EXT_RE_BUILD) && defined(DEBUGGING)) (!defined(PERL_EXT_RE_BUILD) && defined(DEBUGGING))
#define PERL_RE_BUILD_DEBUG #define PERL_RE_BUILD_DEBUG
#endif #endif
#if ( defined(USE_DYNAMIC_LOADING) || !defined(PERL_EXT_RE_BUILD) ) #if !defined(PERL_EXT_RE_STATIC)
#define PERL_RE_BUILD_AUX #define PERL_RE_BUILD_AUX
#endif #endif