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

make ios build more like android build #18

Merged
merged 9 commits into from
Feb 3, 2013

Conversation

paleozogt
Copy link
Contributor

The iOS build (especially Boost) is quite a bit different than it is for Android. I've refactored the build so that iOS and Android are more similar. In this pull request:

  • Android and iOS configure their Boost packages the same way and for the same packages
  • Android and iOS build ICU with the same flags
  • iOS builds Boost in the platform loop (like how Android does) rather than all in one go. This greatly simplifies the build script, as all the lipo-ing can happen in the build-all script. This also allows the Boost build to potentially use upstream libraries that have already been built (such as ICU).
  • iOS Boost build now untars to the same place that Android does (which is just cleaner)
  • iOS Boost now produces the same .a files as Android (libboost_xxx as well as the combined libboost.a)

mevansam added a commit that referenced this pull request Feb 3, 2013
make ios build more like android build
@mevansam mevansam merged commit 55d3e4d into mevansam:master Feb 3, 2013
mevansam added a commit that referenced this pull request Feb 4, 2013
This reverts commit 55d3e4d, reversing
changes made to 6d7946d.
@mevansam
Copy link
Owner

mevansam commented Feb 4, 2013

Hi Aaron

Thanks for taking the time to make the changes. I merged in you changes but
then got errors with the boost build. So I have instead merged them to a
separate branch and I am working on resolving them and will merge it to
master once I have resolved them.

I have however, successfully merged and tested merge request #19.

Thanks
-M

On Thu, Jan 31, 2013 at 4:42 PM, Aaron Simmons notifications@github.com
wrote:

The iOS build (especially Boost) is quite a bit different than it is for
Android. I've refactored the build so that iOS and Android are more
similar.
In this pull request:

Android and iOS configure their Boost packages the same way and for the
same
packages
Android and iOS build ICU with the same flags
iOS builds Boost in the platform loop (like how Android does) rather than
all in one go. This greatly simplifies the build script, as all the
lipo-ing
can happen in the build-all script.
iOS Boost build now untars to the same place that Android does (which is
just cleaner)
iOS Boost now produces the same .a files as Android (libboost_xxx as well
as
the combined libboost.a)


You can merge this Pull Request by running

git pull https://github.com/paleozogt/cmoss ios-like-android

Or view, comment on, or merge it at:

#18

Commit Summary

taking out individual boost lib stripping, as that's not what the droid
build does
making boost build work the same for ios/android in regard to the boost
packages
making ios boost build single platform at a time so that it can be called
from the build-all platform loop (just like for android)
removing project list from android boost build, as its being handled by
the
boost bootstrapper
same flags for ios icu as android icu
making boost-ios build handle its tarball the same way that boost-android
does
making boost-ios build handle its tarball the same way that boost-android
does
oops accidentally checked build-all with commented-out projects
changing var name to be more clear

File Changes

M build-droid/build-all.sh (1)
M build-droid/build-boost.sh (8)
M build-ios/build-all.sh (11)
M build-ios/build-boost.sh (143)
M build-ios/build-icu.sh (4)

Patch Links:

https://github.com/mevansam/cmoss/pull/18.patch
https://github.com/mevansam/cmoss/pull/18.diff

@paleozogt
Copy link
Contributor Author

Oh sorry about that. It was working for me... What error are you getting?

@mevansam
Copy link
Owner

mevansam commented Feb 6, 2013

The boost bootstrap script fails. When I look at the bootstrap.log file I
see this error.

ld: warning: ignoring file
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator6.1.sdk/usr/lib/libSystem.dylib,
file was built for unsupported file format ( 0xce 0xfa 0xed 0xfe 0x 7 0x 0
0x 0 0x 0 0x 3 0x 0 0x 0 0x 0 0x 6 0x 0 0x 0 0x 0 ) which is not the
architecture being linked (x86_64):
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator6.1.sdk/usr/lib/libSystem.dylib

I have reverted the master and merged in the other changes you made. I will
work on it later when I get some time to see what is going on. If you are
able to recreate the issue and fix it submit another merge request.

Thanks
-M

On Mon, Feb 4, 2013 at 7:16 AM, Aaron Simmons notifications@github.comwrote:

Oh sorry about that. It was working for me... What error are you getting?


Reply to this email directly or view it on GitHubhttps://github.com//pull/18#issuecomment-13074115.

@mevansam
Copy link
Owner

mevansam commented Feb 6, 2013

I've attached the bootstrap.log file. I think the issue is that when the
bootstrap script is doing a sanity check it is creating the object code
using the default system gcc and not the one from the SDK toolchain.

On Tue, Feb 5, 2013 at 9:45 PM, Mevan Samaratunga mevansam@gmail.comwrote:

The boost bootstrap script fails. When I look at the bootstrap.log file I
see this error.

ld: warning: ignoring file
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator6.1.sdk/usr/lib/libSystem.dylib,
file was built for unsupported file format ( 0xce 0xfa 0xed 0xfe 0x 7 0x 0
0x 0 0x 0 0x 3 0x 0 0x 0 0x 0 0x 6 0x 0 0x 0 0x 0 ) which is not the
architecture being linked (x86_64):
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator6.1.sdk/usr/lib/libSystem.dylib

I have reverted the master and merged in the other changes you made. I
will work on it later when I get some time to see what is going on. If you
are able to recreate the issue and fix it submit another merge request.

Thanks
-M

On Mon, Feb 4, 2013 at 7:16 AM, Aaron Simmons notifications@github.comwrote:

Oh sorry about that. It was working for me... What error are you getting?


Reply to this email directly or view it on GitHubhttps://github.com//pull/18#issuecomment-13074115.

@paleozogt
Copy link
Contributor Author

Oh, that is interesting. I definitely am not getting that error. Perhaps my system is subtly different from yours. I'm on 10.8.2 with XCode 4.6.

@paleozogt
Copy link
Contributor Author

Ah, I think I figured it out: it needs the xcode 4.6 fix merged into it. I'll file another pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants