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

libxml2: Migrate to CMake #48

Merged
merged 9 commits into from
Jun 21, 2024
Merged

libxml2: Migrate to CMake #48

merged 9 commits into from
Jun 21, 2024

Conversation

hmelder
Copy link
Contributor

@hmelder hmelder commented Jun 18, 2024

No description provided.

@hmelder
Copy link
Contributor Author

hmelder commented Jun 18, 2024

#47

@hmelder hmelder requested a review from triplef June 18, 2024 21:38
phases/16-libxml2.bat Outdated Show resolved Hide resolved
phases/16-libxml2.bat Outdated Show resolved Hide resolved
hmelder and others added 2 commits June 20, 2024 12:09
Co-authored-by: Frederik Seiffert <[email protected]>
Co-authored-by: Frederik Seiffert <[email protected]>
Comment on lines 49 to 59
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -64,7 +64,7 @@ LIBS = $(LIBS) iconv.lib
!if "$(STATIC)" == "1"
LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib
!else
-LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib
+LIBS = $(LIBS) icu.lib
!endif
!endif
!if "$(WITH_ZLIB)" == "1"
Copy link
Contributor Author

@hmelder hmelder Jun 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove the old patch here

@triplef
Copy link
Member

triplef commented Jun 20, 2024

Thanks! I added a couple small comments.

What was the reason for requiring Windows-provided ICU with this change? I think it’s fine to do this, but then we should also remove the ICU phase script, and probably mention this requirement further up top in the readme (not in the "building the toolchain" section as it’s both a build- and runtime requirement.

@hmelder
Copy link
Contributor Author

hmelder commented Jun 20, 2024

What was the reason for requiring Windows-provided ICU with this change?

Just out of convenience. I can change it back, but this would require testing correct detection of our ICU build. Should I look into that?

@triplef
Copy link
Member

triplef commented Jun 20, 2024

Ok makes sense. I’ve pushed these changes removing ICU to make this more explicit. Can you please rebase onto the latest master?

@triplef triplef merged commit 37d6bb2 into master Jun 21, 2024
5 checks passed
@triplef triplef deleted the libxml2-fixes branch June 21, 2024 06:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants