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

Jump to bottom

media-libs/libass: Fix building for x32, bug #509460 #171

Merged
merged 1 commit into from Oct 11, 2015
Merged

media-libs/libass: Fix building for x32, bug #509460 #171

merged 1 commit into from Oct 11, 2015

Conversation

bjacquin
Copy link
Contributor

@bjacquin bjacquin commented Oct 9, 2015

Package-Manager: portage-2.2.20.1

@hasufell hasufell added the bugfix label Oct 9, 2015
@mgorny
Copy link
Member

mgorny commented Oct 10, 2015

@gentoo/video

@mgorny mgorny added the assigned PR successfully assigned to the package maintainer(s). label Oct 10, 2015
luke-jr
luke-jr reviewed Oct 10, 2015
View reviewed changes
media-libs/libass/libass-0.13.0.ebuild
@@ -32,7 +32,16 @@ done
DOCS="Changelog"

multilib_src_configure() {
local myconf

if has ${MULTILIB_ABI_FLAG} ${ASM_MULTILIB_ABIS} ; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is MULTILIB_ABI_FLAG defined?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

multilib-build.eclass

@luke-jr
Copy link
Contributor

luke-jr commented Oct 10, 2015

Looks good to me (but did not test).

@luke-jr
Copy link
Contributor

luke-jr commented Oct 10, 2015

FWIW, it was simple to fix the build on x32:
libass/libass#200
https://github.com/libass/libass/pull/200.patch
This patch should apply cleanly to all versions in the portage tree.

@mgorny
Copy link
Member

mgorny commented Oct 10, 2015

@bjacquin, I guess Luke's patch would be better. I would wait a while what upstream says, and possibly switch to that.

@bjacquin
Copy link
Contributor Author

ack, less patch I can maintain, better I feel

@astiob
Copy link

astiob commented Oct 10, 2015

Hi, I’m from upstream. Luke’s patch is now in our git master (libass/libass@4778001), but it can take a while before we make the next release. Is this a serious problem for you, or could you apply the patch on your end for now?

@mgorny
Copy link
Member

mgorny commented Oct 10, 2015

@astiob, that's no urgent issue, we can apply the patch ourselves.

@bjacquin, fetch https://github.com/libass/libass/commit/4778001b673c73133d7d1dd48a385d0ca424ccfc.patch and update your PR, please ;-).

@bjacquin
Copy link
Contributor Author

Done all, works OK for me

@bjacquin
media-libs/libass: Fix building for x32, bug #509460
f9ed8db 
Add upstream patch from commit 4778001 ("configure: Set the correct x32
machine option for yasm")

Package-Manager: portage-2.2.20.1
@gentoo-bot gentoo-bot merged commit f9ed8db into gentoo:master Oct 11, 2015
mgorny added a commit that referenced this pull request Oct 11, 2015
@mgorny
media-libs/libass: Merge "Fix building for x32"
5a5663e 
Pull-Request: #171
@mgorny
Copy link
Member

mgorny commented Oct 11, 2015

Thanks a lot!

@bjacquin
Copy link
Contributor Author

Thanks to you !

@bjacquin bjacquin deleted the dev/beber/x32-libass branch January 11, 2017 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
assigned PR successfully assigned to the package maintainer(s).
Projects
None yet
Milestone
No milestone
6 participants
@bjacquin @mgorny @luke-jr @astiob @hasufell @gentoo-bot