Accepting request 44156 from devel:languages:perl
checked in (request 44156) OBS-URL: https://build.opensuse.org/request/show/44156 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=42
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
5ef9d50079
commit
ce8baef190
@ -77,10 +77,7 @@ done\
|
||||
\
|
||||
# build filelist\
|
||||
for i in ${all_dir[@]}; do\
|
||||
# do not add "dir {perl_vendorlib/arch}/auto", included in perl package\
|
||||
if [ "${i}" = "auto" ]; then\
|
||||
continue\
|
||||
fi\
|
||||
# do not add "%dir %{perl_vendorarch}/auto", included in perl package\
|
||||
if [ "%{perl_vendorlib}/${i}" = "%{perl_vendorarch}/auto" ]; then\
|
||||
continue\
|
||||
else\
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- ./gv.c.orig 2010-05-13 22:01:07.000000000 +0000
|
||||
+++ ./gv.c 2010-07-28 09:57:06.000000000 +0000
|
||||
@@ -250,8 +250,16 @@ Perl_gv_init(pTHX_ GV *gv, HV *stash, co
|
||||
if (doproto) { /* Replicate part of newSUB here. */
|
||||
ENTER;
|
||||
if (has_constant) {
|
||||
+ char *name0 = NULL;
|
||||
+ if (name[len]) {
|
||||
+ /* newCONSTSUB doesn't take a len arg, so make sure w
|
||||
+ * give it a \0-terminated string */
|
||||
+ name0 = savepvn(name, len);
|
||||
+ }
|
||||
/* newCONSTSUB takes ownership of the reference from us. */
|
||||
- GvCV(gv) = newCONSTSUB(stash, name, has_constant);
|
||||
+ GvCV(gv) = newCONSTSUB(stash, (name0 ? name0 : name), has_constant);
|
||||
+ if (name0)
|
||||
+ Safefree(name0);
|
||||
/* If this reference was a copy of another, then the subroutine
|
||||
must have been "imported", by a Perl space assignment to a GV
|
||||
from a reference to CV. */
|
||||
@ -1,49 +0,0 @@
|
||||
--- ./utils/h2ph.PL.orig
|
||||
+++ ./utils/h2ph.PL
|
||||
@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
|
||||
exit $Exit;
|
||||
|
||||
sub expr {
|
||||
- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
|
||||
+ if (/\b__asm__\b/) { # freak out
|
||||
+ $new = '"(assembly code)"';
|
||||
+ return
|
||||
+ }
|
||||
my $joined_args;
|
||||
if(keys(%curargs)) {
|
||||
$joined_args = join('|', keys(%curargs));
|
||||
@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
|
||||
# parenthesized value: d=(v)
|
||||
$define{$_} = $1;
|
||||
}
|
||||
- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
|
||||
+ if (/^(\w+)\((\w)\)$/) {
|
||||
+ my($macro, $arg) = ($1, $2);
|
||||
+ my $def = $define{$_};
|
||||
+ $def =~ s/$arg/\$\{$arg\}/g;
|
||||
+ print PREAMBLE <<DEFINE;
|
||||
+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
|
||||
+
|
||||
+DEFINE
|
||||
+ } elsif
|
||||
+ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
|
||||
# float:
|
||||
print PREAMBLE
|
||||
"unless (defined &$_) { sub $_() { $1 } }\n\n";
|
||||
@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
|
||||
print PREAMBLE
|
||||
"unless (defined &$_) { sub $_() { $1 } }\n\n";
|
||||
} elsif ($define{$_} =~ /^\w+$/) {
|
||||
- print PREAMBLE
|
||||
- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
|
||||
+ my $def = $define{$_};
|
||||
+ if ($isatype{$def}) {
|
||||
+ print PREAMBLE
|
||||
+ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
|
||||
+ } else {
|
||||
+ print PREAMBLE
|
||||
+ "unless (defined &$_) { sub $_() { &$def } }\n\n";
|
||||
+ }
|
||||
} else {
|
||||
print PREAMBLE
|
||||
"unless (defined &$_) { sub $_() { \"",
|
||||
12
perl.changes
12
perl.changes
@ -1,15 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 28 11:45:46 CEST 2010 - mls@suse.de
|
||||
|
||||
- fix constant print issue [bnc#621856]
|
||||
- fix h2ph so that _h2ph_pre.ph doesn't lead to warnings
|
||||
- do not add vendorlib/auto to filelist [bnc#624628]
|
||||
|
||||
------------------------------------------------------------------
|
||||
Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
|
||||
|
||||
- use %_smp_mflags
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 18 12:59:27 CEST 2010 - mls@suse.de
|
||||
|
||||
|
||||
@ -40,8 +40,6 @@ Patch4: perl-nroff.diff
|
||||
Patch5: perl-netcmdutf8.diff
|
||||
Patch6: perl-autodie-flock.diff
|
||||
Patch7: perl-Fatal.diff
|
||||
Patch8: perl-constprint.diff
|
||||
Patch9: perl-h2ph.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: perl-base = %version
|
||||
#PreReq: %fillup_prereq
|
||||
@ -156,8 +154,6 @@ cp -p %{S:3} .
|
||||
%patch6
|
||||
%patch7
|
||||
%endif
|
||||
%patch8
|
||||
%patch9
|
||||
|
||||
%build
|
||||
cp -a lib savelib
|
||||
@ -177,7 +173,7 @@ options="$options -Duse64bitint"
|
||||
options="$options -Accflags='-DPERL_USE_SAFE_PUTENV'"
|
||||
chmod 755 ./configure.gnu
|
||||
./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm -Duseshrplib=\'true\' $options
|
||||
make %{?_smp_mflags}
|
||||
make %{?jobs:-j%jobs};
|
||||
cp -p libperl.so savelibperl.so
|
||||
cp -p lib/Config.pm saveConfig.pm
|
||||
cp -p lib/Config_heavy.pl saveConfig_heavy.pl
|
||||
@ -186,7 +182,7 @@ make clobber
|
||||
rm -rf lib
|
||||
mv savelib lib
|
||||
./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm $options
|
||||
make %{?_smp_mflags}
|
||||
make %{?jobs:-j%jobs};
|
||||
|
||||
%check
|
||||
%ifnarch %arm
|
||||
|
||||
Loading…
Reference in New Issue
Block a user