Skip to content

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

Merged
flavorjones merged 1 commit into
sparklemotion:masterfrom
nurse:libxml2.la-is-in-top_builddir
Dec 3, 2019
Merged

Add a patch to fix libxml2.la's path#1953
flavorjones merged 1 commit into
sparklemotion:masterfrom
nurse:libxml2.la-is-in-top_builddir

Conversation

@nurse

@nurse nurse commented Dec 3, 2019

Copy link
Copy Markdown
Contributor

fix #1941

BSD make seemds to need the prefix correctly.

@nurse nurse mentioned this pull request Dec 3, 2019
Closed
@qlty-cloud-legacy

qlty-cloud-legacy Bot commented Dec 3, 2019

Copy link
Copy Markdown

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
@flavorjones

flavorjones commented Dec 4, 2019

Copy link
Copy Markdown
Member

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

@nurse
nurse deleted the libxml2.la-is-in-top_builddir branch December 4, 2019 06:36
flavorjones added a commit that referenced this pull request Dec 4, 2019
@flavorjones
Fix the patch from #1953 to work with both git and patch
80e67ef 
Closes #1954
flavorjones added a commit that referenced this pull request Dec 4, 2019
@flavorjones
Fix the patch from #1953 to work with both git and patch
56c4db2 
Closes #1954
@franzliedke

franzliedke commented Dec 4, 2019

Copy link
Copy Markdown

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

franzliedke commented Dec 4, 2019

Copy link
Copy Markdown

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

@flavorjones

flavorjones commented Dec 4, 2019

Copy link
Copy Markdown
Member

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

This was referenced Mar 12, 2021
Open
Merged
Closed
Open
Open
Open
Open
Open
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v1.10.x patch releases

Development

Successfully merging this pull request may close these issues.

Cannot build on FreeBSD 12

3 participants

@nurse @flavorjones @franzliedke