Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 740678 - dev-games/irrlicht-1.8.4-r1 : * patch -p1 failed with /var/tmp/portage/dev-games/irrlicht-1.8.4-r1/files/irrlicht-1.8.4-remove-sy
Summary: dev-games/irrlicht-1.8.4-r1 : * patch -p1 failed with /var/tmp/portage/dev-g...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo Games
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-09-06 10:41 UTC by Toralf Förster
Modified: 2020-09-26 22:34 UTC (History)
3 users (show)

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


Attachments
emerge-info.txt (emerge-info.txt,16.07 KB, text/plain)
2020-09-06 10:41 UTC, Toralf Förster
Details
dev-games:irrlicht-1.8.4-r1:20200906-103405.log (dev-games:irrlicht-1.8.4-r1:20200906-103405.log,3.19 KB, text/plain)
2020-09-06 10:41 UTC, Toralf Förster
Details
emerge-history.txt (emerge-history.txt,118.59 KB, text/plain)
2020-09-06 10:41 UTC, Toralf Förster
Details
environment (environment,56.02 KB, text/plain)
2020-09-06 10:41 UTC, Toralf Förster
Details
etc.portage.tbz2 (etc.portage.tbz2,14.64 KB, application/x-bzip)
2020-09-06 10:41 UTC, Toralf Förster
Details
logs.tbz2 (logs.tbz2,5.75 KB, application/x-bzip)
2020-09-06 10:41 UTC, Toralf Förster
Details
temp.tbz2 (temp.tbz2,14.79 KB, application/x-bzip)
2020-09-06 10:41 UTC, Toralf Förster
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Toralf Förster gentoo-dev 2020-09-06 10:41:03 UTC
 [ !! ]
 * ERROR: dev-games/irrlicht-1.8.4-r1::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/dev-games/irrlicht-1.8.4-r1/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch
 * 
 * Call stack:
 *               ebuild.sh, line  125:  Called src_prepare

  -------------------------------------------------------------------

  This is an unstable amd64 chroot image at a tinderbox (==build bot)
  name: 17.1_desktop_plasma_systemd-abi32+64-20200903-031915

  -------------------------------------------------------------------

gcc-config -l:
 [1] x86_64-pc-linux-gnu-7.3.1
 [2] x86_64-pc-linux-gnu-10.2.0 *
clang version 10.0.1 
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir: /usr/lib/llvm/10/bin
/usr/lib/llvm/10
10.0.1
Available Python interpreters, in order of preference:
  [1]   python3.7
  [2]   python3.9 (fallback)
  [3]   python3.8 (fallback)
  [4]   python2.7 (fallback)
Available Ruby profiles:
  [1]   ruby25 (with Rubygems) *
Available Rust versions:
  [1]   rust-1.46.0 *
The following VMs are available for generation-2:
*)	IcedTea JDK 3.16.0 [icedtea-bin-8]
2)	JamVM JDK 2.0.0 [jamvm]
Available Java Virtual Machines:
  [1]   icedtea-bin-8  system-vm
  [2]   jamvm 

The Glorious Glasgow Haskell Compilation System, version 8.8.4

  timestamp(s) of HEAD at this tinderbox image:
/var/db/repos/gentoo	Sun Sep  6 10:05:32 AM UTC 2020

emerge -qpvO dev-games/irrlicht
[ebuild  N    ] dev-games/irrlicht-1.8.4-r1  USE="-debug -doc -static-libs"
Comment 1 Toralf Förster gentoo-dev 2020-09-06 10:41:04 UTC
Created attachment 658732 [details]
emerge-info.txt
Comment 2 Toralf Förster gentoo-dev 2020-09-06 10:41:06 UTC
Created attachment 658734 [details]
dev-games:irrlicht-1.8.4-r1:20200906-103405.log
Comment 3 Toralf Förster gentoo-dev 2020-09-06 10:41:08 UTC
Created attachment 658736 [details]
emerge-history.txt
Comment 4 Toralf Förster gentoo-dev 2020-09-06 10:41:09 UTC
Created attachment 658738 [details]
environment
Comment 5 Toralf Förster gentoo-dev 2020-09-06 10:41:11 UTC
Created attachment 658740 [details]
etc.portage.tbz2
Comment 6 Toralf Förster gentoo-dev 2020-09-06 10:41:12 UTC
Created attachment 658742 [details]
logs.tbz2
Comment 7 Toralf Förster gentoo-dev 2020-09-06 10:41:13 UTC
Created attachment 658744 [details]
temp.tbz2
Comment 8 Joni Kemppainen 2020-09-13 12:49:47 UTC
The code line that the patch remove-sys-sysctl.h tries to remove, is removed from the irrlicht upstream already. So after dropping out the patch, ie. commenting out the line

    "${FILESDIR}/${P}-remove-sys-sysctl.h.patch"

in the ebuild, irrlicht builds fine.
Comment 9 James Ashdown 2020-09-17 21:08:41 UTC
If you read dev-games:irrlicht-1.8.4-r1:20200906-103405.log, you'll find that the error is due to "different line endings". The files/irrlicht-1.8.4-remove-sys-sysctl.h.patch has Unix line endings (LF) and the source file has DOS line endings (CRLF).

Unfortunately, we're also pulling in patches from https://dev.gentoo.org/~mgorny/ which has CRLF line endings to match the source. So either we need to convert files/irrlicht-1.8.4-remove-sys-sysctl.h.patch to use CRLF, or dos2unix both the source tree and the mgorny patchset during src_unpack().

Yes, the remove-sys-sysctl patch is not necessary for upstream trunk, but that hasn't made its way to a release yet.
Comment 10 Larry the Git Cow gentoo-dev 2020-09-26 22:34:27 UTC
The bug has been closed via the following commit(s):

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

commit 071d4cef4eb389c5c85d020abdc22ad542edc6b1
Author:     Zac Medico <zmedico@gentoo.org>
AuthorDate: 2020-09-26 22:32:40 +0000
Commit:     Zac Medico <zmedico@gentoo.org>
CommitDate: 2020-09-26 22:34:21 +0000

    dev-games/irrlicht: Fix eapply failure due to trailing CRs
    
    (Stripping trailing CRs from patch; use --binary to disable.)
    patching file source/Irrlicht/COSOperator.cpp
    Hunk #1 FAILED at 13 (different line endings).
    1 out of 1 hunk FAILED -- saving rejects to file source/Irrlicht/COSOperator.cpp.rej
    
    Closes: https://bugs.gentoo.org/740678
    Package-Manager: Portage-3.0.8, Repoman-3.0.1
    Signed-off-by: Zac Medico <zmedico@gentoo.org>

 dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild | 6 ++++++
 1 file changed, 6 insertions(+)