Summary:ASTERISK-08219: [patch] clean up some compile issues on FreeBSD (6.1)
Reporter:Paul Belanger (pabelanger)Labels:
Date Opened:2006-11-30 11:42:44.000-0600Date Closed:2006-12-03 00:36:12.000-0600
Versions:Frequency of
Environment:Attachments:( 0) check_for_wget.patch
( 1) makefiles.patch
Description:The attached patch just fixes some grammar errors about running 'make', on FreeBSD it is 'gmake'

I have also updated the sounds/Makefile to now use fetch, since wget is not a default binary installed on FreeBSD.
Comments:By: Paul Belanger (pabelanger) 2006-11-30 11:44:21.000-0600

This patch could be expaned to include all BSD flavors, but I'm not sure if wget is a default install in openBSD and netBSD.  I would assume it is not installed, but if somebody could check it would be great.


By: Russell Bryant (russell) 2006-11-30 11:54:57.000-0600

Perhaps we can just add a simple test in the configure script to see if wget is installed.  Then, if it's not, check for fetch.  Then, put the result in a variable.  If neither was found, the configure script should error out since the installation will not work properly.

By: Paul Belanger (pabelanger) 2006-11-30 12:01:13.000-0600

Russell - even better.  I take since you assigned the bug to you you'll create a patch?  I have not problem submitting one.


By: Russell Bryant (russell) 2006-11-30 12:15:30.000-0600

I have uploaded a patch to implement what I have suggested.  If you could try it out, I would appreciate it.

By: Paul Belanger (pabelanger) 2006-11-30 13:24:18.000-0600

russell - having some troubles patching against revision 48142
svn checkout http://svn.digium.com/svn/asterisk/trunk --revision 48142 asterisk-trunk

patch < ../check_for_wget.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
|Index: configure
|--- configure  (revision 48142)
|+++ configure  (working copy)
Patching file configure using Plan A...
Hunk #1 failed at 1.
Hunk #2 succeeded at 691.
Hunk #3 succeeded at 5578 (offset 8 lines).
Hunk #4 failed at 31777.
Hunk ASTERISK-1 failed at 31826.
Hunk ASTERISK-2 failed at 31923.
Hunk ASTERISK-3 failed at 31964.
Hunk ASTERISK-4 failed at 32005.
6 out of 8 hunks failed--saving rejects to configure.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
|Index: configure.ac
|--- configure.ac       (revision 48142)
|+++ configure.ac       (working copy)
Patching file configure.ac using Plan A...
Hunk #1 succeeded at 155 (offset 6 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
|Index: sounds/Makefile
|--- sounds/Makefile    (revision 48142)
|+++ sounds/Makefile    (working copy)
Patching file sounds/Makefile using Plan A...
Hunk #1 succeeded at 13.
Hunk #2 succeeded at 58.
Hunk #3 succeeded at 66.
Hunk #4 succeeded at 74.
Hunk ASTERISK-1 succeeded at 82.
Hunk ASTERISK-2 succeeded at 90.
Hunk ASTERISK-3 succeeded at 98.
Hunk ASTERISK-4 succeeded at 106.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
|Index: makeopts.in
|--- makeopts.in        (revision 48142)
|+++ makeopts.in        (working copy)
Patching file makeopts.in using Plan A...
Hunk #1 succeeded at 19.

Seems your version of configure is different that the svn version. Suggestions?

By: Jason Parker (jparker) 2006-12-01 14:05:34.000-0600

If you have autoconf/etc installed, you can safely ignore the errors in patching configure, and just run ./bootstrap.sh - that would be done before committing anyhow.

By: Russell Bryant (russell) 2006-12-01 16:37:48.000-0600

Ah, well, the reason was because I generated the patch against the 1.4 branch.  In any case, I'm fairly confident it should be good to go.  I'll go ahead and commit to the 1.4 branch and the trunk.  If you have any further issues, or if I missed anything, feel free to reopen this issue.

By: Russell Bryant (russell) 2006-12-01 17:21:36.000-0600

This has been committed in revisions 48190 and 48191, thanks!

By: Paul Belanger (pabelanger) 2006-12-02 21:53:18.000-0600

russell: Will have to reopen the issue, we need to also clear the ${WGET_ARGS} variable if we use fetch, since "--continue" is not a valid argument for fetch.

fetch: illegal option -- -
usage: fetch [-146AFMPRUadlmnpqrsv] [-N netrc] [-o outputfile]
            [-S bytes] [-B bytes] [-T seconds] [-w seconds]
            [-h host -f file [-c dir] | URL ...]

By: Russell Bryant (russell) 2006-12-03 00:29:35.000-0600

oops, I didn't catch that in your original patch.  I'll fix it now ...

By: Russell Bryant (russell) 2006-12-03 00:36:12.000-0600

This has been fixed in revisions 48223 and 48224, thanks!