for a proprietary application I need to link against a 32bit tk. Reproducible: Always
Created attachment 394668 [details, diff] add multilib love to tk-8.6.3
@multilib is this patch okay?
(In reply to Martin Gysel (bearsh) from comment #1) > Created attachment 394668 [details, diff] [details, diff] > add multilib love to tk-8.6.3 Did you tried this patch?
(In reply to Justin Lecher from comment #3) > (In reply to Martin Gysel (bearsh) from comment #1) > > Created attachment 394668 [details, diff] [details, diff] [details, diff] > > add multilib love to tk-8.6.3 > > Did you tried this patch? Forget this comment ;)
23 Jan 2015; Justin Lecher <jlec@gentoo.org> tk-8.6.3.ebuild: + Add multilib support, #537400; thanks Martin Gysel (bearsh) for preparing the + patch +
Comment on attachment 394668 [details, diff] add multilib love to tk-8.6.3 Why do you ask for review if you don't even wait for it? >--- old/tk-8.6.3.ebuild 2014-12-20 10:03:03.000000000 +0100 >+++ new/tk-8.6.3.ebuild 2015-01-22 07:34:13.864571694 +0100 >@@ -4,7 +4,7 @@ > > EAPI=5 > >-inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx >+inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx multilib-minimal > > MY_P="${PN}${PV/_beta/b}" > >@@ -19,15 +19,15 @@ > > RDEPEND=" > !aqua? ( >- media-libs/fontconfig >- x11-libs/libX11 >- x11-libs/libXt >- truetype? ( x11-libs/libXft ) >- xscreensaver? ( x11-libs/libXScrnSaver ) >+ media-libs/fontconfig[${MULTILIB_USEDEP}] >+ x11-libs/libX11[${MULTILIB_USEDEP}] >+ x11-libs/libXt[${MULTILIB_USEDEP}] >+ truetype? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) >+ xscreensaver? ( x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] ) You need to add minimal versions to those dependencies because of PMS stupidity. Use multilib-dep-fixor [1] on the ebuild. [1]:https://bitbucket.org/mgorny/multilib-dep-fixor > ) >- ~dev-lang/tcl-${PV}" >+ ~dev-lang/tcl-${PV}[${MULTILIB_USEDEP}]" > DEPEND="${RDEPEND} >- !aqua? ( x11-proto/xproto )" >+ !aqua? ( x11-proto/xproto[${MULTILIB_USEDEP}] )" > > # Not bumped to 8.6 > #RESTRICT=test >@@ -66,9 +66,11 @@ > -i tcl.m4 || die > > eautoconf >+ >+ multilib_copy_sources Does the package really fail hard when doing out-of-source build or you didn't try that at all? > } > >-src_configure() { >+multilib_src_configure() { > local mylibdir=$(get_libdir) > > econf \ >@@ -80,11 +82,11 @@ > $(use_enable debug symbols) > } > >-src_test() { >+multilib_src_test() { > Xemake test > } > >-src_install() { >+multilib_src_install() { > #short version number > local v1=$(get_version_component_range 1-2) > local mylibdir=$(get_libdir) >@@ -124,7 +126,8 @@ > dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) > dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a > >- dosym wish${v1} /usr/bin/wish >- >- dodoc "${SPARENT}"/{ChangeLog*,README,changes} >+ if multilib_is_native_abi; then >+ dosym wish${v1} /usr/bin/wish >+ dodoc "${SPARENT}"/{ChangeLog*,README,changes} dodoc looks like a candidate for multilib_src_install_all(). >+ fi > }
(In reply to Michał Górny from comment #6) > > ) > >- ~dev-lang/tcl-${PV}" > >+ ~dev-lang/tcl-${PV}[${MULTILIB_USEDEP}]" > > DEPEND="${RDEPEND} > >- !aqua? ( x11-proto/xproto )" > >+ !aqua? ( x11-proto/xproto[${MULTILIB_USEDEP}] )" > > > > # Not bumped to 8.6 > > #RESTRICT=test > >@@ -66,9 +66,11 @@ > > -i tcl.m4 || die > > > > eautoconf > >+ > >+ multilib_copy_sources > > Does the package really fail hard when doing out-of-source build or you > didn't try that at all? you mean without the call to multilib_copy_sources? yes this failed... my patch is basically a simple adaption of what is done in dev-lang/tcl, so if this solution need modification then most likely also the one in tcl
+ 24 Jan 2015; Justin Lecher <jlec@gentoo.org> tk-8.6.3.ebuild: + Add minimal dep versions for multilib support, #537400 +
