From owner-freebsd-ports@FreeBSD.ORG Thu Jan 30 20:05:58 2014 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C8CD49C8 for ; Thu, 30 Jan 2014 20:05:58 +0000 (UTC) Received: from mst-rip5-missouri-out.um.umsystem.edu (mst-rip5-missouri-out.um.umsystem.edu [198.209.50.135]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 767BB10C5 for ; Thu, 30 Jan 2014 20:05:58 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AigFAMyv6lLPoJ7S/2dsb2JhbABZDoJ+OFe9JIEMFnSCJQEBAQR5EAIBCA4KCSUPAiElAgQBDAEHAQGIAcNtiD8Xjk8zB4Q4BIkRoTaCbj+CKg X-IPAS-Result: AigFAMyv6lLPoJ7S/2dsb2JhbABZDoJ+OFe9JIEMFnSCJQEBAQR5EAIBCA4KCSUPAiElAgQBDAEHAQGIAcNtiD8Xjk8zB4Q4BIkRoTaCbj+CKg Received: from um-ncas5.um.umsystem.edu ([207.160.158.210]) by mst-rip5-exch-relay.um.umsystem.edu with ESMTP; 30 Jan 2014 14:05:56 -0600 Received: from UM-MBX-N02.um.umsystem.edu ([169.254.5.41]) by UM-NCAS5.um.umsystem.edu ([207.160.158.210]) with mapi id 14.03.0174.001; Thu, 30 Jan 2014 14:05:56 -0600 From: "Montgomery-Smith, Stephen" To: Daniel Smith , Ajtim Subject: Re: Sage update Thread-Topic: Sage update Thread-Index: AQHPHVa0fIyQoDOuwUKjHLdt+PT80pqc3m0AgABEeACAAGZSgIAAWwmAgAAzA4A= Date: Thu, 30 Jan 2014 20:05:56 +0000 Message-ID: <52EAB0A1.40406@missouri.edu> References: <52E9A43A.7010006@missouri.edu> <52E9AA34.9060909@missouri.edu> <52E9E3A4.2030204@missouri.edu> <4471471.Cm1jn2sjEU@lumiwa.farms.net> <20140130170318.GB455@Cruxis> In-Reply-To: <20140130170318.GB455@Cruxis> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 x-originating-ip: [207.160.158.205] Content-Type: text/plain; charset="iso-8859-1" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: Jouko Lumij?rvi , Greg Rivers , Kostas Oikonomou , FreeBSD Ports , "GeorgSWeber@googlemail.com" 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 20:05:58 -0000 On 01/30/2014 11:03 AM, Daniel Smith wrote: > I also tried rebuilding it and got the same error that Mitja saw. >=20 > 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=3Dyes 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 >=20 > sage-6.0/build/pkgs/mpir/patches/configure.patch >=20 > There are lines that read >=20 > -freebsd1.*) > +freebsd1*) >=20 > 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 >=20 > I'm not entirely sure how >=20 > math/sage/files/patch-build_pkgs_mpir_patches_configure.patch >=20 > was generated, but it looks to me like a couple of the diffs in there > had newer files as their first argument, e.g., >=20 > +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=3DLD_LIBRARY_PATH > + ;; > +=20 > +-freebsd1.*) > ++freebsd1*) > ... >=20 > So I think the situation could be fixed by just changing the command > around (the above was generated by >=20 > diff -ur src/aclocal.m4 b/aclocal.m4 >=20 > so instead just take the output of >=20 > diff -ur b/aclocal.m4 src/aclocal.m4 >=20 > and put the patch-build_pkgs_mpir_patches_configure.patch back together > with that output, instead of what the first command generated). >=20 > At least, that's what I'm guessing is going on. I hope my explanation > was clear enough. >=20 > Thanks! >=20 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.=