Skip to content
This repository has been archived by the owner on Jun 8, 2020. It is now read-only.

Don't use FreeType on Windows MSVC #104

Merged
merged 3 commits into from
Aug 6, 2016
Merged

Conversation

vvuk
Copy link
Contributor

@vvuk vvuk commented Aug 4, 2016

We don't want FreeType on Windows with MSVC, so don't try pulling it in.


This change is Reviewable

@metajack
Copy link
Contributor

metajack commented Aug 4, 2016

@bors-servo r+

@bors-servo
Copy link

📌 Commit 472e190 has been approved by metajack

@bors-servo
Copy link

⌛ Testing commit 472e190 with merge 4172114...

bors-servo pushed a commit that referenced this pull request Aug 4, 2016
Don't use FreeType on Windows MSVC

We don't want FreeType on Windows with MSVC, so don't try pulling it in.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/104)
<!-- Reviewable:end -->
@larsbergstrom
Copy link
Contributor

@bors-servo clean retry

@bors-servo
Copy link

⌛ Testing commit 472e190 with merge 0342bb6...

bors-servo pushed a commit that referenced this pull request Aug 4, 2016
Don't use FreeType on Windows MSVC

We don't want FreeType on Windows with MSVC, so don't try pulling it in.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/104)
<!-- Reviewable:end -->
@larsbergstrom
Copy link
Contributor

I think this is failing.

   Compiling expat-sys v2.1.3

     Running `/home/travis/build/servo/skia/target/debug/build/expat-sys-79644b754ae07e61/build-script-build`

Build failed, waiting for other jobs to finish...

error: failed to run custom build command for `expat-sys v2.1.3`

Process didn't exit successfully: `/home/travis/build/servo/skia/target/debug/build/expat-sys-79644b754ae07e61/build-script-build` (exit code: 101)

--- stdout

running: "cmake" "/home/travis/.cargo/registry/src/github.com-1ecc6299db9ec823/expat-sys-2.1.3/expat" "-DBUILD_shared=OFF" "-DCMAKE_INSTALL_PREFIX=/home/travis/build/servo/skia/target/debug/build/expat-sys-79644b754ae07e61/out" "-DCMAKE_C_FLAGS= -O0 -ffunction-sections -fdata-sections -m64 -fPIC" "-DCMAKE_C_COMPILER=/usr/bin/cc" "-DCMAKE_CXX_FLAGS= -O0 -ffunction-sections -fdata-sections -m64 -fPIC" "-DCMAKE_CXX_COMPILER=/usr/bin/c++" "-DCMAKE_BUILD_TYPE=Debug"

--- stderr

CMake Error: The source directory "/home/travis/.cargo/registry/src/github.com-1ecc6299db9ec823/expat-sys-2.1.3/expat" does not exist.

Specify --help for usage, or press the help button on the CMake GUI.

thread '<main>' panicked at '

command did not execute successfully, got: exit code: 1

build script failed, must exit now', /home/travis/.cargo/registry/src/github.com-1ecc6299db9ec823/cmake-0.1.17/src/lib.rs:463

note: Run with `RUST_BACKTRACE=1` for a backtrace.

From:
https://travis-ci.org/servo/skia/jobs/149871355

Hrm, trying to puzzle out what's going on here with all of the various jobs in-flight and strange reporting of "success" in the status boxes but failure to merge by homu.

@larsbergstrom
Copy link
Contributor

Aha, yes, it looks like the previous r+ also failed with this error:
https://travis-ci.org/servo/skia/builds/149840647

There's something wrong with the travis -> github status push update stuff?

@larsbergstrom
Copy link
Contributor

It looks like we are going to wait for servo/libexpat#18 to land before investigating this failure further.

@larsbergstrom
Copy link
Contributor

@bors-servo retry

  • libexpat has landed, so we should pick up the new version in the next retry

@larsbergstrom
Copy link
Contributor

@bors-servo r+

@bors-servo
Copy link

📌 Commit 48d989c has been approved by larsbergstrom

@bors-servo
Copy link

⌛ Testing commit 48d989c with merge 22322e9...

bors-servo pushed a commit that referenced this pull request Aug 5, 2016
Don't use FreeType on Windows MSVC

We don't want FreeType on Windows with MSVC, so don't try pulling it in.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/104)
<!-- Reviewable:end -->
@bors-servo
Copy link

💥 Test timed out

@vvuk vvuk force-pushed the msvcize branch 2 times, most recently from 85c06d0 to f23dcb6 Compare August 5, 2016 18:11
@larsbergstrom
Copy link
Contributor

@bors-servo r+

@bors-servo
Copy link

📌 Commit ef67fd6 has been approved by larsbergstrom

@bors-servo
Copy link

⌛ Testing commit ef67fd6 with merge 89d0171...

bors-servo pushed a commit that referenced this pull request Aug 6, 2016
Don't use FreeType on Windows MSVC

We don't want FreeType on Windows with MSVC, so don't try pulling it in.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/104)
<!-- Reviewable:end -->
@larsbergstrom
Copy link
Contributor

@larsbergstrom larsbergstrom merged commit 9c09d4b into servo:master Aug 6, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants