perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From go...@apache.org
Subject cvs commit: modperl-2.0/lib/Apache Build.pm
Date Tue, 21 Sep 2004 07:46:22 GMT
gozer       2004/09/21 00:46:22

  Modified:    .        Changes
               lib/Apache Build.pm
  Log:
  When processing libs paths in httpd's source tree, we need to check
  for .libs/ directory and add them to the -L path since the .so outside
  of .dirs/ are libtools wrappers we cannot use.
  
  Revision  Changes    Path
  1.493     +3 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.492
  retrieving revision 1.493
  diff -u -r1.492 -r1.493
  --- Changes	21 Sep 2004 06:51:10 -0000	1.492
  +++ Changes	21 Sep 2004 07:46:22 -0000	1.493
  @@ -12,6 +12,9 @@
   
   =item 1.99_17-dev
   
  +Add .libs/ as part of the library search path when building
  +against httpd's source tree [Gozer]
  +
   In the static build, run make in httpd's srclib/ early to have
   generated files present at mod_perl configure time [Gozer]
   
  
  
  
  1.183     +8 -0      modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.182
  retrieving revision 1.183
  diff -u -r1.182 -r1.183
  --- Build.pm	21 Sep 2004 06:51:10 -0000	1.182
  +++ Build.pm	21 Sep 2004 07:46:22 -0000	1.183
  @@ -957,6 +957,14 @@
       for ($self->apr_config_path, $self->apu_config_path) {
           if (my $link = $_ && -x $_ && qx{$_ --link-ld --libs}) {
               chomp $link;
  +            if ($self->httpd_is_source_tree) {
  +                my @libs;
  +                while ($link =~ m/-L(\S+)/g) {
  +                    my $dir = File::Spec->catfile($1, '.libs');
  +                    push @libs, $dir if -d $dir;
  +                }
  +                push @apru_link_flags, join ' ', map { "-L$_" } @libs;
  +            }
               push @apru_link_flags, $link;
           }
       }
  
  
  

Mime
View raw message