public inbox for gentoo-user@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-user] /etc/portage/bashrc - patches
@ 2018-04-15  0:30 thelma
  2018-04-15  5:45 ` [gentoo-user] " Nikos Chantziaras
  0 siblings, 1 reply; 2+ messages in thread
From: thelma @ 2018-04-15  0:30 UTC (permalink / raw
  To: Gentoo mailing list

I'm trying to patch audacity-2.1.3-r1 (as it fails to compile) with the patch provided in Gentoo-Bug forum:
https://bugs.gentoo.org/show_bug.cgi?id=618326

I've edited the /etc/portage/bashrc:
https://wiki.gentoo.org/wiki//etc/portage/patches#Enabling_.2Fetc.2Fportage.2Fpatches_for_all_ebuilds

--- bashrc -----
# This hook is neccesary for automatic updating of the cfg-update index, please do not modify it!
pre_pkg_setup() {
        [[ $ROOT = / ]] && cfg-update --index
}

pre_src_prepare() {
    [[ ${EAPI:-0} == [012345] ]] || return
    if ! type estack_push > /dev/null 2>&1; then
        local estack_names="eshopts_push eshopts_pop evar_push evar_push_set evar_pop estack_push estack_pop"
        source <(awk "/^# @(FUNCTION|VARIABLE): / { p = 0 } /^# @(FUNCTION|VARIABLE): (${estack_names// /|})\$/ { p = 1 } p { print }" ${PORTDIR}/eclass/estack.eclas$
    fi
    if ! type epatch_user > /dev/null 2>&1; then
        local epatch_names="EPATCH_SOURCE EPATCH_USER_SOURCE epatch_user_death_notice epatch_user epatch"
        source <(awk "/^# @(FUNCTION|VARIABLE): / { p = 0 } /^# @(FUNCTION|VARIABLE): (${epatch_names// /|})\$/ { p = 1 } p { print }" ${PORTDIR}/eclass/epatch.eclas$
    fi

    epatch_user

    for name in $epatch_names; do
        unset $name
    done
    for name in $estack_names; do
        unset $name
    done

}
----- bashrc end --------

I've copied the patch "TrackPanel-Track-GetRate.patch"
to:  
/etc/portage/patches/media-sound/audacity-2.1.3-r1/

but emerge still fails.
What am I missing? 

collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:2005: audacity] Error 1
make[2]: Leaving directory '/var/tmp/portage/media-sound/audacity-2.1.3-r1/work/audacity-minsrc-2.1.3/src'
make[1]: *** [Makefile:1377: all] Error 2
make[1]: Leaving directory '/var/tmp/portage/media-sound/audacity-2.1.3-r1/work/audacity-minsrc-2.1.3/src'
make: *** [Makefile:795: all-recursive] Error 1
 * ERROR: media-sound/audacity-2.1.3-r1::gentoo failed (compile phase):
 *   emake failed

-- 
Thelma


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-user] Re: /etc/portage/bashrc - patches
  2018-04-15  0:30 [gentoo-user] /etc/portage/bashrc - patches thelma
@ 2018-04-15  5:45 ` Nikos Chantziaras
  0 siblings, 0 replies; 2+ messages in thread
From: Nikos Chantziaras @ 2018-04-15  5:45 UTC (permalink / raw
  To: gentoo-user

On 15/04/18 03:30, thelma@sys-concept.com wrote:
> I'm trying to patch audacity-2.1.3-r1 (as it fails to compile) with the patch provided in Gentoo-Bug forum:
> https://bugs.gentoo.org/show_bug.cgi?id=618326
> 
> I've edited the /etc/portage/bashrc:
> https://wiki.gentoo.org/wiki//etc/portage/patches#Enabling_.2Fetc.2Fportage.2Fpatches_for_all_ebuilds

You don't need that. In fact I wouldn't be surprised if you broke 
something by doing that. Undo the change. Putting the patch into:

 
/etc/portage/patches/media-sound/audacity-2.1.3-r1/TrackPanel-Track-GetRate.patch

is enough.

The user patches are applied automatically when the ebuild in question 
uses EAPI 6, or it inherits eutils. audacity-2.1.3-r1.ebuild does the 
latter.

When emerging, you will see this in the log:

   Applying user patches
   TrackPanel-Track-GetRate.patch

That's how you know it's working. If the build still fails, it's not due 
to the patch not having been applied. It's that the patch didn't 
actually fix your issue.



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-04-15  5:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-15  0:30 [gentoo-user] /etc/portage/bashrc - patches thelma
2018-04-15  5:45 ` [gentoo-user] " Nikos Chantziaras

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox