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

Add a patch to fix libxml2.la's path #1953

Merged

Conversation

@nurse
Copy link
Contributor

@nurse nurse commented Dec 3, 2019

fix #1941

BSD make seemds to need the prefix correctly.

@nurse nurse mentioned this pull request Dec 3, 2019
@codeclimate
Copy link

@codeclimate codeclimate bot commented Dec 3, 2019

Code Climate has analyzed commit 7cfb784 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (80% is the threshold).

This pull request will bring the total coverage in the repository to 46.3% (0.0% change).

View more on Code Climate.

@flavorjones flavorjones added this to the v1.10.x patch releases milestone Dec 3, 2019
@flavorjones flavorjones merged commit 7231602 into sparklemotion:master Dec 3, 2019
5 checks passed
5 checks passed
@github-actions
latest
Details
codeclimate All good!
Details
codeclimate/diff-coverage 100% (80% threshold)
Details
codeclimate/total-coverage 46% (0.0% change)
Details
@nokobot
concourse-ci/status Concourse CI build success
Details
@flavorjones
Copy link
Member

@flavorjones flavorjones commented Dec 4, 2019

Thank you! Merged and shipped in v1.10.6 just now.

@nurse nurse deleted the nurse:libxml2.la-is-in-top_builddir branch Dec 4, 2019
flavorjones added a commit that referenced this pull request Dec 4, 2019
flavorjones added a commit that referenced this pull request Dec 4, 2019
@franzliedke
Copy link

@franzliedke franzliedke commented Dec 4, 2019

This unfortunately breaks gem installation on my machine:

Running patch with
/builds/gitlab/vendor/ruby/2.6.0/gems/nokogiri-1.10.6/patches/libxml2/0004-libxml2.la-is-in-top_builddir.patch...
ERROR, review
'/builds/gitlab/vendor/ruby/2.6.0/gems/nokogiri-1.10.6/ext/nokogiri/tmp/x86_64-pc-linux-gnu/ports/libxml2/2.9.10/patch.log'
to see what happened. Last lines are:
========================================================================
patching file HTMLtree.c
Hunk #1 succeeded at 706 (offset -11 lines).
patching file entities.c
patching file entities.c
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- Makefile.in.orig	2019-12-04 06:31:23.930568000 +0900
|+++ Makefile.in	2019-12-04 06:31:26.838389000 +0900
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
========================================================================
*** extconf.rb failed ***
@franzliedke
Copy link

@franzliedke franzliedke commented Dec 4, 2019

Ah, already reported and fixed in #1954, sorry.

@flavorjones
Copy link
Member

@flavorjones flavorjones commented Dec 4, 2019

Yes - v1.10.7 should fix this. Sorry for the hassle!

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

Successfully merging this pull request may close these issues.

3 participants