Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 54902 - epatch applies arch-specific patches on the wrong arch
Summary: epatch applies arch-specific patches on the wrong arch
Status: VERIFIED NEEDINFO
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: x86 Linux
: High major (vote)
Assignee: SpanKY
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-06-23 10:10 UTC by William Yang
Modified: 2004-07-23 23:31 UTC (History)
2 users (show)

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


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description William Yang 2004-06-23 10:10:54 UTC
# emerge xfree
[...]
 *   0280_hppa_4.3.0-build-zlib-with-fpic.patch...
 
 * A dry-run of patch command succeeded, but actually
 * applying the patch failed!
 
 * Failed Patch: 0280_hppa_4.3.0-build-zlib-with-fpic.patch!
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/xfree-4.3.0-r5/temp/0280_hppa_4.3.0-build-zlib-with-fpic.patch-21904.out
 
 
!!! ERROR: x11-base/xfree-4.3.0-r5 failed.
!!! Function epatch, Line 322, Exitcode 0
!!! Failed Patch: 0280_hppa_4.3.0-build-zlib-with-fpic.patch!


# cat 0280_hppa_4.3.0-build-zlib-with-fpic.patch-23658.out
***** 0280_hppa_4.3.0-build-zlib-with-fpic.patch *****
 
======================================================
 
PATCH COMMAND:  patch -p0 -g0 < /var/tmp/portage/xfree-4.3.0-r5/work/patch/0280_hppa_4.3.0-build-zlib-with-fpic.patch
 
======================================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- xc/lib/zlib/Imakefile.orig 2003-06-13 18:05:34.000000000 -0400
|+++ xc/lib/zlib/Imakefile      2003-06-13 18:05:45.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
======================================================
 
PATCH COMMAND:  patch -p1 -g0 < /var/tmp/portage/xfree-4.3.0-r5/work/patch/0280_hppa_4.3.0-build-zlib-with-fpic.patch
 
======================================================
patching file lib/zlib/Imakefile
Hunk #1 succeeded at 36 with fuzz 2 (offset 2 lines).
======================================================
 
ACTUALLY APPLYING 0280_hppa_4.3.0-build-zlib-with-fpic.patch...
 
======================================================
patching file lib/zlib/Imakefile
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file lib/zlib/Imakefile.rej


Reproducible: Always
Steps to Reproduce:
1. emerge xfree
2.
3.

Actual Results:  
# emerge xfree
Calculating dependencies ...done!
>>> emerge (1 of 1) x11-base/xfree-4.3.0-r5 to /
shell-init: could not get current directory: getcwd: cannot access parent
directories: No such file or directory
shell-init: could not get current directory: getcwd: cannot access parent
directories: No such file or directory
>>> md5 src_uri ;-) X430src-1.tgz
>>> md5 src_uri ;-) X430src-2.tgz
>>> md5 src_uri ;-) X430src-3.tgz
>>> md5 src_uri ;-) X430src-4.tgz
>>> md5 src_uri ;-) X430src-5.tgz
>>> md5 src_uri ;-) XFree86-4.3.0-patches-2.1.25.4.tar.bz2
>>> md5 src_uri ;-) xfree86-dri-resume-v8.patch
>>> md5 src_uri ;-) xf86Wacom.c.gz
>>> md5 src_uri ;-) savage-1.1.27t.zip
>>> md5 src_uri ;-) sis_drv_src_311003-1.tar.gz
>>> md5 src_uri ;-) synaptics-0.12.0.tar.bz2
>>> md5 src_uri ;-) gemini-koi8-u.tar.bz2
>>> md5 src_uri ;-) eurofonts-X11.tar.bz2
>>> md5 src_uri ;-) xfsft-encodings.tar.bz2
>>> md5 src_uri ;-) XFree86-compose.dir-0.1.bz2
>>> md5 src_uri ;-) XFree86-en_US.UTF-8.old.bz2
>>> md5 src_uri ;-) XFree86-locale.alias.bz2
>>> md5 src_uri ;-) XFree86-locale.dir.bz2
>>> md5 src_uri ;-) gentoo-cursors-tad-0.3.1.tar.bz2
>>> md5 src_uri ;-) andale32.exe
>>> md5 src_uri ;-) arial32.exe
>>> md5 src_uri ;-) arialb32.exe
>>> md5 src_uri ;-) comic32.exe
>>> md5 src_uri ;-) courie32.exe
>>> md5 src_uri ;-) georgi32.exe
>>> md5 src_uri ;-) impact32.exe
>>> md5 src_uri ;-) times32.exe
>>> md5 src_uri ;-) trebuc32.exe
>>> md5 src_uri ;-) verdan32.exe
>>> md5 src_uri ;-) webdin32.exe
>>> Unpacking source...
>>> Unpacking X430src-1.tgz to /var/tmp/portage/xfree-4.3.0-r5/work
>>> Unpacking X430src-2.tgz to /var/tmp/portage/xfree-4.3.0-r5/work
>>> Unpacking X430src-3.tgz to /var/tmp/portage/xfree-4.3.0-r5/work
>>> Unpacking X430src-4.tgz to /var/tmp/portage/xfree-4.3.0-r5/work
>>> Unpacking X430src-5.tgz to /var/tmp/portage/xfree-4.3.0-r5/work
>>> Unpacking XFree86-4.3.0-patches-2.1.25.4.tar.bz2 to
/var/tmp/portage/xfree-4.3.0-r5/work
>>> Unpacking gentoo-cursors-tad-0.3.1.tar.bz2 to
/var/tmp/portage/xfree-4.3.0-r5/work
nls
>>> Unpacking gemini-koi8-u.tar.bz2 to /var/tmp/portage/xfree-4.3.0-r5/work
>>> Unpacking eurofonts-X11.tar.bz2 to /var/tmp/portage/xfree-4.3.0-r5/work
>>> Unpacking xfsft-encodings.tar.bz2 to /var/tmp/portage/xfree-4.3.0-r5/work
 * Updating Savage driver...                                              [ ok ]
