Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 355416 Details for
Bug 479282
dev-libs/glib: Migrate to multilib eclasses.
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
ebuild diff
glib-multilib.patch (text/plain), 2.52 KB, created by
Alexis Ballier
on 2013-08-08 15:18:27 UTC
(
hide
)
Description:
ebuild diff
Filename:
MIME Type:
Creator:
Alexis Ballier
Created:
2013-08-08 15:18:27 UTC
Size:
2.52 KB
patch
obsolete
>--- glib-2.36.3-r1.ebuild 2013-07-26 16:39:10.000000000 -0400 >+++ glib-2.36.3-r2.ebuild 2013-08-08 11:03:50.452203195 -0400 >@@ -6,7 +6,7 @@ > PYTHON_COMPAT=( python2_{5,6,7} ) > # Avoid runtime dependency on python when USE=test > >-inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info >+inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal > > DESCRIPTION="The GLib library of C routines" > HOMEPAGE="http://www.gtk.org/" >@@ -17,14 +17,14 @@ > KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" > > RDEPEND=" >- virtual/libiconv >- virtual/libffi >- sys-libs/zlib >+ virtual/libiconv[${MULTILIB_USEDEP}] >+ virtual/libffi[${MULTILIB_USEDEP}] >+ sys-libs/zlib[${MULTILIB_USEDEP}] > || ( > >=dev-libs/elfutils-0.142 > >=dev-libs/libelf-0.8.12 ) >- xattr? ( sys-apps/attr ) >- fam? ( virtual/fam ) >+ xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) >+ fam? ( virtual/fam[${MULTILIB_USEDEP}] ) > utils? ( > ${PYTHON_DEPS} > >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] ) >@@ -147,7 +147,7 @@ > epunt_cxx > } > >-src_configure() { >+multilib_src_configure() { > # Avoid circular depend with dev-util/pkgconfig and > # native builds (cross-compiles won't need pkg-config > # in the target ROOT to work here) >@@ -167,8 +167,11 @@ > # convert this to the use_enable form, as it results in a broken build. > use debug && myconf="--enable-debug" > >+ # Only used by the gresource bin >+ multilib_is_native_abi || myconf="${myconf} --disable-libelf" >+ > # Always use internal libpcre, bug #254659 >- econf ${myconf} \ >+ ECONF_SOURCE="${S}" econf ${myconf} \ > $(use_enable xattr) \ > $(use_enable fam) \ > $(use_enable selinux) \ >@@ -182,9 +185,7 @@ > --with-xml-catalog="${EPREFIX}/etc/xml/catalog" > } > >-src_install() { >- default >- >+multilib_src_install_all() { > if use utils ; then > python_replicate_script "${ED}"/usr/bin/gtester-report > else >@@ -203,7 +204,7 @@ > prune_libtool_files --modules > } > >-src_test() { >+multilib_src_test() { > gnome2_environment_reset > > unset DBUS_SESSION_BUS_ADDRESS >@@ -220,7 +221,7 @@ > > # Hardened: gdb needs this, bug #338891 > if host-is-pax ; then >- pax-mark -mr "${S}"/tests/.libs/assert-msg-test \ >+ pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ > || die "Hardened adjustment failed" > fi >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 479282
: 355416