Mailing List Archive

Author: jorton
Date: Tue Oct 20 13:44:12 2020
New Revision: 1882694

URL: http://svn.apache.org/viewvc?rev=1882694&view=rev
Log:
Revert r1880275 and merge r1882691 from branches/v2.15:

Fix errors running "make release".

Submitted by: Petr Pisar <ppisar redhat.com>

Modified:
httpd/apreq/trunk/ (props changed)
httpd/apreq/trunk/CHANGES
httpd/apreq/trunk/build/version_check.pl

Propchange: httpd/apreq/trunk/
------------------------------------------------------------------------------
Merged /httpd/apreq/branches/v2.15:r1882691

Modified: httpd/apreq/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=1882694&r1=1882693&r2=1882694&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Tue Oct 20 13:44:12 2020
@@ -12,6 +12,9 @@
In apreq_brigade_concat(), fix memory handling and create
the FILE bucket correctly.

+- Build [Petr Pisar]
+ Fix "make release" on Unix.
+
@section v2_14 Changes with libapreq2-2.14 (not released)

- Build [stevehay]

Modified: httpd/apreq/trunk/build/version_check.pl
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/build/version_check.pl?rev=1882694&r1=1882693&r2=1882694&view=diff
==============================================================================
--- httpd/apreq/trunk/build/version_check.pl (original)
+++ httpd/apreq/trunk/build/version_check.pl Tue Oct 20 13:44:12 2020
@@ -140,11 +140,6 @@ WARN
close $fh;
}

-if (defined $path and $path eq 'perl_prereqs') {
- print perl_prereqs();
- exit;
-}
-
if (@ARGV == 0) {

if ($opts{version}) { # generate META.yml file content
@@ -183,7 +178,7 @@ no_index:
generated_by: $0
EOT
my %runtime_prereqs = (
- mod_perl2 => $perl_glue{mod_perl},
+ mod_perl2 => $perl_glue{mod_perl2},
perl => $perl_glue{perl},
);
print_prereqs "requires:", \%runtime_prereqs;
@@ -204,6 +199,9 @@ EOT
}

exit 0;
+} elsif ($path eq 'perl_prereqs') {
+ print perl_prereqs();
+ exit;
}