From owner-freebsd-ports@FreeBSD.ORG Thu Jan 30 23:32:54 2014 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0A54B8EC for ; Thu, 30 Jan 2014 23:32:54 +0000 (UTC) Received: from mail-qa0-x22b.google.com (mail-qa0-x22b.google.com [IPv6:2607:f8b0:400d:c00::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B6A7611D2 for ; Thu, 30 Jan 2014 23:32:53 +0000 (UTC) Received: by mail-qa0-f43.google.com with SMTP id o15so5345548qap.2 for ; Thu, 30 Jan 2014 15:32:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:user-agent:in-reply-to :references:mime-version:content-transfer-encoding:content-type; bh=yTT85IUsQqdWw7AA3HYvwBeebBLO/HyRsNQ0unHfWsM=; b=SDOlHG9AGVEyXra4CM41irPXjM17WLM8qmRFwBiDVjp0aVh4DX60Bxc/iCKltRm2OH SMttSnzs4RVuyv9BsSwCdF6nI+6YxSx3lnLDSidW0VCdJiNsK8iTBnollQvh87Da4mWA QD7A9e/nfgIuO+KiVtFW0xA4Ey6ETst7Vyowk5fbuqEVN6iw17v6ErO97lw7yF96mH4T vvEJ65gCRaaPR6ipJqgBea8B74bCpBaSpLssrmyGXaCEiM5Aqj/sM8Nx7isVQt36Pmj2 nToRcg5zntXOyY2tTssw1PO2jwFMBuj21AcNwNUyV1sJvOz57XvtgqJoPOSbmOIC8TZB g8yw== X-Received: by 10.140.34.207 with SMTP id l73mr25324480qgl.85.1391124772873; Thu, 30 Jan 2014 15:32:52 -0800 (PST) Received: from lumiwa.farms.net ([71.241.213.42]) by mx.google.com with ESMTPSA id z1sm21573063qaz.18.2014.01.30.15.32.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jan 2014 15:32:52 -0800 (PST) From: Ajtim To: "Montgomery-Smith, Stephen" Subject: Re: Sage update Date: Thu, 30 Jan 2014 18:32:42 -0500 Message-ID: <1553213.GzHzlxkLv3@lumiwa.farms.net> User-Agent: KMail/4.11.4 (FreeBSD/10.0-RELEASE; KDE/4.11.4; amd64; ; ) In-Reply-To: <52EAB0A1.40406@missouri.edu> References: <52E9A43A.7010006@missouri.edu> <20140130170318.GB455@Cruxis> <52EAB0A1.40406@missouri.edu> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Cc: Greg Rivers , Jouko Lumij?rvi , FreeBSD Ports , "GeorgSWeber@googlemail.com" , Kostas Oikonomou , Daniel Smith X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jan 2014 23:32:54 -0000 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