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.

Sign up for GitHub

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

Jump to bottom

build-sys: don't use libxml-2 if its CRLF handling is broken #3858

Merged
merged 5 commits into from
Dec 1, 2023
Merged

build-sys: don't use libxml-2 if its CRLF handling is broken #3858

merged 5 commits into from
Dec 1, 2023

Conversation

masatake
Copy link
Member

See #3851 .

@codecov Codecov
Copy link

codecov bot commented Nov 22, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (fae067a) 85.02% compared to head (600075f) 85.02%.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #3858   +/-   ##
=======================================
  Coverage   85.02%   85.02%           
=======================================
  Files         228      228           
  Lines       53901    53901           
=======================================
  Hits        45832    45832           
  Misses       8069     8069

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@masatake
Copy link
Member Author

??? Why the errors of the test case is not reproduced?

@masatake
Copy link
Member Author

It seems that I must cherry-pick #3854.

@masatake masatake mentioned this pull request Nov 23, 2023
Closed
@masatake
Copy link
Member Author

The input for the failed case uses CR+LF as the line separator.
In cc24c85, I added a new test case cloned from the test case with changing the line separator to LF. The cloned test case didn't fail.

@masatake masatake force-pushed the lxpath--newer-libxml2-API branch 3 times, most recently from adf998d to 3489dc5 Compare November 26, 2023 18:00
@masatake masatake changed the title [WIP] adapting to newer libxml2 API [WIP] don't use libxml-2 if its CRLF handling is broken Nov 26, 2023
@masatake
Copy link
Member Author

@leleliu008 I added AC_RUN_IFELSE to configure.ac.
What do you think about this? I'm afraid of breaking the cross-compiling infrastructure you have polished.

@leleliu008
Copy link
Member

@leleliu008 I added AC_RUN_IFELSE to configure.ac. What do you think about this? I'm afraid of breaking the cross-compiling infrastructure you have polished.

Could we disable this check while cross-compiling?

@masatake
Copy link
Member Author

As I am afraid, running configure on s390x has failed.

@masatake
Copy link
Member Author

@leleliu008 thank you.

 -- Macro: AC_RUN_IFELSE (INPUT, [ACTION-IF-TRUE], [ACTION-IF-FALSE],
          [ACTION-IF-CROSS-COMPILING = ‘AC_MSG_FAILURE’])

O.K. I will fill the 4th parameter.

@leleliu008
Copy link
Member

leleliu008 commented Nov 26, 2023 •
edited
Loading

About the macos-13 workflow fails, please pick up #3861, I have merged it to master branch, it should be fixed.

@masatake
Copy link
Member Author

@leleliu008 Thank you.

@masatake masatake force-pushed the lxpath--newer-libxml2-API branch 2 times, most recently from bf3bd5a to f5d5fef Compare November 30, 2023 18:18
@masatake
build-sys: check version number only when verifying libxml2 in cross-…
600075f 
…compiling

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
@masatake masatake marked this pull request as ready for review December 1, 2023 06:14
@masatake masatake changed the title [WIP] don't use libxml-2 if its CRLF handling is broken buildsys: don't use libxml-2 if its CRLF handling is broken Dec 1, 2023
@masatake
Copy link
Member Author

masatake commented Dec 1, 2023

What I studied while developing this puu request is that pkg-config doesn't support && operator.

@masatake
Copy link
Member Author

masatake commented Dec 1, 2023

I won!

@masatake masatake changed the title buildsys: don't use libxml-2 if its CRLF handling is broken build-sys: don't use libxml-2 if its CRLF handling is broken Dec 1, 2023
@masatake masatake merged commit 684ed1d into universal-ctags:master Dec 1, 2023
43 checks passed
@masatake masatake mentioned this pull request Dec 1, 2023
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
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@masatake @leleliu008