Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't override LDFLAGS in m4rie #29597

Closed
isuruf opened this issue Apr 27, 2020 · 21 comments
Closed

Don't override LDFLAGS in m4rie #29597

isuruf opened this issue Apr 27, 2020 · 21 comments

Comments

@isuruf
Copy link
Member

isuruf commented Apr 27, 2020

https://bitbucket.org/malb/m4rie/pull-requests/4/do-not-interfere-with-ldflags-while

Upstream: Fixed upstream, but not in a stable release.

CC: @mkoeppe

Component: packages: standard

Author: Isuru Fernando

Branch/Commit: cebd333

Reviewer: Matthias Koeppe

Issue created by migration from https://trac.sagemath.org/ticket/29597

@isuruf isuruf added this to the sage-9.1 milestone Apr 27, 2020
@mkoeppe
Copy link
Member

mkoeppe commented Apr 27, 2020

comment:2

This one won't work as is - need to patch Makefile.in as well

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Apr 27, 2020

Branch pushed to git repo; I updated commit sha1. New commits:

64dc437Fix m4rie's tests/Makefile.in

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Apr 27, 2020

Changed commit from 1fb29e6 to 64dc437

@mkoeppe
Copy link
Member

mkoeppe commented Apr 27, 2020

comment:4

Thanks!

@mkoeppe
Copy link
Member

mkoeppe commented Apr 27, 2020

Reviewer: Matthias Koeppe

@mkoeppe
Copy link
Member

mkoeppe commented Apr 27, 2020

comment:6

This seems to break other platforms - https://github.com/mkoeppe/sage/actions/runs/88768093

@isuruf
Copy link
Member Author

isuruf commented Apr 27, 2020

comment:7

Looks like the patch failed to apply

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Apr 27, 2020

Changed commit from 64dc437 to cc0453b

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Apr 27, 2020

Branch pushed to git repo; I updated commit sha1. New commits:

cc0453bUpdate patch for m4rie

@mkoeppe
Copy link
Member

mkoeppe commented Apr 27, 2020

comment:10

Let me try

@mkoeppe
Copy link
Member

mkoeppe commented Apr 27, 2020

comment:11

Hm... doesn't the release that we use already have this patch in?

@mkoeppe
Copy link
Member

mkoeppe commented Apr 27, 2020

comment:12

https://github.com/mkoeppe/sage/runs/623414296

m4rie-20200115
====================================================
Setting up build directory for m4rie-20200115
Finished extraction
Applying patches from ../patches...
Applying ../patches/use_AM_LDLFAGS.patch
patching file Makefile.am
Hunk #1 FAILED at 2.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej
patching file Makefile.in
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file Makefile.in.rej
Error applying '../patches/use_AM_LDLFAGS.patch'
************************************************************************

@mkoeppe mkoeppe removed this from the sage-9.1 milestone Apr 28, 2020
@mkoeppe
Copy link
Member

mkoeppe commented Apr 28, 2020

comment:14

Something indeed needs fixing

@mkoeppe
Copy link
Member

mkoeppe commented Apr 28, 2020

Changed branch from u/isuruf/m4rie_ldflags to u/mkoeppe/m4rie_ldflags

@mkoeppe
Copy link
Member

mkoeppe commented Apr 28, 2020

Changed branch from u/mkoeppe/m4rie_ldflags to u/isuruf/m4rie_ldflags

@mkoeppe
Copy link
Member

mkoeppe commented Apr 28, 2020

comment:16

Squashed

@mkoeppe mkoeppe added this to the sage-9.1 milestone Apr 28, 2020
@mkoeppe
Copy link
Member

mkoeppe commented Apr 28, 2020

Changed branch from u/isuruf/m4rie_ldflags to u/mkoeppe/m4rie_ldflags

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Apr 28, 2020

Branch pushed to git repo; I updated commit sha1. New commits:

cebd333Fixup m4rie patch

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Apr 28, 2020

Changed commit from cc0453b to cebd333

@mkoeppe
Copy link
Member

mkoeppe commented Apr 28, 2020

comment:20

OK now it works!

@vbraun
Copy link
Member

vbraun commented May 4, 2020

Changed branch from u/mkoeppe/m4rie_ldflags to cebd333

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants