Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 756367 - dev-lang/duktape-2.6.0: fails to apply patch
Summary: dev-lang/duktape-2.6.0: fails to apply patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: ARM Linux
: Normal normal (vote)
Assignee: Ian Whyman (thev00d00) (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-11-24 19:12 UTC by Stefan Langenmaier
Modified: 2020-11-24 21:39 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
emerge --info (file_756367.txt,5.03 KB, text/plain)
2020-11-24 19:12 UTC, Stefan Langenmaier
Details
build.log (file_756367.txt,2.15 KB, text/plain)
2020-11-24 19:14 UTC, Stefan Langenmaier
Details
0001-dev-lang-duktape-fix-respect-tc-env-patch.patch (0001-dev-lang-duktape-fix-respect-tc-env-patch.patch,2.47 KB, patch)
2020-11-24 21:32 UTC, Ionen Wolkens
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Stefan Langenmaier 2020-11-24 19:12:58 UTC
Created attachment 674749 [details]
emerge --info

I cannot emerge the package as it fails very early:

 * Applying duktape-2.6.0-respect-tc-env.patch ...
patching file Makefile
Hunk #3 FAILED at 85.
1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej
 [ !! ]
 * ERROR: dev-lang/duktape-2.6.0::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/dev-lang/duktape-2.6.0/files/duktape-2.6.0-respect-tc-env.patch
 * 
 * Call stack:
 *               ebuild.sh, line  125:  Called src_prepare
 *             environment, line 1077:  Called default
 *      phase-functions.sh, line  855:  Called default_src_prepare
 *      phase-functions.sh, line  920:  Called __eapi6_src_prepare
 *             environment, line  151:  Called eapply '/var/tmp/portage/dev-lang/duktape-2.6.0/files/duktape-2.6.0-respect-tc-env.patch'
 *             environment, line  411:  Called _eapply_patch '/var/tmp/portage/dev-lang/duktape-2.6.0/files/duktape-2.6.0-respect-tc-env.patch'
 *             environment, line  349:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/dev-lang/duktape-2.6.0/files/duktape-2.6.0-respect-tc-env.patch'
 *   isolated-functions.sh, line  112:  Called die
Comment 1 Stefan Langenmaier 2020-11-24 19:14:03 UTC
Created attachment 674752 [details]
build.log
Comment 2 Ionen Wolkens gentoo-dev 2020-11-24 21:09:59 UTC
ebuild has:

    # Set lib folder
    sed -i "s#(INSTALL_PREFIX)/lib#(INSTALL_PREFIX)/$(get_libdir)#" \
        Makefile.sharedlibrary || die

For current profile that will be "(INSTALL_PREFIX)/lib" but patch has harcoded:

-       [...] -L$(INSTALL_PREFIX)/lib64 [...]
Comment 3 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2020-11-24 21:17:17 UTC
(In reply to Ionen Wolkens from comment #2)
> ebuild has:
> 
>     # Set lib folder
>     sed -i "s#(INSTALL_PREFIX)/lib#(INSTALL_PREFIX)/$(get_libdir)#" \
>         Makefile.sharedlibrary || die
> 
> For current profile that will be "(INSTALL_PREFIX)/lib" but patch has
> harcoded:
> 
> -       [...] -L$(INSTALL_PREFIX)/lib64 [...]

I have a feeling I meant to commit the apply order to be the other way around or something. I'll look at this later.
Comment 4 Ionen Wolkens gentoo-dev 2020-11-24 21:32:08 UTC
Created attachment 674758 [details, diff]
0001-dev-lang-duktape-fix-respect-tc-env-patch.patch

I was fixing it up myself just now, so here's a patch if wanted
Comment 5 Larry the Git Cow gentoo-dev 2020-11-24 21:39:55 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe4a48240576cba047811227db08e26bdf680b8b

commit fe4a48240576cba047811227db08e26bdf680b8b
Author:     Ionen Wolkens <sudinave@gmail.com>
AuthorDate: 2020-11-24 21:27:53 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2020-11-24 21:39:51 +0000

    dev-lang/duktape: fix respect-tc-env patch
    
    Closes: https://bugs.gentoo.org/756367
    Package-Manager: Portage-3.0.10, Repoman-3.0.2
    Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
    Signed-off-by: Sam James <sam@gentoo.org>

 dev-lang/duktape/duktape-2.6.0.ebuild                     |  4 ++--
 dev-lang/duktape/files/duktape-2.6.0-respect-tc-env.patch | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)