[Buildroot] [RFC/PATCH 1/3] fix buildroot sed handling on Mac OS X

[Buildroot] [RFC/PATCH 1/3] fix buildroot sed handling on Mac OS X

[Heikki Lindholm]

Improve the checking of sed by adding some common GNU sed installation 
names (gsed/gnused), checking for a basic OS X sed feature in command 
line option handling, checking the actual result of the sed run against 
the expected result, and placing common code for the check under 
toolchain/dependencies/.

-- Heikki Lindholm
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: buildroot-070223-sed-check.patch
Url: http://busybox.net/lists/buildroot/attachments/20070223/cb11255e/attachment.pot 

[Buildroot] [RFC/PATCH 1/3] fix buildroot sed handling on Mac OS X

[Heikki Lindholm]

Improve the checking of sed by adding some common GNU sed installation
names (gsed/gnused), checking for a basic OS X sed feature in command
line option handling, checking the actual result of the sed run against
the expected result, and placing common code for the check under
toolchain/dependencies/.

-- Heikki Lindholm

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: buildroot-070225-sed-check.patch
Url: http://busybox.net/lists/buildroot/attachments/20070225/a7aa3d03/attachment.pot 

[Buildroot] [RFC/PATCH 1/3] fix buildroot sed handling on Mac OS X

[Bernhard Fischer]

On Sun, Feb 25, 2007 at 01:22:38PM +0200, Heikki Lindholm wrote:
>Improve the checking of sed by adding some common GNU sed installation
>names (gsed/gnused), checking for a basic OS X sed feature in command
>line option handling, checking the actual result of the sed run against
>the expected result, and placing common code for the check under
>toolchain/dependencies/.
>
>-- Heikki Lindholm
>

>diff -Nru buildroot/package/sed/sedcheck.sh buildroot-devel/package/sed/sedcheck.sh
>--- buildroot/package/sed/sedcheck.sh	2007-02-22 10:50:29.000000000 +0200
>+++ buildroot-devel/package/sed/sedcheck.sh	2007-02-23 17:39:04.000000000 +0200
>@@ -2,24 +2,10 @@
> 
> # Make sure the host sed supports '-i' (in-place).
> # If it doesn't, we'll build and use our own.
>+SED=$(toolchain/dependencies/check-host-sed.sh)
> 
>-if test -x /usr/bin/sed ; then
>-	SED="/usr/bin/sed"
>-else
>-	if test -x /bin/sed ; then
>-		SED="/bin/sed"
>-	else
>-		SED="sed"
>-	fi
>-fi
>-
>-echo "HELLO" > .sedtest
>-$SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1

Why don't you mv check-host-sed.sh here instead and use it in
dependencies.sh? I'd prefer it this way..

cheers,

[Buildroot] [RFC/PATCH 1/3] fix buildroot sed handling on Mac OS X

[Heikki Lindholm]

Bernhard Fischer kirjoitti:
> On Sun, Feb 25, 2007 at 01:22:38PM +0200, Heikki Lindholm wrote:
> 
>>Improve the checking of sed by adding some common GNU sed installation
>>names (gsed/gnused), checking for a basic OS X sed feature in command
>>line option handling, checking the actual result of the sed run against
>>the expected result, and placing common code for the check under
>>toolchain/dependencies/.
>>
>>-- Heikki Lindholm
>>
> 
> 
>>diff -Nru buildroot/package/sed/sedcheck.sh buildroot-devel/package/sed/sedcheck.sh
>>--- buildroot/package/sed/sedcheck.sh	2007-02-22 10:50:29.000000000 +0200
>>+++ buildroot-devel/package/sed/sedcheck.sh	2007-02-23 17:39:04.000000000 +0200
>>@@ -2,24 +2,10 @@
>>
>># Make sure the host sed supports '-i' (in-place).
>># If it doesn't, we'll build and use our own.
>>+SED=$(toolchain/dependencies/check-host-sed.sh)
>>
>>-if test -x /usr/bin/sed ; then
>>-	SED="/usr/bin/sed"
>>-else
>>-	if test -x /bin/sed ; then
>>-		SED="/bin/sed"
>>-	else
>>-		SED="sed"
>>-	fi
>>-fi
>>-
>>-echo "HELLO" > .sedtest
>>-$SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1
> 
> 
> Why don't you mv check-host-sed.sh here instead and use it in
> dependencies.sh? I'd prefer it this way..

Well. I tossed a coin on the placement. I thought checking the host sed 
would belong better to something build-framework-ish than the sed 
package. I'll do a respin of this if you like.

-- Heikki Lindholm

[Buildroot] [RFC/PATCH 1/3] fix buildroot sed handling on Mac OS X

[Bernhard Fischer]

On Thu, Mar 08, 2007 at 11:36:22PM +0200, Heikki Lindholm wrote:
>Bernhard Fischer kirjoitti:
>>On Sun, Feb 25, 2007 at 01:22:38PM +0200, Heikki Lindholm wrote:
>>
>>>Improve the checking of sed by adding some common GNU sed installation
>>>names (gsed/gnused), checking for a basic OS X sed feature in command
>>>line option handling, checking the actual result of the sed run against
>>>the expected result, and placing common code for the check under
>>>toolchain/dependencies/.

Applied. Will most likely be moved from diff to cmp since we already use
cmp (IIRC, didn't look). Care to verify if cmp is already used and if
so, use cmp instead?

TIA,

[Buildroot] [RFC/PATCH 1/3] fix buildroot sed handling on Mac OS X

[Heikki Lindholm]

Bernhard Fischer kirjoitti:
> On Thu, Mar 08, 2007 at 11:36:22PM +0200, Heikki Lindholm wrote:
> 
>>Bernhard Fischer kirjoitti:
>>
>>>On Sun, Feb 25, 2007 at 01:22:38PM +0200, Heikki Lindholm wrote:
>>>
>>>
>>>>Improve the checking of sed by adding some common GNU sed installation
>>>>names (gsed/gnused), checking for a basic OS X sed feature in command
>>>>line option handling, checking the actual result of the sed run against
>>>>the expected result, and placing common code for the check under
>>>>toolchain/dependencies/.
> 
> 
> Applied. Will most likely be moved from diff to cmp since we already use
> cmp (IIRC, didn't look). Care to verify if cmp is already used and if
> so, use cmp instead?

I found no cmp usage in buildroot. How about just using the shell as in 
the attached patch?

-- Heikki Lindholm
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: buildroot-070309-sed-diff.patch
Url: http://busybox.net/lists/buildroot/attachments/20070309/68d32a7a/attachment.pot