Patching binutil/gcc with WinAVR

Log in or register to post comments
Go To Last Post
9 posts / 0 new
Author
Message
atomicdog
atomicdog's picture
Level: Posting Freak
Joined: Mon. Jan 14, 2008
Posts: 1171 View posts
Location: San Diego
#1
Posted by atomicdog: Sun. Oct 19, 2008 - 07:29 AM
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

What's the best/fastest way to apply the patches in C:\WinAVR-20080610\source?
What am I doing wrong?
I've tried...

$ *.patch > patch --dry-run

but I get errors when the patch files are parsed.

./00-binutils-2.18-version-WinAVR.patch: WinAVR: command not found
./00-binutils-2.18-version-WinAVR.patch: Need: command not found
./00-binutils-2.18-version-WinAVR.patch: ---------------------------------------
-----------------------------------------: command not found
diff: ../binutils-2.18.orig/bfd/Makefile.am: No such file or directory
diff: ./bfd/Makefile.am: No such file or directory
./00-binutils-2.18-version-WinAVR.patch: ---: command not found
./00-binutils-2.18-version-WinAVR.patch: +++: command not found
./00-binutils-2.18-version-WinAVR.patch: @@: command not found
./00-binutils-2.18-version-WinAVR.patch: srcdir: command not found
./00-binutils-2.18-version-WinAVR.patch: srcdir: command not found
./00-binutils-2.18-version-WinAVR.patch: bfdver.h:: command not found
./00-binutils-2.18-version-WinAVR.patch: @echo: command not found
./00-binutils-2.18-version-WinAVR.patch: line 23: syntax error: unexpected end of file

~~John
TWI C source code

Tags:

Tools, Compilers and General Programming
Top
EW
EW's picture
Level: Raving Lunatic
Joined: Thu. Mar 1, 2001
Posts: 4914 View posts
Location: Rocky Mountains
Posted by EW: Mon. Oct 20, 2008 - 04:49 AM
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

What are you trying to accomplish?

Eric Weddington
www.linkedin.com/in/ericweddington/

Top
Tuomas
Tuomas's picture
Level: Hangaround
Joined: Wed. May 23, 2007
Posts: 126 View posts
Location: Helsinki, Finland
Posted by Tuomas: Mon. Oct 20, 2008 - 08:52 AM
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

Try something like

$ patch --dry-run < fixbug.patch

instead. Normally you also need option -p0 or -p1

Top
atomicdog
atomicdog's picture
Level: Posting Freak
Joined: Mon. Jan 14, 2008
Posts: 1171 View posts
Location: San Diego
Posted by atomicdog: Mon. Oct 20, 2008 - 04:09 PM
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

Quote:
What are you trying to accomplish?

I want to patch the source for binutil and gcc with the patch files in WinAVR but I don't know what command line switches I need to use or what I'm doing wrong.

~~John
TWI C source code

Top
Gold Markclawson
clawson's picture
Level: Moderator
Joined: Mon. Jul 18, 2005
Posts: 104798 View posts
Location: (using avr-gcc in) Finchingfield, Essex, England
Posted by clawson: Mon. Oct 20, 2008 - 04:38 PM
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

Well presumably the thing it's complaining about in 00-binutils-2.18-version-WinAVR.patch is the fact that the first lines say:

Quote:
WinAVR specific only
Need configure options like GCC.
--------------------------------------------------------------------------------

And if you look at what it's doing it appears to be trying to hard code the text " (WinAVR 20080610)" onto the version string - not sure why you'd want to do this on a variant of binutils that wasn't for use in WinAVR 20080610 though?

Top
atomicdog
atomicdog's picture
Level: Posting Freak
Joined: Mon. Jan 14, 2008
Posts: 1171 View posts
Location: San Diego
Posted by atomicdog: Tue. Oct 21, 2008 - 05:26 AM
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

It doesn't like parsing more then one file for some reason.

This did not work.

Quote:
patch -p0 < *.patch

I can do one at a time...

Quote:
patch -p0 -i 00-binutils-2.18-version-WinAVR.patch

I got version binutils-2.18.50 somewhere on the net but it's the wrong version (doesn't patch properly) I re-downloaded binutils-2.18 which seems to patch fine.

~~John
TWI C source code

Top
EW
EW's picture
Level: Raving Lunatic
Joined: Thu. Mar 1, 2001
Posts: 4914 View posts
Location: Rocky Mountains
Posted by EW: Tue. Oct 21, 2008 - 02:49 PM
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

Did you read the README file in the WinAVR CVS repository regarding the patches?

Why do you want to recreate WinAVR anyway? What problem are you trying to solve?

Eric Weddington
www.linkedin.com/in/ericweddington/

Top
atomicdog
atomicdog's picture
Level: Posting Freak
Joined: Mon. Jan 14, 2008
Posts: 1171 View posts
Location: San Diego
Posted by atomicdog: Wed. Oct 22, 2008 - 12:03 AM
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

EW wrote:
...
Why do you want to recreate WinAVR anyway? What problem are you trying to solve?

No problems, I want to learn how the gcc compiler works.
Then when I do have a problem I'll have a better understanding of what might be the cause (and maybe even try to fix it :)).

~~John
TWI C source code

Top
EW
EW's picture
Level: Raving Lunatic
Joined: Thu. Mar 1, 2001
Posts: 4914 View posts
Location: Rocky Mountains
Posted by EW: Wed. Oct 22, 2008 - 02:38 AM
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

Ah, ok! :-)

And, my apologies. The README file did not contain information about the best way to apply these patches. For some reason I thought it had.

I use this in my build script:

            for i in $startdir/patches/$project/$version/*.patch ; do
                echo "********************************************************************************" | tee -a patch.log
                echo "$i" | tee -a patch.log
                patch -b --verbose --strip=0 --input="$i" 2>&1 | tee -a patch.log
                grep "FAIL" patch.log && abort "Patching failed."
            done

Where:
$startdir = Some directory that contains those specified subdirectories
$project = software project, such as binutils, gcc, avr-libc, insight, etc.
$version = version of the $project, such as 2.18 for binutils

Note that the 'patches' subdirectory in the script snippet above matches the 'patches' module in the WinAVR CVS repository.

The main point is the 'patch' command. The switches that I use are:
-b = Create backup
--verbose = Enable verbose output
-strip=0 = Do not strip any leading directories. This means that you should be at the top level of each project's directory tree when patching. All WinAVR patches are generated to use --strip=0.
--input= = The actual patch filename that is used for input.

HTH
Eric Weddington

Eric Weddington
www.linkedin.com/in/ericweddington/

Top