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

ocaml-camlimages: fix for giflib >=5.1 #1443

Merged
merged 2 commits into from
Jul 20, 2016

Conversation

tonytheodore
Copy link
Member

See: #1423 (comment)

Fixes the build after giflib update, but I can't get the current patch to apply with make import-patch-* or by hand with git am.

@tonytheodore
Copy link
Member Author

can't get the current patch to apply with make import-patch-*

Unrelated gsed issue #1444.

@starius
Copy link
Member

starius commented Jul 17, 2016

Unrelated issue, breaking ocaml-camlimages:

File "ximage.mli", line 24, characters 9-18:
Error: Unbound module Gdk
Makefile:706: recipe for target 'ximage.cmi' failed

git bisect prints the following:

00ac153 is the first bad commit

(00ac153 was introduced by #1424)

UPD. 00ac153 did not cause this problem.

@tonytheodore
Copy link
Member Author

Can you post the log? I don't see the issue here.

@starius
Copy link
Member

starius commented Jul 17, 2016

"fix@me" <fix@me>

I propose to replace with William <r.3@libertysurf.fr>.

@starius
Copy link
Member

starius commented Jul 17, 2016

Can you post the log? I don't see the issue here.

00ac153 did not cause this problem.

I realised what the problem was caused by me running git clean in mxe/usr.

Removed files include:

...
Removing i686-w64-mingw32.static/lib/ocaml/lablgtk2/gdk.cmi
Removing i686-w64-mingw32.static/lib/ocaml/lablgtk2/gdk.cmx
Removing i686-w64-mingw32.static/lib/ocaml/lablgtk2/gdk.o
...

The log of ocaml-camlimages: https://gist.github.com/a5c960cd2912bfed9d9d600de56a7604

@starius
Copy link
Member

starius commented Jul 17, 2016

ocaml-lablgtk2 installs file usr/i686-w64-mingw32.static/lib/ocaml/lablgtk2/.gitignore.
I think, the problem can be fixed by ignoring all .gitignore files in build-pkg.

starius added a commit to LuaAndC/mxe that referenced this pull request Jul 17, 2016
starius added a commit to LuaAndC/mxe that referenced this pull request Jul 20, 2016
starius added a commit to LuaAndC/mxe that referenced this pull request Jul 20, 2016
@starius
Copy link
Member

starius commented Jul 20, 2016

Thanks!

@starius starius merged commit fd4474b into mxe:master Jul 20, 2016
@tonytheodore tonytheodore deleted the ocaml-camlimages-giflib branch July 22, 2016 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants