| 1 |
Dnia 2013-09-14, o godz. 18:16:33 |
| 2 |
Mike Gilbert <floppym@g.o> napisał(a): |
| 3 |
|
| 4 |
> On Fri, Sep 13, 2013 at 2:58 PM, Michał Górny <mgorny@g.o> wrote: |
| 5 |
> > The sub-roots are no longer necessary since we're installing scripts to |
| 6 |
> > per-impl directories initially. |
| 7 |
> > --- |
| 8 |
> > gx86/eclass/distutils-r1.eclass | 9 +++------ |
| 9 |
> > 1 file changed, 3 insertions(+), 6 deletions(-) |
| 10 |
> > |
| 11 |
> > diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass |
| 12 |
> > index 7102c58..5fcb55e 100644 |
| 13 |
> > --- a/gx86/eclass/distutils-r1.eclass |
| 14 |
> > +++ b/gx86/eclass/distutils-r1.eclass |
| 15 |
> > @@ -476,9 +476,7 @@ distutils-r1_python_install() { |
| 16 |
> > addpredict "$(python_get_sitedir)" |
| 17 |
> > addpredict /usr/lib/portage/pym |
| 18 |
> > |
| 19 |
> > - local root=${D}/_${EPYTHON} |
| 20 |
> > - [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D} |
| 21 |
> > - flags+=( --root="${root}" ) |
| 22 |
> > + flags+=( --root="${D}" ) |
| 23 |
> > |
| 24 |
> > if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then |
| 25 |
> > local PYTHON_SCRIPTDIR |
| 26 |
> > @@ -488,13 +486,12 @@ distutils-r1_python_install() { |
| 27 |
> > |
| 28 |
> > esetup.py install "${flags[@]}" "${@}" |
| 29 |
> > |
| 30 |
> > - if [[ -d ${root}$(python_get_sitedir)/tests ]]; then |
| 31 |
> > + if [[ -d ${D}$(python_get_sitedir)/tests ]]; then |
| 32 |
> > die "Package installs 'tests' package, file collisions likely." |
| 33 |
> > fi |
| 34 |
> > |
| 35 |
> > if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then |
| 36 |
> > - _distutils-r1_wrap_scripts "${root}" |
| 37 |
> > - multibuild_merge_root "${root}" "${D}" |
| 38 |
> > + _distutils-r1_wrap_scripts "${D}" |
| 39 |
> > fi |
| 40 |
> > } |
| 41 |
> > |
| 42 |
> > -- |
| 43 |
> > 1.8.3.2 |
| 44 |
> > |
| 45 |
> |
| 46 |
> I believe this patch causes a race condition which causes |
| 47 |
> java-config's ebuild to fail. |
| 48 |
> |
| 49 |
> running install_data |
| 50 |
> running install_egg_info |
| 51 |
> Writing /tmp/portage/dev-java/java-config-2.2.0/image/usr/lib64/python2.7/site-packages/java_config- |
| 52 |
> 2.2.0-py2.7.egg-info |
| 53 |
> error: /tmp/portage/dev-java/java-config-2.2.0/image//usr/share/java-config-2/config/: |
| 54 |
> File exists |
| 55 |
|
| 56 |
I love when people hack build systems and have no idea about writing |
| 57 |
build systems... |
| 58 |
|
| 59 |
What are you suggesting? Finding all the broken stuff and fixing it, or |
| 60 |
restoring sub-roots? |
| 61 |
|
| 62 |
-- |
| 63 |
Best regards, |
| 64 |
Michał Górny |
Archives