cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 01/10/20 22:24:52
Modified:lib/Apache Build.pm
Log:
avoid use of unintialized value
Revision ChangesPath
1.60 +12 -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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- Build.pm 2001/10/21 04:47:47 1.59
+++ Build.pm 2001/10/21 05:24:52 1.60
@@ -707,6 +707,11 @@
(qw(cc cpprun rm ranlib lib_ext obj_ext cccdlflags lddlflags),
values %perl_config_pm_alias);
+sub mm_replace {
+my $val = shift;
+$$val =~ s/\(($mm_replace)\)/(MODPERL_\U$perl_config_pm_alias{$1})/g;
+}
+
sub make_tools {
my($self, $fh) = @_;
@@ -725,8 +730,13 @@
for (qw(rm_f mv ld ar)) {
my $val = $mm-{\U$_};
-$val =~ s/\(($mm_replace)\)/(MODPERL_\U$perl_config_pm_alias{$1})/g;
-print $fh $self-canon_make_attr($_ = $val || $Config{$_});
+if ($val) {
+mm_replace(\$val);
+}
+else {
+$val = $Config{$_};
+}
+print $fh $self-canon_make_attr($_ = $val);
}
}
cvs commit: modperl-2.0/lib/ModPerl WrapXS.pm
dougm 01/10/20 22:46:20
Modified:lib/ModPerl WrapXS.pm
Log:
leave certain (e.g. ithreads only) functions out of the export lists
Revision ChangesPath
1.28 +15 -1 modperl-2.0/lib/ModPerl/WrapXS.pm
Index: WrapXS.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/WrapXS.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- WrapXS.pm 2001/10/21 05:29:46 1.27
+++ WrapXS.pm 2001/10/21 05:46:20 1.28
@@ -640,6 +640,18 @@
$val\n;
}
+#C::Scan doesnt always pickup static __inline__ of mpxs_ functions
+#certain functions are only defined #ifdef USE_ITHREADS
+#XXX might need a modperl_ithreads.{def,exp} if any xs modules reference
+#these functions
+
+my $skip_exports = join '|', qw{
+mpxs_
+modperl_cmd_interp_
+modperl_interp_ modperl_list_ modperl_tipool_
+modperl_mgv_
+};
+
sub write_export_file {
my($self, $ext) = @_;
@@ -661,9 +673,11 @@
for my $entry (@$table) {
next if $self-func_is_static($entry);
+my $name = $entry-{name};
+next if $name =~ /^($skip_exports)/o;
my $fh = $self-func_is_inline($entry) ?
$exp_inline_fh : $exp_fh;
-print $fh $self-$format($entry-{name});
+print $fh $self-$format($name);
}
for my $fh ($exp_fh, $exp_inline_fh) {
cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 01/10/20 19:50:15
Modified:lib/Apache Build.pm
Log:
use more Config.pm/MakeMaker variables to make win32 happier
Revision ChangesPath
1.55 +8 -8 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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Build.pm 2001/10/20 18:59:28 1.54
+++ Build.pm 2001/10/21 02:50:15 1.55
@@ -704,7 +704,7 @@
my $mm_replace = join '|', keys %perl_config_pm_alias;
my @perl_config_pm =
- (qw(cc cpprun ld ar rm ranlib lib_ext dlext cccdlflags lddlflags),
+ (qw(cc cpprun rm ranlib lib_ext dlext obj_ext cccdlflags lddlflags),
values %perl_config_pm_alias);
sub make_tools {
@@ -723,7 +723,7 @@
my $mm = bless {}, 'MM';
$mm-init_others;
-for (qw(RM_F MV)) {
+for (qw(RM_F MV LD AR)) {
my $val = $mm-{$_};
$val =~ s/\(($mm_replace)\)/(MODPERL_\U$perl_config_pm_alias{$1})/g;
print $fh $self-canon_make_attr($_ = $val);
@@ -797,13 +797,13 @@
$(MODPERL_PIC_OBJS) $(MODPERL_LDOPTS)
$(MODPERL_RANLIB) $@
-.SUFFIXES: .xs .c .o .lo .i .s
+.SUFFIXES: .xs .c $(MODPERL_OBJ_EXT) .lo .i .s
.c.lo:
$(MODPERL_CC) $(MODPERL_CCFLAGS_SHLIB) \
- -c $ $(MODPERL_MV) $*.o $*.lo
+ -c $ $(MODPERL_MV) $*$(MODPERL_OBJ_EXT) $*.lo
-.c.o:
+.c$(MODPERL_OBJ_EXT):
$(MODPERL_CC) $(MODPERL_CCFLAGS) -c $
.c.i:
@@ -815,17 +815,17 @@
.xs.c:
$(MODPERL_XSUBPP) $*.xs $@
-.xs.o:
+.xs$(MODPERL_OBJ_EXT):
$(MODPERL_XSUBPP) $*.xs $*.c
$(MODPERL_CC) $(MODPERL_CCFLAGS) -c $*.c
.xs.lo:
$(MODPERL_XSUBPP) $*.xs $*.c
$(MODPERL_CC) $(MODPERL_CCFLAGS_SHLIB) \
- -c $*.c $(MODPERL_MV) $*.o $*.lo
+ -c $*.c $(MODPERL_MV) $*$(MODPERL_OBJ_EXT) $*.lo
clean:
- $(MODPERL_RM_F) *.a *.so *.xsc *.o *.lo *.i *.s \
+ $(MODPERL_RM_F) *.a *.so *.xsc *$(MODPERL_OBJ_EXT) *.lo *.i *.s \
$(MODPERL_CLEAN_FILES) \
$(MODPERL_XS_CLEAN_FILES)
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/20 22:48:13
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.38 +1 -43 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- FunctionTable.pm 2001/10/21 05:05:50 1.37
+++ FunctionTable.pm 2001/10/21 05:48:13 1.38
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sat Oct 20 22:13:10 2001
+# ! Sat Oct 20 22:58:03 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -2955,48 +2955,6 @@
{
'type' = 'U32',
'name' = 'hash'
- }
-]
- },
- {
-'return_type' = 'void',
-'name' = 'modperl_perl_ids_get',
-'args' = [
- {
-'type' = 'modperl_perl_ids_t *',
-'name' = 'ids'
- }
-]
- },
- {
-'return_type' = 'void',
-'name' = 'modperl_perl_init_ids',
-'args' = [
- {
-'type' = 'PerlInterpreter *',
-'name' = 'my_perl'
- },
- {
-'type' = 'modperl_perl_ids_t *',
-'name' = 'ids'
- }
-]
- },
- {
-'return_type' = 'apr_status_t',
-'name' = 'modperl_perl_init_ids_mip',
-'args' = [
- {
-'type' = 'PerlInterpreter *',
-'name' = 'my_perl'
- },
- {
-'type' = 'modperl_interp_pool_t *',
-'name' = 'mip'
- },
- {
-'type' = 'void *',
-'name' = 'data'
}
]
},
cvs commit: modperl-2.0/pod modperl_dev.pod
dougm 01/10/20 11:30:40
Modified:lib/ModPerl BuildOptions.pm
pod modperl_dev.pod
Log:
default to building mod_perl as a dso
Revision ChangesPath
1.10 +4 -1 modperl-2.0/lib/ModPerl/BuildOptions.pm
Index: BuildOptions.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/BuildOptions.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BuildOptions.pm 2001/09/08 18:00:49 1.9
+++ BuildOptions.pm 2001/10/20 18:30:39 1.10
@@ -23,6 +23,8 @@
if ($build-{MP_DEBUG} and $build-{MP_USE_GTOP}) {
$build-{MP_USE_GTOP} = 0 unless $build-find_dlfile('gtop');
}
+
+$build-{MP_USE_DSO} = 1 unless $build-{MP_USE_STATIC};
}
sub parse {
@@ -151,7 +153,8 @@
MAINTAINER Maintainer mode: DEBUG=1 -DAP_DEBUG -Wall ...
CCOPTS Add to compiler flags
TRACETurn on tracing
-USE_DSO Build mod_perl as a dso
+USE_DSO Build mod_perl as a dso
+USE_STATIC Build mod_perl static
INST_APACHE2 Install *.pm relative to Apache2/ directory
PROMPT_DEFAULT Accept default value for all would-be prompts
OPTIONS_FILE Read options from given file
1.43 +6 -2 modperl-2.0/pod/modperl_dev.pod
Index: modperl_dev.pod
===
RCS file: /home/cvs/modperl-2.0/pod/modperl_dev.pod,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- modperl_dev.pod 2001/10/19 02:17:10 1.42
+++ modperl_dev.pod 2001/10/20 18:30:40 1.43
@@ -66,7 +66,7 @@
=head2 Create the build environment
% cd modperl-2.0
- % perl Makefile.PL MP_GENERATE_XS=1 MP_USE_DSO=1 \
+ % perl Makefile.PL MP_GENERATE_XS=1 \
MP_APXS=$apache_prefix/bin/apxs make
Ioptions an optional list of (key,value) pairs.
@@ -85,7 +85,11 @@
=item MP_USE_DSO
-Build mod_perl as a DSO
+Build mod_perl as a DSO (default)
+
+=item MP_USE_STATIC
+
+Build mod_perl static
=item MP_STATIC_EXTS
