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

Update Mason submodule pin #1962

Merged
merged 1 commit into from
Aug 5, 2015
Merged

Update Mason submodule pin #1962

merged 1 commit into from
Aug 5, 2015

Conversation

1ec5
Copy link
Contributor

@1ec5 1ec5 commented Jul 29, 2015

This PR pulls in mapbox/mason@41d8b2e for mapbox/mason#106, as well as plenty of other changes. @kkaefer @ljbade, is it safe to pull in all the Mason changes since mapbox/mason@abdc131?

Fixes #1957; fixes #1707.

@1ec5 1ec5 added iOS Mapbox Maps SDK for iOS build prerelease-os labels Jul 29, 2015
@1ec5 1ec5 self-assigned this Jul 29, 2015
@1ec5 1ec5 added this to the v0.6.0 milestone Jul 29, 2015
@ljbade
Copy link
Contributor

ljbade commented Jul 29, 2015

@1ec5 It looks OK. But only way to know for sure is on Travis.

@1ec5
Copy link
Contributor Author

1ec5 commented Jul 30, 2015

Not looking good on the Android side, @ljbade. Looks like toolchain.sh just stalls out.

@ljbade
Copy link
Contributor

ljbade commented Jul 30, 2015

Hmm, OK I'll have to try it locally.

@ljbade
Copy link
Contributor

ljbade commented Jul 31, 2015

Strange it doesn't hang locally but I get a bunch of weird messages:

leith@leith-xps:~/mb/mapbox-gl-native$ make android
git submodule update --init src/mbgl/util/geojsonvt
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: Resource temporarily unavailable
./scripts/android/toolchain.sh: line 15: mason: No such file or directory
./scripts/android/toolchain.sh: line 15: which: No such file or directory
./scripts/android/toolchain.sh: line 16: mason: No such file or directory
./scripts/android/toolchain.sh: line 16: which: No such file or directory
./scripts/android/toolchain.sh: line 17: mason: No such file or directory
./scripts/android/toolchain.sh: line 17: which: No such file or directory
./scripts/android/toolchain.sh: line 18: mason: No such file or directory
./scripts/android/toolchain.sh: line 18: which: No such file or directory
./scripts/android/toolchain.sh: line 19: mason: No such file or directory
./scripts/android/toolchain.sh: line 19: which: No such file or directory
./scripts/android/toolchain.sh: line 20: mason: No such file or directory
./scripts/android/toolchain.sh: line 20: which: No such file or directory
./scripts/android/toolchain.sh: line 21: mason: No such file or directory
./scripts/android/toolchain.sh: line 21: which: No such file or directory
./scripts/android/toolchain.sh: line 22: mason: No such file or directory
./scripts/android/toolchain.sh: line 23: mason: No such file or directory
./scripts/android/toolchain.sh: line 24: mason: No such file or directory
./scripts/android/toolchain.sh: line 25: mason: No such file or directory
./scripts/android/toolchain.sh: line 26: mason: No such file or directory
deps/run_gyp android/mapboxgl-app.gyp -Dhost=android -Iconfig/android-arm-v7.gypi -Dheadless_lib=none -Dplatform_lib=android -Dasset_lib=zip -Dhttp_lib=curl -Dcache_lib=sqlite --depth=. -Goutput_dir=. --generator-output=./build/android-arm-v7 -f make-android
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: retry: No child processes
/home/leith/mb/mapbox-gl-native/.mason/mason: fork: Resource temporarily unavailable
./scripts/android/toolchain.sh: line 15: mason: No such file or directory
./scripts/android/toolchain.sh: line 15: which: No such file or directory
./scripts/android/toolchain.sh: line 16: mason: No such file or directory
./scripts/android/toolchain.sh: line 16: which: No such file or directory
./scripts/android/toolchain.sh: line 17: mason: No such file or directory
./scripts/android/toolchain.sh: line 17: which: No such file or directory
./scripts/android/toolchain.sh: line 18: mason: No such file or directory
./scripts/android/toolchain.sh: line 18: which: No such file or directory
./scripts/android/toolchain.sh: line 19: mason: No such file or directory
./scripts/android/toolchain.sh: line 19: which: No such file or directory
./scripts/android/toolchain.sh: line 20: mason: No such file or directory
./scripts/android/toolchain.sh: line 20: which: No such file or directory
./scripts/android/toolchain.sh: line 21: mason: No such file or directory
./scripts/android/toolchain.sh: line 21: which: No such file or directory
./scripts/android/toolchain.sh: line 22: mason: No such file or directory
./scripts/android/toolchain.sh: line 23: mason: No such file or directory
./scripts/android/toolchain.sh: line 24: mason: No such file or directory
./scripts/android/toolchain.sh: line 25: mason: No such file or directory
./scripts/android/toolchain.sh: line 26: mason: No such file or directory
make -C build/android-arm-v7 BUILDTYPE=Release androidapp
make[1]: Entering directory '/home/leith/mb/mapbox-gl-native/build/android-arm-v7'
  ACTION mbgl_gyp_version_target_Build_Version_Header Release/obj/gen/include/mbgl/util/version.hpp
  CXX(target) Release/obj.target/core/src/clipper/clipper.o
