Skip to contentSkip to conversation

Pull request for branch sed-fix

GIT PULL New Thomas Petazzoni 2 participants 5 messages Aug 4, 2009

lore
Share & tools
lore
#0 lore raw

The following changes since commit 5b72dda69f72e1953dfc7987dd1b418e1afe79a4:
Peter Korsgaard (1):

        buildroot: fix fallout after qtopia4 -> qt rename

are available in the git repository at:

git://git.busybox.net/~tpetazzoni/git/buildroot sed-fix

Thomas Petazzoni (1):
sed: fix compilation with external toolchains

 CHANGES            |    1 +
 package/sed/sed.mk |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

Thanks,

Signature · 1 line
Thomas Petazzoni
#1 lore raw

PATCH 1/1 sed: fix compilation with external toolchains

Since CC is already passed in TARGET_CONFIGURE_OPTS at ./configure time, there's no point in overriding it with a wrong value at compilation time. This breaks external toolchain builds since CC=$(TARGET_CC) is wrong because it excludes the mandatory --sysroot option.

Fixes bug #525

---
 CHANGES            |    1 +
 package/sed/sed.mk |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
CHANGES +1 -0
index 0c1f667..36b9b45 100644
@@ -77,6 +77,7 @@
 	#497: OpenSSL RSA key generation hangs on x86_64
 	#509: Bump sqlite package to 3.6.16
 	#523: pciutils broken with external toolchain
+	#525: sed broken with external toolchain
 	#533: Update gamin to 0.1.10 to fix compilation
 
 2009.05, Released June 1st, 2009:
package/sed/sed.mk +1 -1
index 9caefed..07f4b32 100644
@@ -135,7 +135,7 @@ $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
 	touch $@
 
 $(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(SED_DIR2)
+	$(MAKE) -C $(SED_DIR2)
 
 # This stuff is needed to work around GNU make deficiencies
 sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
Signature · 1 line
1.6.0.4
#2 lore raw

PATCH 1/1 sed: fix compilation with external toolchains

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Since CC is already passed in TARGET_CONFIGURE_OPTS at ./configure Thomas> time, there's no point in overriding it with a wrong value at Thomas> compilation time. This breaks external toolchain builds since Thomas> CC=$(TARGET_CC) is wrong because it excludes the mandatory --sysroot Thomas> option.

Thomas> Fixes bug #525

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---

 Thomas>  CHANGES            |    1 +
 Thomas>  package/sed/sed.mk |    2 +-

Thomas> 2 files changed, 2 insertions(+), 1 deletions(-)

Thomas> diff --git a/CHANGES b/CHANGES
Thomas> index 0c1f667..36b9b45 100644
Thomas> --- a/CHANGES
Thomas> +++ b/CHANGES
Thomas> @@ -77,6 +77,7 @@

 Thomas>  	#497: OpenSSL RSA key generation hangs on x86_64
 Thomas>  	#509: Bump sqlite package to 3.6.16
 Thomas>  	#523: pciutils broken with external toolchain

Thomas> + #525: sed broken with external toolchain

This should preferably go after -rc1, but I'll fix that for you.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 sed: fix compilation with external toolchains

Le Tue, 04 Aug 2009 22:57:33 +0200,
Peter Korsgaard <[email protected]> a ?crit :

Quoted 1 line

This should preferably go after -rc1, but I'll fix that for you.

Ok, sorry. I also didn't see your mail before sending the gzip fix. Will do for the next issues, though.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com
#4 lore raw
In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The following changes since commit 5b72dda69f72e1953dfc7987dd1b418e1afe79a4:
Thomas> Peter Korsgaard (1):
Thomas> buildroot: fix fallout after qtopia4 -> qt rename

Thomas> are available in the git repository at:

Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot sed-fix

Thomas> Thomas Petazzoni (1):
Thomas> sed: fix compilation with external toolchains

Pulled and pushed - Thanks!

Signature · 1 line
Bye, Peter Korsgaard