Commit 09c5c79c authored by Carsten Munk's avatar Carsten Munk

Stop perl from rebuilding endlessly, again

Signed-off-by: default avatarCarsten Munk <carsten.munk@jollamobile.com>
parent ff3f6093
diff -ru perl-5.12.1/config_h.SH perl-5.12.1-norebuilds/config_h.SH
--- perl-5.12.1/config_h.SH 2010-05-14 00:01:07.000000000 +0200
+++ perl-5.12.1-norebuilds/config_h.SH 2013-03-01 17:05:22.845608318 +0100
@@ -968,7 +968,7 @@
* feature tests from Configure are generally more reliable.
*/
#define OSNAME "$osname" /**/
-#define OSVERS "$osvers" /**/
+#define OSVERS "3.0" /**/
/* ARCHLIB:
* This variable, if defined, holds the name of the directory in
diff -ru perl-5.12.1/cpan/Devel-PPPort/parts/ppptools.pl perl-5.12.1-norebuilds/cpan/Devel-PPPort/parts/ppptools.pl
--- perl-5.12.1/cpan/Devel-PPPort/parts/ppptools.pl 2010-04-26 10:08:29.000000000 +0200
+++ perl-5.12.1-norebuilds/cpan/Devel-PPPort/parts/ppptools.pl 2013-03-01 17:09:01.134007016 +0100
@@ -31,7 +31,7 @@
local *DIR;
opendir DIR, $dir or die "cannot open directory $dir: $!\n";
- my @files = grep { !-d && !/^\./ } readdir DIR; # no dirs or hidden files
+ my @files = sort grep { !-d && !/^\./ } readdir DIR; # no dirs or hidden files
closedir DIR;
return map { cat_file($dir, $_) } @files;
* Fri Mar 01 2013 Carsten Munk <carsten.munk@jollamobile.com> - 5.12.1
- Stop perl from rebuilding constantly, again.
* Tue Jan 22 2013 Oleg Girko <ol+mer@infoserver.ru> - 5.12.1
- Use newly built perl instead of installed one to edit patchlevel.h.
......
......@@ -54,6 +54,8 @@ Patch7: perl-5.10.0-x86_64-io-test-failure.patch
Patch8: perl-5.12.1-notimestamps.patch
Patch9: perl-5.12.1-norebuilds.patch
BuildRoot: %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gdbm-devel, db4-devel, zlib-devel
BuildRequires: groff
......@@ -683,7 +685,7 @@ upstream tarball from perl.org.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
#
# Candidates for doc recoding (need case by case review):
# find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'
......@@ -782,6 +784,8 @@ make %{?_smp_mflags}
%install
ORIG=$PWD
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
......@@ -856,6 +860,8 @@ cd $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/
%ifarch %{multilib_64_archs}
%{new_perl} -x patchlevel.h 'Fedora Patch3: support for libdir64'
%endif
cd $ORIG
rm -rf $RPM_BUILD_ROOT/*.0
%clean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment