diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2005-08-18 16:43:46 +0300 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-08-18 11:10:27 +0000 |
| commit | c042ae3a74be2a1c6b85173b59f6a608815afef8 (patch) | |
| tree | 7d41e4d8fbd45136349a5fa3b278c39b8ef5160e /symbian | |
| parent | 4c3a8340729ab239a926a5263f711fc20a0e2468 (diff) | |
| download | perl-c042ae3a74be2a1c6b85173b59f6a608815afef8.tar.gz | |
5.9.x (and 5.8.x): Symbian update
Message-ID: <B356D8F434D20B40A8CEDAEC305A1F24E7A41B@esebe105.NOE.Nokia.com>
p4raw-id: //depot/perl@25304
Diffstat (limited to 'symbian')
| -rw-r--r-- | symbian/TODO | 4 | ||||
| -rw-r--r-- | symbian/config.pl | 6 | ||||
| -rw-r--r-- | symbian/config.sh | 2 | ||||
| -rw-r--r-- | symbian/install.cfg | 2 | ||||
| -rw-r--r-- | symbian/symbian_stubs.c | 4 | ||||
| -rw-r--r-- | symbian/xsbuild.pl | 6 |
6 files changed, 15 insertions, 9 deletions
diff --git a/symbian/TODO b/symbian/TODO index 78dcd24630..94726415d1 100644 --- a/symbian/TODO +++ b/symbian/TODO @@ -117,7 +117,6 @@ - libnet - Bundle::CPAN - Archive::Tar - - Compress::Zlib (zlib?) (there is builtin gz support) - Term::ReadKey (useless?) - Term::ReadLine (useless?) - Bundle::LWP @@ -128,7 +127,6 @@ - HTML::HeadParser - LWP - Crypt::SSLeay? (ssl?) - - IO::Zlib? (zlib?) - IMAP? - Net::Telnet? - Archive::Zip? @@ -136,7 +134,7 @@ - Date::Calc? - XML? XML::Simple? (expat?) (there is builtin xml support) - RSS? - - DBI + - DBI (DBD::???) - DBD::SQLite? (sqlite?) - SOAP? XML-RPC? diff --git a/symbian/config.pl b/symbian/config.pl index e2cd2c682a..ce5d926f4a 100644 --- a/symbian/config.pl +++ b/symbian/config.pl @@ -554,12 +554,12 @@ perllib.sis: \$(PM) perlext.sis: perldll_arm buildext_sis perl symbian\\makesis.pl perl${VERSION}ext -EXT = Cwd Data::Dumper Devel::Peek Digest::MD5 Errno Fcntl File::Glob Filter::Util::Call IO List::Util MIME::Base64 PerlIO::scalar PerlIO::via SDBM_File Socket Storable Time::HiRes XSLoader attrs +EXT = Compress::Zlib Cwd Data::Dumper Devel::Peek Digest::MD5 Errno Fcntl File::Glob Filter::Util::Call IO List::Util MIME::Base64 PerlIO::scalar PerlIO::via SDBM_File Socket Storable Time::HiRes XSLoader attrs -buildext: perldll symbian\\xsbuild.pl +buildext: perldll symbian\\xsbuild.pl lib\\Config.pm perl \$(XLIB) symbian\\xsbuild.pl \$(XSBOPT) \$(EXT) -buildext_sis: perldll.sis symbian\\xsbuild.pl +buildext_sis: perldll.sis symbian\\xsbuild.pl lib\\Config.pm perl \$(XLIB) symbian\\xsbuild.pl \$(XSBOPT) --sis \$(EXT) cleanext: symbian\\xsbuild.pl diff --git a/symbian/config.sh b/symbian/config.sh index dea35d5264..731dd5c45c 100644 --- a/symbian/config.sh +++ b/symbian/config.sh @@ -645,7 +645,7 @@ pm_apiversion='5.005' privlib='\\system\\libs\\perl\\x.y.z' privlibexp='\\system\\libs\\perl\\x.y.z' procselfexe='' -prototype='undef' +prototype='define' ptrsize='4' quadkind='4' quadtype='int64_t' diff --git a/symbian/install.cfg b/symbian/install.cfg index 8cc7b10b9c..3ff71e588a 100644 --- a/symbian/install.cfg +++ b/symbian/install.cfg @@ -38,6 +38,7 @@ lib FileHandle.pm lib Filter/Simple.pm lib if.pm lib integer.pm +lib IO/Zlib.pm lib lib.pm lib Net/Cmd.pm lib Net/Config.pm @@ -69,6 +70,7 @@ lib warnings/register.pm # Extensions. # ext attrs +ext Compress/Zlib -zlib-src ext Cwd ext Data/Dumper ext Devel/Peek diff --git a/symbian/symbian_stubs.c b/symbian/symbian_stubs.c index 1505698703..c997446cfd 100644 --- a/symbian/symbian_stubs.c +++ b/symbian/symbian_stubs.c @@ -43,8 +43,8 @@ void Perl_my_setenv(pTHX_ char *var, char *val) { } void Perl_my_setenv(pTHX_ const char *var, const char *val) { } #endif -bool Perl_do_exec(pTHX_ char *cmd) { return FALSE; } -bool Perl_do_exec3(pTHX_ char *cmd, int fd, int flag) { return FALSE; } +bool Perl_do_exec(pTHX_ const char *cmd) { return FALSE; } +bool Perl_do_exec3(pTHX_ const char *cmd, int fd, int flag) { return FALSE; } int Perl_do_spawn(pTHX_ char *cmd) { return symbian_do_spawn(cmd); } int Perl_do_aspawn(pTHX_ SV *really, SV** mark, SV **sp) { return symbian_do_aspawn(really, mark, sp); } diff --git a/symbian/xsbuild.pl b/symbian/xsbuild.pl index ac6c14713d..afbc9ef4e5 100644 --- a/symbian/xsbuild.pl +++ b/symbian/xsbuild.pl @@ -427,18 +427,24 @@ sub xsconfig { } } if ( my @c = glob("*.c *.cpp */*.c */*.cpp") ) { + @c = grep { ! m:^zlib-src/: } @c if $ext eq 'ext\Compress\Zlib'; for my $c (@c) { $c =~ s:/:\\:g; $src{$c}++; } } if ( my @h = glob("*.h */*.h") ) { + @h = grep { ! m:^zlib-src/: } @h if $ext eq 'ext\Compress\Zlib'; for my $h (@h) { $h =~ s:/:\\:g; $h = dirname($h); $incdir{"$dir\\$h"}++ unless $h eq "."; } } + if ( $ext eq 'ext\Compress\Zlib' ) { + system_echo("perl -pi.bak -e s:True:False: config.in") == 0 + or die "$0: changing BUILD_ZLIB failed: $!\n"; + } if ( exists $EXTCFG{$ext} ) { for my $cfg ( @{ $EXTCFG{$ext} } ) { if ( $cfg =~ /^([-+])?(.+\.(c|cpp|h))$/ ) { |