In fact, the problem already occurs in the mpir-exp branch. So this must be the result of a merge conflict from trunk to mpir-exp.
Bill. On 28 July 2012 00:50, Bill Hart <goodwillh...@googlemail.com> wrote: > Unfortunately the merge doesn't seem to have gone without issue. When > I try to build on linux now it configures ok, but I get the following > when it tries to link the mpn archive during the build: > > mpn/.libs/preinv_divrem_1.o: In function `__gmpn_preinv_divrem_1': > preinv_divrem_1.c:(.text+0x0): multiple definition of `__gmpn_preinv_divrem_1' > mpn/.libs/divrem_euclidean_qr_1.o:divrem_euclidean_qr_1.as:(.text+0x0): > first defined here > mpn/.libs/addmul_2.o: In function `mpn_addmul_2': > addmul_2.as:(.text+0x0): multiple definition of `__gmpn_addmul_2' > mpn/.libs/redc_2.o:redc_2.c:(.text+0x0): first defined here > collect2: ld returned 1 exit status > make[2]: *** [libmpir.la] Error 1 > make[2]: Leaving directory `/home/wbhart/mpir-new' > make[1]: *** [all-recursive] Error 1 > make[1]: Leaving directory `/home/wbhart/mpir-new' > make: *** [all] Error 2 > > There's no obvious reason for this, other than non-commuting patches > which have maybe screwed up a makefile or something. I'll try running > autoconf and automake again and see if it sorts itself out. > > Bill. > > On 27 July 2012 14:34, Brian Gladman <b...@gladman.plus.com> wrote: >> -----Original Message----- From: Brian Gladman >> Sent: Friday, July 27, 2012 11:39 AM >> >> To: mpir-devel@googlegroups.com >> Subject: Re: [mpir-devel] Re: MPIR 2.6 release progress >> >> -----Original Message----- From: Bill Hart >> Sent: Thursday, July 26, 2012 10:40 PM >> To: mpir-devel@googlegroups.com >> Subject: Re: [mpir-devel] Re: MPIR 2.6 release progress >> >> Doing things manually risks overwriting changes that have been made in >> trunk and may be error prone. We'd also lose the original commit data. >> >> I don't like the idea of doing it without a proper merge. >> >> ================================= >> I have done the merge from trunk into the mpir-exp branch and all is well on >> Windows. >> >> Most of the stuff that SVN reported was spurious as far as I can see. >> >> But we now have a potentially nasty problem - in testing the merge from >> MPIR-EXP into trunk, I get the message: >> >> Error: Querying mergeinfo requires version 3 of the FSFS filesystem schema; >> filesystem >> Error: '/home/mpir/svn_repos/mpir/db' uses only version 2 >> >> On googling, I find that solving this problem seems to require a Subversion >> upgrade on the server followed by a repository dump and reload. >> >> If we cannot organise this upgrade (which I assume won't be easy or quick >> since there are likely to be many SVN users impacted by it), we will have to >> revert to adding the changes in MPIR-EXP to the trunk manually as I >> suggested yesterday. >> >> What is your view on this Bill? >> >> ==================================== >> I have now figured out how to the merge without mergeinfo and I have merged >> the mpir-exp branch into the trunk. >> >> The Windows Visual Studio builds are working so I would much appreciate it >> if Case can look at the Windows command line build and Bill can look at the >> *nix builds to see if anything needs doing. >> >> >> Brian >> >> -- >> You received this message because you are subscribed to the Google Groups >> "mpir-devel" group. >> To post to this group, send email to mpir-devel@googlegroups.com. >> To unsubscribe from this group, send email to >> mpir-devel+unsubscr...@googlegroups.com. >> For more options, visit this group at >> http://groups.google.com/group/mpir-devel?hl=en. >> -- You received this message because you are subscribed to the Google Groups "mpir-devel" group. To post to this group, send email to mpir-devel@googlegroups.com. To unsubscribe from this group, send email to mpir-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/mpir-devel?hl=en.
