Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Jan 2014 18:32:42 -0500
From:      Ajtim <lumiwa@gmail.com>
To:        "Montgomery-Smith, Stephen" <stephen@missouri.edu>
Cc:        Greg Rivers <gcr+freebsd-ports@tharned.org>, Jouko Lumij?rvi <jlumijar@sun3.oulu.fi>, FreeBSD Ports <freebsd-ports@freebsd.org>, "GeorgSWeber@googlemail.com" <GeorgSWeber@googlemail.com>, Kostas Oikonomou <k.oikonomou@att.net>, Daniel Smith <des006@ucsd.edu>
Subject:   Re: Sage update
Message-ID:  <1553213.GzHzlxkLv3@lumiwa.farms.net>
In-Reply-To: <52EAB0A1.40406@missouri.edu>
References:  <52E9A43A.7010006@missouri.edu> <20140130170318.GB455@Cruxis> <52EAB0A1.40406@missouri.edu>

next in thread | previous in thread | raw e-mail | index | archive | help
On Thursday 30 January 2014 20:05:56 Montgomery-Smith, Stephen wrote:
> On 01/30/2014 11:03 AM, Daniel Smith wrote:
> > I also tried rebuilding it and got the same error that Mitja saw.
> > 
> > I think the issue may be that the patches (for dealing with the
> > freebsd1* vs freebsd1.*) aren't getting properly applied. I set
> > SAGE_KEEP_BUILT_SPKS=yes before trying to build, and when I looked at
> > the build dir for the mpir-spkg, it looks like the configure.patch file
> > had the patches reversed. That is, in the file
> > 
> > sage-6.0/build/pkgs/mpir/patches/configure.patch
> > 
> > There are lines that read
> > 
> > -freebsd1.*)
> > +freebsd1*)
> > 
> > The result, I think, is that patch believes the freebsd1.* lines, which
> > are the ones we want, are the "old" values, hence the mpir configure
> > script continues to act as if it were building on FreeBSD-1.x
> > 
> > I'm not entirely sure how
> > 
> > math/sage/files/patch-build_pkgs_mpir_patches_configure.patch
> > 
> > was generated, but it looks to me like a couple of the diffs in there
> > had newer files as their first argument, e.g.,
> > 
> > +diff -ur src/aclocal.m4 b/aclocal.m4
> > +--- src/aclocal.m4     2014-01-29 21:06:09.000000000 +0000
> > ++++ b/aclocal.m4       2012-10-03 20:07:32.000000000 +0000
> > +@@ -2421,7 +2421,7 @@
> > +   shlibpath_var=LD_LIBRARY_PATH
> > +   ;;
> > + 
> > +-freebsd1.*)
> > ++freebsd1*)
> > ...
> > 
> > So I think the situation could be fixed by just changing the command
> > around (the above was generated by
> > 
> > diff -ur src/aclocal.m4 b/aclocal.m4
> > 
> > so instead just take the output of
> > 
> > diff -ur b/aclocal.m4 src/aclocal.m4
> > 
> > and put the patch-build_pkgs_mpir_patches_configure.patch back together
> > with that output, instead of what the first command generated).
> > 
> > At least, that's what I'm guessing is going on. I hope my explanation
> > was clear enough.
> > 
> > Thanks!
> > 
> 
> 
> It looks like Daniel found the error.  I have created a new patch, and
> just committed it.
> 
> Let me explain where it comes from.  I have added some code to sage,
> which is in patch-src_bin_sage-spkg, which modified the configure files
> to make them FreeBSD-10 friendly.  I took this code from bsd.port.mk.
> 
> But in sages version of mpir, there is a patch in
> work/sage-6.0/build/pkgs/mpir/patches called configure.patch, which
> after applying the changes to configure, no longer applies cleanly.
> 
> So what I did is this.  I untarred two copies of
> work/sage-6.0/upstream/mpir-2.6.0.tar.bz2.  I renamed one directory to
> src, and the other to b.
> 
> I patched b with configure.patch.  I then applied the script from
> patch-src_bin_sage-spkg to both these directories.  I erased the *.orig
> files in b.  I then did "diff -ur src b" to create a new copy of
> configure.patch.  I then did "diff -u" between the old copy of
> configure.patch and the new copy, putting it into
> patch-build_pkgs_mpir_patches_configure.patch.  I touched up the first
> two lines of the patch-build_pkgs_mpir_patches_configure.patch to get
> the path names right, and put this into files.
> 
> This is what I meant to do previously, but obviously I made an error
> somewhere in the process.

I am not lucky:
Now installing the Maxima library as '/usr/ports/math/sage/work/sage-6.0/local/lib/ecl//maxima.fas'...
New ASDF encountered

real    6m29.758s
user    5m28.766s
sys     0m28.508s
Successfully installed maxima-5.29.1.p4
Deleting temporary build directory
/usr/ports/math/sage/work/sage-6.0/local/var/tmp/sage/build/maxima-5.29.1.p4
Finished installing maxima-5.29.1.p4.spkg
make[4]: Leaving directory `/usr/ports/math/sage/work/sage-6.0/build'
make[3]: *** [all] Error 2
make[3]: Leaving directory `/usr/ports/math/sage/work/sage-6.0/build'

real    18m28.872s
user    94m55.810s
sys     7m31.317s
***************************************************************
Error building Sage.

The following package(s) may have failed to build:

package: r-3.0.2.p0
log file: /usr/ports/math/sage/work/sage-6.0/logs/pkgs/r-3.0.2.p0.log
build directory: /usr/ports/math/sage/work/sage-6.0/local/var/tmp/sage/build/r-3.0.2.p0

The build directory may contain configuration files and other potentially
helpful information. WARNING: if you now run 'make' again, the build
directory will, by default, be deleted. Set the environment variable
SAGE_KEEP_BUILT_SPKGS to 'yes' to prevent this.

gmake[2]: *** [build] Error 1
gmake[2]: Leaving directory `/usr/ports/math/sage/work/sage-6.0'
===> Compilation failed unexpectedly.
Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to
the maintainer.
*** Error code 1

Stop.
make[1]: stopped in /usr/ports/math/sage
*** Error code 1

Stop.
make: stopped in /usr/ports/math/sage


-- 
Mitja
-------
http://www.redbubble.com/people/lumiwa




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1553213.GzHzlxkLv3>