cvs commit: modperl-2.0/lib/ModPerl MM.pm

2001-10-21 Thread dougm 

dougm   01/10/21 16:37:30

  Modified:lib/Apache Build.pm
   lib/ModPerl MM.pm
  Log:
  need to include $Config{ccflags} in CCFLAGS passed to MakeMaker
  
  Revision  ChangesPath
  1.64  +6 -2  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.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Build.pm  2001/10/21 06:57:07 1.63
  +++ Build.pm  2001/10/21 23:37:30 1.64
  @@ -194,6 +194,10 @@
   $ccopts;
   }
   
  +sub perl_ccopts {
  +shift-strip_lfs( $Config{ccflags} );
  +}
  +
   sub ccopts_hpux {
   my $cflags = shift;
   #return if $Config{cc} eq 'gcc'; #XXX?
  @@ -204,8 +208,8 @@
   sub ccopts {
   my($self) = @_;
   
  -my $cflags = $self-strip_lfs(ExtUtils::Embed::ccopts()) .
  -  $self-ap_ccopts;
  +my $cflags = $self-perl_ccopts . ExtUtils::Embed::perl_inc() .
  + $self-ap_ccopts;
   
   my $fixup = \{ccopts_$^O};
   if (defined $fixup) {
  
  
  
  1.11  +2 -1  modperl-2.0/lib/ModPerl/MM.pm
  
  Index: MM.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MM.pm 2001/04/11 22:46:57 1.10
  +++ MM.pm 2001/10/21 23:37:30 1.11
  @@ -63,7 +63,8 @@
   }
   }
   
  -my @opts = (INC = $inc, CCFLAGS = $build-ap_ccopts);
  +my $ccflags = $build-perl_ccopts . $build-ap_ccopts;
  +my @opts = (INC = $inc, CCFLAGS = $ccflags);
   
   my @typemaps;
   my $pwd = Cwd::fastcwd();

cvs commit: modperl-2.0/lib/ModPerl MM.pm

2001-10-21 Thread dougm 

dougm   01/10/21 16:43:42

  Modified:lib/ModPerl MM.pm
  Log:
  link apache libs against xs modules
  
  Revision  ChangesPath
  1.12  +7 -1  modperl-2.0/lib/ModPerl/MM.pm
  
  Index: MM.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- MM.pm 2001/10/21 23:37:30 1.11
  +++ MM.pm 2001/10/21 23:43:42 1.12
  @@ -63,8 +63,14 @@
   }
   }
   
  +my $libs = $build-apache_libs;
   my $ccflags = $build-perl_ccopts . $build-ap_ccopts;
  -my @opts = (INC = $inc, CCFLAGS = $ccflags);
  +
  +my @opts = (
  +INC = $inc,
  +CCFLAGS = $ccflags,
  +LIBS= $libs,
  +);
   
   my @typemaps;
   my $pwd = Cwd::fastcwd();

cvs commit: modperl-2.0/lib/ModPerl MM.pm

2001-10-21 Thread dougm 

