Attachment 'r-2.6.1.p22.patch'
Download 1 --- r-2.6.1.p22/spkg-install~ 2009-01-20 21:22:33.000000000 +1100
2 +++ r-2.6.1.p22/spkg-install 2009-03-20 05:46:02.702566714 +1100
3 @@ -21,7 +21,7 @@
4 CUR=`pwd`
5
6 # set CPPFLAGS so that Sage's readline is picked up
7 -CPPFLAGS=-I"$SAGE_LOCAL"/inlcude; export CPPFLAGS
8 +CPPFLAGS="-I$SAGE_LOCAL/include $CPPFLAGS"; export CPPFLAGS
9
10 # copy an R file that has corrected R includes, i.e. <foo.h> vs. "foo.h"
11 cp patches/sys-std.c src/src/unix/sys-std.c
12 @@ -74,8 +74,17 @@
13
14 # These flags are *critical* so that R will be built against Sage's
15 # copy of readline and ATLAS.
16 -CFLAGS="-I$SAGE_LOCAL/include -L$SAGE_LOCAL/lib/ "$CFLAGS; export CFLAGS
17 -LDFLAGS="-L$SAGE_LOCAL/lib/ "$LDFLAGS; export LDFLAGS
18 +CFLAGS="-I$SAGE_LOCAL/include -L$SAGE_LOCAL/lib/ $CFLAGS"; export CFLAGS
19 +LDFLAGS="-L$SAGE_LOCAL/lib/ $LDFLAGS"; export LDFLAGS
20
21 +# FreeBSD needs the path to libiconv to be explicitly specified. In theory,
22 +# --with-libiconv-prefix should work but configure script is broken and
23 +# ignores that path when looking for libiconv. Hard-wire via xxFLAGS.
24 +if [ `uname` = "FreeBSD" ]; then
25 + CPPFLAGS="$CPPFLAGS -I/usr/local/include"
26 + CFLAGS="$CFLAGS -I/usr/local/include"
27 + LDFLAGS="$LDFLAGS -L/usr/local/lib"
28 +fi
29 +
30 # do not build recommended packages for now, for speed.
31
Attached Files
To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.You are not allowed to attach a file to this page.