* Updating SiS driver...                                                 [ ok ]
* Applying various patches (bugfixes/updates)...
 *   0100_all_4.3.0-xf-4_3-branch-01-19.patch...                          [ ok ]
*   0119_all_4.3.0-exports-lib-v2.patch...                               [ ok ]
*   0121_all_4.2.99.3-build-libs-with-pic.patch...                       [ ok ]
*   0125_all_4.0-broken-includes.patch...                                [ ok ]
*   0126_all_4.2.99.3-startx.patch...                                    [ ok ]
*   0127_all_4.3.0-makefile-fastbuild.patch...                           [ ok ]
*   0128_all_4.2.0-imake-tmpdir.patch...                                 [ ok ]
*   0129_all_startx-nolisten-tcp.patch...                                [ ok ]
*   0130_all_4.2.1-fix-shared-libXau-link.v2.patch...                    [ ok ]
*   0131_all_4.2.99.3-Imake-make-icondir-configable.patch...             [ ok ]
*   0132_all_4.2.1-libX11-build-order-fix.patch...                       [ ok ]
*   0135_all_4.3.0-gb18030-xtt-enc-20020207.patch...                     [ ok ]
*   0138_all_4.2.1-gcc32-internal-compiler-error.patch...                [ ok ]
*   0140_all_4.2.1-xf86_h-missing-bracket-fix.patch...                   [ ok ]
*   0142_all_4.2.99.1-libICE-remove-bogus-delay.patch...                 [ ok ]
*   0150_all_4.2.99.1-kdrive-posix-sigaction.patch...                    [ ok ]
*   0155_all_4.3.0-Xi-Xinitthreads-locking-bug.patch...                  [ ok ]
*   0165_all_4.2.99.901-dont-install-Xcms.txt.patch...                   [ ok ]
*   0170_all_4.2.99.901-doc-extensions-fix.patch...                      [ ok ]
*   0175_all_4.0.2-xfree86.lst.patch...                                  [ ok ]
*   0180_amd64_4.2.99.4-glx-nopic.patch...                               [ ok ]
*   0181_amd64_4.3.0-nolib64.patch...                                    [ ok ]
*   0182_all_4.3.0-redhat-xlib-linux-fix-avoiding-substance-abuse-job.p  [ ok ]
*   0185_all_4.3.0-mesa-4.0.4-branch.patch...                            [ ok ]
*   0191_all_4.3.0-xlib-dual-malloc-memleak-lcPrTxt.c.patch...           [ ok ]
*   0192_all_4.3.0-missing-lib-sharedreqs.patch...                       [ ok ]
*   0199_all_4.2.0-die-ugly-pattern-die-die-die.patch...                 [ ok ]
*   0200_all_4.0.3-xset-man-update.patch...                              [ ok ]
*   0202_all_4.2.1-gl-matrix-man-fixes.patch...                          [ ok ]
*   0205_all_4.2.99.3-xman-bzip2.patch...                                [ ok ]
*   0207_all_4.3.0-xman-no-grotty-sgr.patch...                           [ ok ]
*   0208_all_4.2.99.901-fix-xfree86-man-version-string.patch...          [ ok ]
*   0225_all_4.3.0-xwrapper.patch...                                     [ ok ]
*   0230_all_4.3.0-craptastic-cast.patch...                              [ ok ]
*   0250_alpha_4.1.0-glFrustum-fixie.patch...                            [ ok ]
*   0251_alpha_4.3.0-build-zlib-with-fpic.patch...                       [ ok ]
*   0260_ia64_4.2.99.1-gcc3.1.patch...                                   [ ok ]
*   0262_ia64_4.3.0-ia64-new-elfloader-relocations.patch...              [ ok ]
*   0263_ia64_4.3.0-elfloader-dup-case.patch...                          [ ok ]
*   0270_s390_4.1.0-cpp.patch...                                         [ ok ]
*   0280_hppa_4.3.0-build-zlib-with-fpic.patch...
 
 * A dry-run of patch command succeeded, but actually
 * applying the patch failed!
 
 * Failed Patch: 0280_hppa_4.3.0-build-zlib-with-fpic.patch!
 *
 * Include in your bugreport the contents of:
 *
 *  
