Opened 8 years ago

Closed 8 years ago

Last modified 8 years ago

#11727 closed defect (fixed)

Even more minor Cygwin fixes for FLINT

Reported by: kcrisman Owned by: tbd
Priority: major Milestone: sage-4.7.2
Component: porting: Cygwin Keywords:
Cc: mhansen, dimpase, leif, jdemeyer Merged in: sage-4.7.2.alpha3
Authors: Karl-Dieter Crisman, Dmitrii Pasechnik Reviewers: Dmitrii Pasechnik, Karl-Dieter Crisman
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Description (last modified by leif)

I'm not quite sure how this happened, but apparently in newer Cygwins patch won't accept certain things.

FLINT now doesn't actually work on one of my Cygwins, even after #11547, because of an extra line that crept into one of the patches.

--- src/mpn_extras.h        2009-09-23 18:03:27.000000000 +0800
+++ patches/mpn_extras.h        2011-04-25 22:36:33.000000000 +0800
@@ -22,7 +22,6 @@
 #ifndef MPN_EXTRAS_H
 #define MPN_EXTRAS_H
 
-#include "flint.h"
 #include "ZmodF_poly.h"
 
 #include "longlong_wrapper.h"

Note the newline at the end; removing this solves the problem. I guess this didn't cause trouble on other systems, since these patches are applied universally. I can't even figure out where this change happened.

See also #9858 and #10328 for other updates to FLINT needed.


Spkg at http://sage.math.washington.edu/home/kcrisman/flint-1.5.0.p9.spkg.

Change History (17)

comment:1 Changed 8 years ago by dimpase

I suppose here hg did not see the file being opened in Unix mode, and saved in DOS mode. If I open it in vim I see

--- src/mpn_extras.h    2009-09-23 18:03:27.000000000 +0800
+++ patches/mpn_extras.h        2011-04-25 22:36:33.000000000 +0800
@@ -22,7 +22,6 @@
 #ifndef MPN_EXTRAS_H^M
 #define MPN_EXTRAS_H^M
 ^M
-#include "flint.h"^M
 #include "ZmodF_poly.h"^M
 ^M
 #include "longlong_wrapper.h"^M

these ^M are DOS LF/CR symbols. You can go over the spkg leading to this one, to track where exactly this got in. I can only say that in p6 spkg I created back in April it was still OK.

What you need to do is to save this file in Unix mode and re-package...

comment:2 follow-up: Changed 8 years ago by kini

The CR characters were introduced to this file in p7, as you can see by doing hg log -p patches/mpn_extras.h.patch in the spkg directory.

comment:3 in reply to: ↑ 2 Changed 8 years ago by dimpase

Replying to kini:

The CR characters were introduced to this file in p7, as you can see by doing hg log -p patches/mpn_extras.h.patch in the spkg directory.

in fact hg log -p mpn_extras.h.patch shows this change, done by Jeroen, so this came in p7. I cc to him. He didn't notice, apparently. The whole src/ directory is in DOS mode there...

comment:4 follow-up: Changed 8 years ago by kcrisman

Okay, see http://sage.math.washington.edu/home/kcrisman/flint-1.5.0.p9.spkg for a fix. Can someone very quickly just check that this has fixed it? (I can't see this in pico/nano.)

I think that if it works for me, and you review it, then that would be sufficient for positive review.

comment:5 Changed 8 years ago by kcrisman

  • Authors set to Karl-Dieter Crisman
  • Cc jdemeyer added
  • Status changed from new to needs_review

This fixes the problem. I don't see any crud in the spkg, either.

cc:ing Jeroen as apparently he did it as well. I'd appreciate a quick review for folks, if possible :)

comment:6 Changed 8 years ago by kcrisman

  • Description modified (diff)

comment:7 in reply to: ↑ 4 Changed 8 years ago by dimpase

Replying to kcrisman:

