tags 581237 patch
thanks

Hello,

On trečiadienis 12 Gegužė 2010 01:56:35 Dirk Eddelbuettel wrote:
> it would seem that we can indeed lift this.  Could you try a built on armel
> with this restriction in debian/rules?

Yeah, I tried it last night. I got expected results with the patch 
bug581237_system_lapack.diff applied:

$ dpkg-deb -c r-base-core_2.11.0-2_armel.deb | grep /usr/lib/R/lib/
drwxr-xr-x root/root         0 2010-05-12 06:31 ./usr/lib/R/lib/
-rw-r--r-- root/root   3473984 2010-05-12 06:31 ./usr/lib/R/lib/libR.so

Then I noticed that R built with -O0 -g0! In my opinion, that's really harsh 
for such a computationally intensive application like R (that's as far as I 
can tell from the description, I have no experience with R).

So then I tried to build with bug581237_system_lapack_and_opt.diff applied (R 
got build with -O3 -g) and, voila, it succeeded as well. I think armel buildds 
are fast enough to handle those optimization flags nowadays. What is more, 
obviously, my original bug was fixed too:

$ dpkg-deb -c r-base-core_2.11.0-2_armel.deb | grep /usr/lib/R/lib/
drwxr-xr-x root/root         0 2010-05-12 09:05 ./usr/lib/R/lib/
-rw-r--r-- root/root   2864348 2010-05-12 09:05 ./usr/lib/R/lib/libR.so

So feel free to upload with either of these patches applied. It would be great 
if you did it soon to unblock kdeedu ASAP.

I may also do a "NMU with maintainer permission" if you want me to. Just tell 
me which patch and changeset of the attached diffs you prefer. I may also 
replace removals from debian/rules with commenting out as you seem to do for 
other similar changes in debian/rules (if you wish).

-- 
Modestas Vainius <modes...@vainius.eu>
diff -u r-base-2.11.0.o/debian/changelog r-base-2.11.0/debian/changelog
--- r-base-2.11.0.o/debian/changelog	2010-05-12 00:51:30.000000000 +0000
+++ r-base-2.11.0/debian/changelog	2010-05-12 00:54:53.000000000 +0000
@@ -1,3 +1,9 @@
+r-base (2.11.0-2) UNRELEASED; urgency=low
+
+  * Build with system blas and lapack on armel (Closes: #581237).
+
+ -- Modestas Vainius <mo...@debian.org>  Wed, 12 May 2010 00:53:00 +0000
+
 r-base (2.11.0-1) unstable; urgency=low
 
   * New upstream version released this morning
@@ -2396,4 +2402,4 @@
   * Initial release
 
  -- Douglas Bates <ba...@stat.wisc.edu>  Tue, 23 Dec 1997 10:01:21 -0600
-  
\ No newline at end of file
+  
diff -u r-base-2.11.0.o/debian/rules r-base-2.11.0/debian/rules
--- r-base-2.11.0.o/debian/rules	2010-05-12 00:51:30.000000000 +0000
+++ r-base-2.11.0/debian/rules	2010-05-12 00:54:45.000000000 +0000
@@ -88,11 +88,6 @@
 #compilerflags	= -O1
 #endif
 
-# edd 14 Nov 2003  turn blas off on arm
-ifeq ($(arch),arm)
-atlas		= --without-blas
-endif
-
 ## edd 09 Nov 2001  ia64 needs gcc-3.0, hppa gets it by default
 #ifeq ($(arch),ia64)
 #fortrancompiler = F77=g77-3.0
Common subdirectories: r-base-2.11.0.o/debian/unused and r-base-2.11.0/debian/unused
diff -u r-base-2.11.0.o/debian/changelog r-base-2.11.0.opt/debian/changelog
--- r-base-2.11.0.o/debian/changelog	2010-05-12 00:51:30.000000000 +0000
+++ r-base-2.11.0.opt/debian/changelog	2010-05-12 01:51:07.000000000 +0000
@@ -1,3 +1,10 @@
+r-base (2.11.0-2) UNRELEASED; urgency=low
+
+  * Build with system blas and lapack on armel (Closes: #581237).
+  * Enable optimizations and debugging symbols for default builds on armel.
+
+ -- Modestas Vainius <mo...@debian.org>  Wed, 12 May 2010 01:47:48 +0000
+
 r-base (2.11.0-1) unstable; urgency=low
 
   * New upstream version released this morning
@@ -2396,4 +2403,4 @@
   * Initial release
 
  -- Douglas Bates <ba...@stat.wisc.edu>  Tue, 23 Dec 1997 10:01:21 -0600
-  
\ No newline at end of file
+  
diff -u r-base-2.11.0.o/debian/rules r-base-2.11.0.opt/debian/rules
--- r-base-2.11.0.o/debian/rules	2010-05-12 00:51:30.000000000 +0000
+++ r-base-2.11.0.opt/debian/rules	2010-05-12 01:50:37.000000000 +0000
@@ -88,11 +88,6 @@
 #compilerflags	= -O1
 #endif
 
-# edd 14 Nov 2003  turn blas off on arm
-ifeq ($(arch),arm)
-atlas		= --without-blas
-endif
-
 ## edd 09 Nov 2001  ia64 needs gcc-3.0, hppa gets it by default
 #ifeq ($(arch),ia64)
 #fortrancompiler = F77=g77-3.0
@@ -106,13 +101,6 @@
 optimflags	= -O2 -ffunction-sections 
 endif
 
-## edd 20 Jun 2002	no optimisation or debugging on baby systems
-## edd 02 Jun 2003	use this on arm only 
-#ifneq "$(findstring $(arch), m68k arm)" ""
-ifneq "$(findstring $(arch), arm)" ""
-optimflags	= -O0 -g0 
-endif
-
 ## edd 04 Apr 2009	Alpha dies on deriv.c, trying will less optimisation
 ## edd 16 Apr 2009      commented-out as Kurt Roeckx applied a gcc patch
 #ifeq ($(arch),alpha)
Common subdirectories: r-base-2.11.0.o/debian/unused and r-base-2.11.0.opt/debian/unused

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to