dougm   01/10/21 17:10:13

  Modified:lib/Apache Build.pm
   lib/ModPerl MM.pm
  Log:
  add .def files to otherldflags for MakeMaker
  
  Revision  ChangesPath
  1.65  +20 -11modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- Build.pm  2001/10/21 23:37:30 1.64
  +++ Build.pm  2001/10/22 00:10:13 1.65
  @@ -748,6 +748,12 @@
   }
   }
   
  +sub export_files_MSWin32 {
  +my $self = shift;
  +map -def:$self-{cwd}/xs/modperl$_.def,
  +(, _inline, _ithreads);
  +}
  +
   sub dynamic_link_header_default {
   return 'EOF';
   $(MODPERL_LIBNAME).$(MODPERL_DLEXT): $(MODPERL_PIC_OBJS)
  @@ -768,8 +774,7 @@
   
   sub dynamic_link_MSWin32 {
   my $self = shift;
  -my @defs = map -def:$self-{cwd}/xs/modperl$_.def,
  -(, _inline, _ithreads);
  +my @defs = $self-export_files_MSWin32;
   return $self-dynamic_link_header_default .
  @defs . 'EOF';
-out:$@
  @@ -910,16 +915,20 @@
   
   sub otherldflags {
   my $self = shift;
  -my @ldflags = ();
  +my $flags = \{otherldflags_$^O};
  +return  unless defined $flags;
  +$flags-($self);
  +}
   
  -if ($^O eq 'aix') {
  -if (my $file = find_in_inc('mod_perl.exp')) {
  -push @ldflags, '-bI:' . $file;
  -}
  -my $httpdexp = $self-apxs('-q' = 'LIBEXECDIR') . '/httpd.exp';
  -push @ldflags, -bI:$httpdexp if -e $httpdexp;
  -}
  -return join(' ', @ldflags);
  +#XXX: install *.def / search @INC
  +sub otherldflags_MSWin32 {
  +my $self = shift;
  +my(@defs) = $self-export_files_MSWin32;
  +return @defs;
  +}
  +
  +sub otherldflags_aix {
  +; #XXX: -bI:*.exp files
   }
   
   sub typemaps {
  
  
  
  1.13  +1 -0  modperl-2.0/lib/ModPerl/MM.pm
  
  Index: MM.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MM.pm 2001/10/21 23:43:42 1.12
  +++ MM.pm 2001/10/22 00:10:13 1.13
  @@ -70,6 +70,7 @@
   INC = $inc,
   CCFLAGS = $ccflags,
   LIBS= $libs,
  +dynamic_lib = { OTHERLDFLAGS = $build-otherldflags },
   );
   
   my @typemaps;

cvs commit: modperl-2.0/lib/ModPerl MM.pm

2001-10-21 Thread dougm 

dougm   01/10/21 18:38:06

  Modified:lib/Apache Build.pm
   lib/ModPerl MM.pm
  Log:
  win32 .xs -  .dll's need to link against libmodperl.lib
  
  Revision  ChangesPath
  1.68  +13 -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.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- Build.pm  2001/10/22 01:34:57 1.67
  +++ Build.pm  2001/10/22 01:38:06 1.68
  @@ -801,6 +801,19 @@
   $libs-($self);
   }
   
  +sub modperl_libs_MSWin32 {
  +my $self = shift;
  +#XXX: install/use libmodperl.lib for 3rd party xs modules
  +$self-{cwd}/src/modules/perl/libmodperl.lib;
  +}
  +
  +sub modperl_libs {
  +my $self = shift;
  +my $libs = \{modperl_libs_$^O};
  +return  unless defined $libs;
  +$libs-($self);
  +}
  +
   sub write_src_makefile {
   my $self = shift;
   my $code = ModPerl::Code-new;
  
  
  
  1.14  +1 -1  modperl-2.0/lib/ModPerl/MM.pm
  
  Index: MM.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- MM.pm 2001/10/22 00:10:13 1.13
  +++ MM.pm 2001/10/22 01:38:06 1.14
  @@ -63,7 +63,7 @@
   }
   }
   
  -my $libs = $build-apache_libs;
  +my $libs = join ' ', $build-apache_libs, $build-modperl_libs;
   my $ccflags = $build-perl_ccopts . $build-ap_ccopts;
   
   my @opts = (

cvs commit: modperl-2.0/lib/ModPerl MM.pm

2001-04-11 Thread dougm 

dougm   01/04/11 15:46:58

  Modified:lib/ModPerl MM.pm
  Log:
  always link these module dynamic
  
  Revision  ChangesPath
  1.10  +1 -1  modperl-2.0/lib/ModPerl/MM.pm
  
  Index: MM.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MM.pm 2001/04/10 01:57:54 1.9
  +++ MM.pm 2001/04/11 22:46:57 1.10
  @@ -78,7 +78,7 @@
   ExtUtils::MakeMaker::WriteMakefile(@opts, @_);
   }
   
  -my %always_dynamic = map { $_, 1 } qw(Apache::Leak);
  +my %always_dynamic = map { $_, 1 } qw(ModPerl::Const Apache::Const APR::Const);
   
   sub ModPerl::MM::MY::constants {
   my $self = shift;