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

pixman: patch in build() instead of source() + bump msys2 + del fPIC if shared + fix hooks #3225

Merged
merged 11 commits into from
Oct 20, 2020
Merged

pixman: patch in build() instead of source() + bump msys2 + del fPIC if shared + fix hooks #3225

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9e59b10
rename source folder
SpaceIm Oct 16, 2020
f6bb1d6
bump msys2
SpaceIm Oct 16, 2020
71403af
del fPIC if shared
SpaceIm Oct 16, 2020
f1e1949
patch in build() instead of source()
SpaceIm Oct 16, 2020
c5e167b
finer grained cleanup in package()
SpaceIm Oct 16, 2020
e960472
cleanup
SpaceIm Oct 16, 2020
8e8e8f4
fix hooks
SpaceIm Oct 16, 2020
a362619
grammar correction
SpaceIm Oct 16, 2020
1f61df1
remove double quote
SpaceIm Oct 16, 2020
97f88ec
pixman: truely test on windows
ericLemanissier Oct 19, 2020
74090bf
Merge remote-tracking branch 'bincrafters/pixman' into fix/pixman-pat…
SpaceIm Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes/pixman/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def configure(self):
del self.settings.compiler.libcxx
del self.settings.compiler.cppstd
if self.settings.os == "Windows" and self.options.shared:
raise ConanInvalidConfiguration("pixman can only built as static library for Windows")
raise ConanInvalidConfiguration("pixman can only be built as a static library on Windows")"
SpaceIm marked this conversation as resolved.
Show resolved Hide resolved

def build_requirements(self):
if tools.os_info.is_windows:
Expand Down