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

FIX: [droid] depends configure.in borked #4816

Merged
merged 2 commits into from
Jun 2, 2014
Merged

Conversation

koying
Copy link
Contributor

@koying koying commented May 29, 2014

@wsnipex
Copy link
Member

wsnipex commented May 29, 2014

jenkins build this please

@MartijnKaijser MartijnKaijser added this to the Pending for inclusion milestone May 29, 2014
@jmarshallnz
Copy link
Contributor

Just as a data point, I configured + built depends just fine yesterday (fresh git checkout, fresh depends, no tarballs etc.) That was ARM, not x86.

@koying
Copy link
Contributor Author

koying commented May 29, 2014

Yes, but no arm specific flags are passed, especially neon (check makefile.include).
It even starts ok, but I noticed something was wrong because samba didn't work.

@koying
Copy link
Contributor Author

koying commented May 30, 2014

Nevermind. This is just plain wrong.
There is a chicken-egg issue with the toolchains being defined below.

Proper "fix" (as in make android ok again) is to revert 2ab82eb

@koying
Copy link
Contributor Author

koying commented May 30, 2014

Revert 6097ea3 + fixup ac39d8f

@koying
Copy link
Contributor Author

koying commented Jun 1, 2014

@davilla Comments?

@davilla
Copy link
Contributor

davilla commented Jun 1, 2014

I have no comments nor will I participate in fixing the mess others are make in there.

@koying
Copy link
Contributor Author

koying commented Jun 1, 2014

Ooookeeee. As no primary parties seem interested in fixing the mess, I'll just commit this one and wash my hand of it.

@Memphiz
Copy link
Member

Memphiz commented Jun 1, 2014

@koying the only changes are the added spaces in the platform flags right? If so - ok from me.

@koying
Copy link
Contributor Author

koying commented Jun 1, 2014

... And you now have to add "--enable-neon" in the configure line of the depends for Android.
Ask @wsnipex why...

@wsnipex
Copy link
Member

wsnipex commented Jun 2, 2014

I've added this on request, the reasoning being that we CAN build without it. As said on IRC, if this doesn't make any sense and we require neon in any case, then just remove the switch and hardcode neon.

@koying
Copy link
Contributor Author

koying commented Jun 2, 2014

Ok. Reverting both commits, then.

jenkins build this please

koying added a commit that referenced this pull request Jun 2, 2014
FIX: [droid] depends configure.in borked
@koying koying merged commit 5e5325b into xbmc:master Jun 2, 2014
@koying koying deleted the fixdroiddepends branch June 2, 2014 14:53
@MartijnKaijser MartijnKaijser modified the milestones: Helix 14.0-alpha1, Pending for inclusion Jun 7, 2014
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.

None yet

6 participants