make[1]: -DNDEBUG: Command not found
core.target.mk:240: recipe for target 'Release/obj.target/core/src/clipper/clipper.o' failed
make[1]: *** [Release/obj.target/core/src/clipper/clipper.o] Error 127
make[1]: Leaving directory '/home/leith/mb/mapbox-gl-native/build/android-arm-v7'
Makefile:187: recipe for target 'android-lib-arm-v7' failed
make: *** [android-lib-arm-v7] Error 2

@ljbade
Copy link
Contributor

ljbade commented Jul 31, 2015

OK got a compare link mapbox/mason@abdc131...41d8b2e

@ljbade
Copy link
Contributor

ljbade commented Jul 31, 2015

Only change that looks interesting is mapbox/mason@abdc131...41d8b2e#diff-cc7a13abf233cbd4fc6762059aee5946R207

I think I need to clone mason on this computer to the right place.

@ljbade
Copy link
Contributor

ljbade commented Jul 31, 2015

Hrm still does it.

@springmeyer What do you think has broken?

@springmeyer
Copy link
Contributor

@ljbade - I don't know. I've not being working on mason master so I presume it is some change @kkaefer made. I'm also on vacation for a week starting today, so lean on @kkaefer ideally for help.

@1ec5
Copy link
Contributor Author

1ec5 commented Aug 3, 2015

Per scrum, we’d like to feature iOS 9 SDK compatibility in the next release of GL for iOS. If we don’t figure the Android build failures by then, we’ll cut a branch based on the current submodule pin and cherry-pick just mapbox/mason@41d8b2e.

@ljbade
Copy link
Contributor

ljbade commented Aug 3, 2015

@1ec5 Yeah I'd do that while we figure this out.

@kkaefer
Copy link
Member

kkaefer commented Aug 4, 2015

Is this fixed in current master?

Pulled in mason/mason@41d8b2eb28b3cd942d9f15583467b27c549675ea for mapbox/mason#106 and mason/mason@d8597d944533dbb5e28d08dfdba22a82c93171b7 for mapbox/mason#110.

Fixes #1957 and fixes #1707.
@1ec5 1ec5 force-pushed the 1ec5-bitcode-1957 branch from 3f8b265 to 5eebda7 Compare August 5, 2015 16:28
@1ec5
Copy link
Contributor Author

1ec5 commented Aug 5, 2015

@kkaefer, yes, that fixed it – thanks. I’ve also pulled in mason/mason@d8597d9 for mapbox/mason#110 to fix #1707.

@1ec5 1ec5 merged commit 5eebda7 into master Aug 5, 2015
@1ec5 1ec5 removed the in progress label Aug 5, 2015
@1ec5 1ec5 deleted the 1ec5-bitcode-1957 branch August 5, 2015 17:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
build iOS Mapbox Maps SDK for iOS
Projects
None yet
4 participants