/var/tmp/portage/xfree-4.3.0-r5/temp/0280_hppa_4.3.0-build-zlib-with-fpic.patch-21904.out
 
 
!!! ERROR: x11-base/xfree-4.3.0-r5 failed.
!!! Function epatch, Line 322, Exitcode 0
!!! Failed Patch: 0280_hppa_4.3.0-build-zlib-with-fpic.patch!


Expected Results:  
applied the patch and emerged the package.

# emerge info
Portage 2.0.50-r8 (default-x86-2004.0, gcc-3.3.2, glibc-2.3.3.20040420-r0, 2.4.26)
=================================================================
System uname: 2.4.26 i686 Intel(R) Celeron(R) CPU 1.80GHz
Gentoo Base System version 1.4.16
Autoconf: sys-devel/autoconf-2.59-r3
Automake: sys-devel/automake-1.8.3
ACCEPT_KEYWORDS="x86"
AUTOCLEAN="yes"
CFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer"
CHOST="i586-pc-linux-gnu"
COMPILER="gcc3"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3/share/config
/usr/share/config /var/bind /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs ccache sandbox"
GENTOO_MIRRORS="http://mirror.datapipe.net/gentoo http://128.213.5.34/gentoo/
ftp://mirrors.sec.informatik.tu-darmstadt.de/gentoo/
http://mirror.datapipe.net/gentoo"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY=""
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X apm arts avi berkdb crypt cups encode foomaticdb gdbm gif gnome gpm gtk
gtk2 imlib jpeg kde libg++ libwww mad mikmod motif mpeg mysql ncurses nls
oggvorbis opengl oss pam pdflib perl png python qt quicktime readline sdl slang
spell ssl svga tcpd truetype x86 xml2 xmms xv zlib"
Comment 1 Guy Martin (RETIRED) gentoo-dev 2004-06-23 12:23:41 UTC
Mhh odd, this always worked.

Btw I saw bug report about a buggy version of the patch program.
Which version of patch do you have ?
Comment 2 Nicholas Jones (RETIRED) gentoo-dev 2004-07-11 09:20:38 UTC
Why is dev-portage on this bug? Tossing it back.
Comment 3 Donnie Berkholz (RETIRED) gentoo-dev 2004-07-11 16:40:18 UTC
Mike, you want this?
Comment 4 SpanKY gentoo-dev 2004-07-11 17:13:57 UTC
well we need some feedback on this
Comment 5 SpanKY gentoo-dev 2004-07-23 23:31:19 UTC
no info here