Okay, see http://sage.math.washington.edu/home/kcrisman/flint-1.5.0.p9.spkg for a fix. Can someone very quickly just check that this has fixed it? (I can't see this in pico/nano.)

I think that if it works for me, and you review it, then that would be sufficient for positive review.

patches/mpn_extras.h.patch is in DOS mode. As well, some files in src/are in DOS mode, too. Please convert all the files in the spkg into Unix mode. This is in fact just on-liner (assuming dos2unix installed):

flint-1.5.0.p9$ find . -type f -exec dos2unix '{}' \;

New package, with this done, at http://boxen.math.washington.edu/home/dima/packages/flint-1.5.0.p9.spkg I checked in on Linux and MacOSX only - please check on Cygwin.

comment:8 follow-up: Changed 8 years ago by kcrisman

  • Authors changed from Karl-Dieter Crisman to Karl-Dieter Crisman, Dima Pasechnik
  • Reviewers set to Dima Pasechnik

Thanks. I have no idea what is going on with this - I only use Mac for developing (don't create patches/spkgs on Cygwin) so I am very unfamiliar with all this. My editors don't show these things.

(I'll try to check this on Cygwin soon - having some problems getting new builds started post 4.7.1, something might have changed in prereq or spkg/standard/deps.)

comment:9 Changed 8 years ago by kcrisman

Okay, your version did not change SPKG.txt (maybe mine didn't either?) so I did that, and then even added a tag for the p9 (thanks, Leif!) Still at http://sage.math.washington.edu/home/kcrisman/flint-1.5.0.p9.spkg.

comment:10 in reply to: ↑ 8 Changed 8 years ago by dimpase

Replying to kcrisman:

Thanks. I have no idea what is going on with this - I only use Mac for developing (don't create patches/spkgs on Cygwin) so I am very unfamiliar with all this. My editors don't show these things.

well, on every Mac there is vim, which you can run in terminal window - and it will show you the encoding...

comment:11 Changed 8 years ago by kcrisman

  • Reviewers changed from Dima Pasechnik to Dima Pasechnik, Karl-Dieter Crisman
  • Status changed from needs_review to positive_review

This still fixes the patch problem on Cygwin, builds ok. Positive review. Thanks, Dima, for catching the precise cause of this.

comment:12 follow-ups: Changed 8 years ago by leif

How's the storm? Did all machines survive?


If you can tell me what DOS file endings are... ;) (DOS actually used ^Z to indicate the end of a text file.)

Hopefully this will be the last spkg in the FLINT 1.5.0 series, so I can finally rebase my 1.5.2 one on it.

comment:13 in reply to: ↑ 12 Changed 8 years ago by dimpase

Replying to leif:

How's the storm? Did all machines survive?


If you can tell me what DOS file endings are... ;) (DOS actually used ^Z to indicate the end of a text file.)

yeah, "line endings" meant, indeed.

comment:14 in reply to: ↑ 12 Changed 8 years ago by kcrisman

How's the storm? Did all machines survive?

Turned out to be more of a non-event here, fortunately. Elsewhere on the US East Coast, not so much.

Hopefully this will be the last spkg in the FLINT 1.5.0 series, so I can finally rebase my 1.5.2 one on it.

Yes, let's hope!

comment:15 Changed 8 years ago by leif

  • Description modified (diff)

Please don't put tabs into the ticket's description, as trac (at least our current version) doesn't properly handle these (i.e., doesn't escape them when exporting).

comment:16 Changed 8 years ago by leif

  • Merged in set to sage-4.7.2.alpha3
  • Resolution set to fixed
  • Status changed from positive_review to closed

comment:17 Changed 8 years ago by leif

  • Authors changed from Karl-Dieter Crisman, Dima Pasechnik to Karl-Dieter Crisman, Dmitrii Pasechnik
  • Reviewers changed from Dima Pasechnik, Karl-Dieter Crisman to Dmitrii Pasechnik, Karl-Dieter Crisman
Note: See TracTickets for help on using tickets.