[Buildroot] svn commit: trunk/buildroot: package

[Buildroot] svn commit: trunk/buildroot: package

[ninevoltz at uclibc.org]

Author: ninevoltz
Date: 2008-03-12 06:07:10 -0700 (Wed, 12 Mar 2008)
New Revision: 21313

Log:
added more debugging options for packages

Modified:
   trunk/buildroot/Config.in
   trunk/buildroot/package/Makefile.in


Changeset:
Modified: trunk/buildroot/Config.in
===================================================================
--- trunk/buildroot/Config.in	2008-03-12 11:23:11 UTC (rev 21312)
+++ trunk/buildroot/Config.in	2008-03-12 13:07:10 UTC (rev 21313)
@@ -184,7 +184,44 @@
 	help
 	  This option show recent versions of packages.
 
+config BR2_ENABLE_DEBUG
+	bool "build packages with debugging symbols"
+	default n
+	help
+	  Build packages with debugging symbols
+	  enabled
+
+if BR2_ENABLE_DEBUG
 choice
+	prompt "gcc debug level"
+	default BR2_DEBUG_2
+	help
+	  Set the debug level for gcc
+
+config BR2_DEBUG_1
+	bool "debug level 1"
+	help
+	  Debug level 1 produces minimal information, enough 
+	  for making backtraces in parts of the program that 
+	  you don't plan to debug. This includes descriptions 
+	  of functions and external variables, but no information
+	  about local variables and no line numbers.
+
+config BR2_DEBUG_2
+	bool "debug level 2"
+	help
+	  The default gcc debug level is 2
+
+config BR2_DEBUG_3
+	bool "debug level 3"
+	help
+	  Level 3 includes extra information, such as all the 
+	  macro definitions present in the program. Some debuggers
+	  support macro expansion when you use -g3.
+endchoice
+endif
+
+choice
 	prompt "strip"
 	default BR2_STRIP_strip
 	help
@@ -196,12 +233,14 @@
 
 config BR2_STRIP_strip
 	bool "strip"
+	depends !BR2_ENABLE_DEBUG
 	help
 	  strip   is the normal strip command
 
 config BR2_STRIP_sstrip
 	bool "sstrip"
 	select BR2_PACKAGE_SSTRIP_HOST
+	depends !BR2_ENABLE_DEBUG
 	help
 	  sstrip  is a strip that discards more than the normal strip
 
@@ -211,15 +250,72 @@
 	  none    do not strip (only for debugging!)
 endchoice
 
-if BR2_STRIP_none
-config BR2_ENABLE_DEBUG
-	bool "build packages with debugging symbols"
-	default n
+choice
+	prompt "gcc optimization level"
+	default BR2_OPTIMIZE_0
 	help
-	  Build packages with debugging symbols
-	  enabled
-endif
+	  Set the optimization level for gcc
 
+config BR2_OPTIMIZE_0
+	bool "optimization level 0"
+	help
+	  Do not optimize. This is the default. 
+
+config BR2_OPTIMIZE_1
+	bool "optimization level 1"
+	help
+	  Optimize. Optimizing compilation takes somewhat more time, 
+	  and a lot more memory for a large function. With -O, the 
+	  compiler tries to reduce code size and execution time, 
+	  without performing any optimizations that take a great deal 
+	  of compilation time. -O turns on the following optimization 
+	  flags: -fdefer-pop -fdelayed-branch -fguess-branch-probability 
+	  -fcprop-registers -floop-optimize -fif-conversion 
+	  -fif-conversion2 -ftree-ccp -ftree-dce -ftree-dominator-opts 
+	  -ftree-dse -ftree-ter -ftree-lrs -ftree-sra -ftree-copyrename 
+	  -ftree-fre -ftree-ch -funit-at-a-time -fmerge-constants
+	  -O also turns on -fomit-frame-pointer on machines where doing 
+	  so does not interfere with debugging.
+
+config BR2_OPTIMIZE_2
+	bool "optimization level 2"
+	help
+	  Optimize even more. GCC performs nearly all supported optimizations
+	  that do not involve a space-speed tradeoff. The compiler does not 
+	  perform loop unrolling or function inlining when you specify -O2. 
+	  As compared to -O, this option increases both compilation time and 
+	  the performance of the generated code. -O2 turns on all optimization 
+	  flags specified by -O. It also turns on the following optimization 
+	  flags: -fthread-jumps -fcrossjumping -foptimize-sibling-calls 
+	  -fcse-follow-jumps -fcse-skip-blocks -fgcse  -fgcse-lm 
+	  -fexpensive-optimizations -fstrength-reduce -frerun-cse-after-loop  
+	  -frerun-loop-opt -fcaller-saves -fpeephole2 -fschedule-insns  
+	  -fschedule-insns2 -fsched-interblock -fsched-spec -fregmove 
+	  -fstrict-aliasing -fdelete-null-pointer-checks -freorder-blocks  
+	  -freorder-functions -falign-functions -falign-jumps -falign-loops  
+	  -falign-labels -ftree-vrp -ftree-pre
+	  Please note the warning under -fgcse about invoking -O2 on programs
+	  that use computed gotos.
+
+config BR2_OPTIMIZE_3
+	bool "optimization level 3"
+	help
+	  Optimize yet more. -O3 turns on all optimizations specified by -O2 
+	  and also turns on the -finline-functions, -funswitch-loops and 
+	  -fgcse-after-reload options.
+
+config BR2_OPTIMIZE_S
+	bool "optimize for size"
+	help
+	  Optimize for size. -Os enables all -O2 optimizations that do not 
+	  typically increase code size. It also performs further optimizations
+	  designed to reduce code size. -Os disables the following optimization 
+	  flags: -falign-functions -falign-jumps -falign-loops -falign-labels  
+	  -freorder-blocks -freorder-blocks-and-partition -fprefetch-loop-arrays
+	  -ftree-vect-loop-version
+     
+endchoice
+
 config BR2_PREFER_STATIC_LIB
 	bool "prefer static libraries"
 	default n

Modified: trunk/buildroot/package/Makefile.in
===================================================================
--- trunk/buildroot/package/Makefile.in	2008-03-12 11:23:11 UTC (rev 21312)
+++ trunk/buildroot/package/Makefile.in	2008-03-12 13:07:10 UTC (rev 21313)
@@ -9,7 +9,32 @@
 MAKE1:=$(HOSTMAKE) MAKE="$(firstword $(HOSTMAKE)) -j1"
 MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL)
 
+ifeq ($(BR2_OPTIMIZE_0),y)
+TARGET_OPTIMIZATION=-O0
+endif
+ifeq ($(BR2_OPTIMIZE_1),y)
+TARGET_OPTIMIZATION=-O1
+endif
+ifeq ($(BR2_OPTIMIZE_2),y)
+TARGET_OPTIMIZATION=-O2
+endif
+ifeq ($(BR2_OPTIMIZE_3),y)
+TARGET_OPTIMIZATION=-O3
+endif
+ifeq ($(BR2_OPTIMIZE_S),y)
+TARGET_OPTIMIZATION=-Os
+endif
+ifeq ($(BR2_DEBUG_1),y)
+TARGET_DEBUGGING=-g1
+endif
+ifeq ($(BR2_DEBUG_2),y)
+TARGET_DEBUGGING=-g2
+endif
+ifeq ($(BR2_DEBUG_3),y)
+TARGET_DEBUGGING=-g3
+endif
 
+
 #########################################################################
 ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
 TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \

[Buildroot] svn commit: trunk/buildroot: package

[egtvedt at uclibc.org]

Author: egtvedt
Date: 2008-11-05 02:41:31 -0800 (Wed, 05 Nov 2008)
New Revision: 23932

Log:
Move creation of $(PROJECT_BUILD_DIR)/autotools-stamps into top level Makefile

This patch will create the autotools-stamps directory early in the build
process, thus making it possible for non Makefile.autotools.in packages to use
this directory to hold stamp files.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>



Modified:
   trunk/buildroot/Makefile
   trunk/buildroot/package/Makefile.autotools.in


Changeset:
Modified: trunk/buildroot/Makefile
===================================================================
--- trunk/buildroot/Makefile	2008-11-05 08:43:04 UTC (rev 23931)
+++ trunk/buildroot/Makefile	2008-11-05 10:41:31 UTC (rev 23932)
@@ -318,6 +318,7 @@
 
 $(PROJECT_BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
+	mkdir -p $(PROJECT_BUILD_DIR)/autotools-stamps
 	if ! [ -d "$(TARGET_DIR)/bin" ]; then \
 		if [ -d "$(TARGET_SKELETON)" ]; then \
 			cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/; \

Modified: trunk/buildroot/package/Makefile.autotools.in
===================================================================
--- trunk/buildroot/package/Makefile.autotools.in	2008-11-05 08:43:04 UTC (rev 23931)
+++ trunk/buildroot/package/Makefile.autotools.in	2008-11-05 10:41:31 UTC (rev 23932)
@@ -258,7 +258,6 @@
 	$(if $(BR2_HAVE_DOCUMENTATION),,for d in doc share/doc; do \
 		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
 	done)
-	$(Q)mkdir -p $(@D)
 	touch $@
 
 $(BUILD_DIR)/%/.stamp_cleaned:

[Buildroot] svn commit: trunk/buildroot: package

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-10-20 04:32:25 -0700 (Mon, 20 Oct 2008)
New Revision: 23741

Log:
BR2_HAVE_DOCUMENTATION: add option to remove documentation from target

Some packages' install-strip target install quite big documentation,
so create an option to remove it similar to the existing man/info options.

Modified:
   trunk/buildroot/Config.in
   trunk/buildroot/package/Makefile.autotools.in


Changeset:
Modified: trunk/buildroot/Config.in
===================================================================
--- trunk/buildroot/Config.in	2008-10-20 11:32:22 UTC (rev 23740)
+++ trunk/buildroot/Config.in	2008-10-20 11:32:25 UTC (rev 23741)
@@ -348,6 +348,13 @@
 	  If you say n here, your target will not contain any
 	  infopage.
 
+config BR2_HAVE_DOCUMENTATION
+	bool "documentation on the target"
+	help
+	  Leave the documentation on the target.
+	  If you say n here, your target will not contain any
+	  documentation.
+
 config BR2_HAVE_DEVFILES
 	bool "development files in target filesystem"
 	help

Modified: trunk/buildroot/package/Makefile.autotools.in
===================================================================
--- trunk/buildroot/package/Makefile.autotools.in	2008-10-20 11:32:22 UTC (rev 23740)
+++ trunk/buildroot/package/Makefile.autotools.in	2008-10-20 11:32:25 UTC (rev 23741)
@@ -256,6 +256,9 @@
 	$(if $(BR2_HAVE_INFOPAGES),,for d in info share/info; do \
 		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
 	done)
+	$(if $(BR2_HAVE_DOCUMENTATION),,for d in doc share/doc; do \
+		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
+	done)
 	$(Q)mkdir -p $(@D)
 	touch $@
 

[Buildroot] svn commit: trunk/buildroot: package

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-07-24 06:38:39 -0700 (Thu, 24 Jul 2008)
New Revision: 22940

Log:
Makefile.autotools.in: fix make source-check/external-deps differently

The MAKELEVEL test is not that robust; It fails with the recent log
support or if buildroot is driven from an external Makefile.

Rework it to instead detect source-check/external-deps by the fact that
they set SPIDER.

Modified:
   trunk/buildroot/Makefile
   trunk/buildroot/package/Makefile.autotools.in


Changeset:
Modified: trunk/buildroot/Makefile
===================================================================
--- trunk/buildroot/Makefile	2008-07-24 11:34:27 UTC (rev 22939)
+++ trunk/buildroot/Makefile	2008-07-24 13:38:39 UTC (rev 22940)
@@ -350,7 +350,7 @@
 
 external-deps:
 	@$(MAKE) -Bs BR2_WGET=$(TOPDIR)/toolchain/wget-show-external-deps.sh \
-	source
+		SPIDER=--spider source
 
 #############################################################
 #

Modified: trunk/buildroot/package/Makefile.autotools.in
===================================================================
--- trunk/buildroot/package/Makefile.autotools.in	2008-07-24 11:34:27 UTC (rev 22939)
+++ trunk/buildroot/package/Makefile.autotools.in	2008-07-24 13:38:39 UTC (rev 22940)
@@ -131,7 +131,7 @@
 # Retrieve and unpack the archive
 $(BUILD_DIR)/%/.stamp_downloaded:
 # support make source-check/external-deps
-ifeq ($(MAKELEVEL),1)
+ifneq ($(SPIDER),)
 	$(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
 	$(if $($(PKG)_PATCH),$(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_PATCH))
 else

[Buildroot] svn commit: trunk/buildroot: package

[antab at uclibc.org]

Author: antab
Date: 2008-06-01 10:58:48 -0700 (Sun, 01 Jun 2008)
New Revision: 22163

Log:
Add option to set default site to download package source from. FreeBSD ports mirrors (like: ftp2.uk.freebsd.org/pub/FreeBSD/ports/distfiles) are a good place to find almost all of the source packages.


Modified:
   trunk/buildroot/Config.in
   trunk/buildroot/package/Makefile.autotools.in


Changeset:
Modified: trunk/buildroot/Config.in
===================================================================
--- trunk/buildroot/Config.in	2008-06-01 17:27:37 UTC (rev 22162)
+++ trunk/buildroot/Config.in	2008-06-01 17:58:48 UTC (rev 22163)
@@ -15,6 +15,15 @@
 
 menu "Build options"
 
+config BR2_PRIMARY_SITE
+	string "Primary download site"
+	default ""
+	help
+	  Primary site to download from. If this option is set then buildroot
+	  will try to download package source first from this site and try the
+	  default if the file is not found.
+	  NOTE: This only works for packages using the Makefile.autotools.in
+
 config BR2_WGET
 	string "Wget command"
 	default "wget --passive-ftp -nd"

Modified: trunk/buildroot/package/Makefile.autotools.in
===================================================================
--- trunk/buildroot/package/Makefile.autotools.in	2008-06-01 17:27:37 UTC (rev 22162)
+++ trunk/buildroot/package/Makefile.autotools.in	2008-06-01 17:58:48 UTC (rev 22163)
@@ -131,6 +131,9 @@
 # Retrieve and unpack the archive
 $(BUILD_DIR)/%/.stamp_downloaded:
 	$(call MESSAGE,"Downloading")
+ifdef BR2_PRIMARY_SITE
+	-$(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $(BR2_PRIMARY_SITE)/$($(PKG)_SOURCE)
+endif
 	$(Q)test -e $(DL_DIR)/$($(PKG)_SOURCE) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_SOURCE)
 	$(if $($(PKG)_PATCH),$(Q)test -e $(DL_DIR)/$($(PKG)_PATCH) || $(WGET) -P $(DL_DIR) $($(PKG)_SITE)/$($(PKG)_PATCH))
 	$(Q)mkdir -p $(@D)

[Buildroot] svn commit: trunk/buildroot: package

[ninevoltz at uclibc.org]

Author: ninevoltz
Date: 2008-03-10 08:22:43 -0700 (Mon, 10 Mar 2008)
New Revision: 21282

Log:
added dev files in target option

Modified:
   trunk/buildroot/Config.in
   trunk/buildroot/Makefile
   trunk/buildroot/package/Makefile.autotools.in


Changeset:
Modified: trunk/buildroot/Config.in
===================================================================
--- trunk/buildroot/Config.in	2008-03-10 15:15:57 UTC (rev 21281)
+++ trunk/buildroot/Config.in	2008-03-10 15:22:43 UTC (rev 21282)
@@ -239,6 +239,13 @@
 	  If you say n here, your target will not contain any
 	  infopage.
 
+config BR2_TARGET_DEV_FILES
+	bool "Development files in target filesystem"
+	default n
+	help
+	  Install headers and static libraries in the
+	  target filesystem
+
 source package/gnuconfig/Config.in
 
 endmenu

Modified: trunk/buildroot/Makefile
===================================================================
--- trunk/buildroot/Makefile	2008-03-10 15:15:57 UTC (rev 21281)
+++ trunk/buildroot/Makefile	2008-03-10 15:22:43 UTC (rev 21282)
@@ -245,7 +245,7 @@
 # target stuff is last so it can override anything else
 include target/Makefile.in
 
-TARGETS+=erase-fakeroots
+TARGETS+=erase-fakeroots target-devfiles
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
 TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS))
@@ -317,6 +317,21 @@
 erase-fakeroots:
 	rm -f $(PROJECT_BUILD_DIR)/.fakeroot*
 
+target-devfiles:
+ifeq ($(strip $(BR2_TARGET_DEV_FILES)),y)
+	cp -a $(STAGING_DIR)/usr/include $(TARGET_DIR)/usr
+	cp $(STAGING_DIR)/usr/lib/*.a $(TARGET_DIR)/usr/lib
+	cp $(STAGING_DIR)/lib/*.a $(TARGET_DIR)/lib
+	cp $(STAGING_DIR)/usr/lib/*.la $(TARGET_DIR)/usr/lib
+	cp $(STAGING_DIR)/lib/*.la $(TARGET_DIR)/lib
+else
+	rm -rf $(TARGET_DIR)/usr/include
+	find $(TARGET_DIR)/usr/lib -name '*.a' -delete
+	find $(TARGET_DIR)/lib -name '*.a' -delete
+	find $(TARGET_DIR)/usr/lib -name '*.la' -delete
+	find $(TARGET_DIR)/lib -name '*.la' -delete
+endif
+
 source: $(TARGETS_SOURCE) $(HOST_SOURCE)
 
 _source-check:

Modified: trunk/buildroot/package/Makefile.autotools.in
===================================================================
--- trunk/buildroot/package/Makefile.autotools.in	2008-03-10 15:15:57 UTC (rev 21281)
+++ trunk/buildroot/package/Makefile.autotools.in	2008-03-10 15:22:43 UTC (rev 21282)
@@ -230,10 +230,6 @@
 	$(if $(BR2_HAVE_INCLUDES),,for d in include; do \
 		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
 	done)
-	find $(TARGET_DIR) -name '*.la' -delete
-	find $(TARGET_DIR)/lib -name '*.a' -delete
-	find $(TARGET_DIR)/usr/lib -name '*.a' -delete
-
 	touch $@
 
 $(BUILD_DIR)/%/.stamp_cleaned:

[Buildroot] svn commit: trunk/buildroot: package

[Peter Korsgaard]

>>>>> "ninevoltz" == ninevoltz  <ninevoltz@uclibc.org> writes:

 ninevoltz> Author: ninevoltz
 ninevoltz> Date: 2008-03-10 08:22:43 -0700 (Mon, 10 Mar 2008)
 ninevoltz> New Revision: 21282

 ninevoltz> Log:
 ninevoltz> added dev files in target option

Great! A few minor points though:
 
 ninevoltz> +config BR2_TARGET_DEV_FILES
 ninevoltz> +	bool "Development files in target filesystem"

What about calling int BR2_HAVE_DEVFILES to match the info/make
configs just above? Also remember to not use upper case in the bool
description (E.G. bool "development files in .. ")

 ninevoltz> +else
 ninevoltz> +	rm -rf $(TARGET_DIR)/usr/include
 ninevoltz> +	find $(TARGET_DIR)/usr/lib -name '*.a' -delete

Not that I really care, but is -delete supported by non-GNU find?

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot: package

[Ulf Samuelsson]

----- Original Message ----- 
From: "Peter Korsgaard" <jacmet@uclibc.org>
To: <buildroot@uclibc.org>
Sent: Monday, March 10, 2008 5:24 PM
Subject: Re: [Buildroot] svn commit: trunk/buildroot: package


>>>>>> "ninevoltz" == ninevoltz  <ninevoltz@uclibc.org> writes:
> 
> ninevoltz> Author: ninevoltz
> ninevoltz> Date: 2008-03-10 08:22:43 -0700 (Mon, 10 Mar 2008)
> ninevoltz> New Revision: 21282
> 
> ninevoltz> Log:
> ninevoltz> added dev files in target option
> 
> Great! A few minor points though:
> 
> ninevoltz> +config BR2_TARGET_DEV_FILES
> ninevoltz> + bool "Development files in target filesystem"
> 
> What about calling int BR2_HAVE_DEVFILES to match the info/make
> configs just above? Also remember to not use upper case in the bool
> description (E.G. bool "development files in .. ")
> 
> ninevoltz> +else
> ninevoltz> + rm -rf $(TARGET_DIR)/usr/include
> ninevoltz> + find $(TARGET_DIR)/usr/lib -name '*.a' -delete
> 
> Not that I really care, but is -delete supported by non-GNU find?
> 
> -- 


What happens if you want *some*   ".a" files in the target.
Didn't see the patch, just occured to me when I read this email.


Best Regards
Ulf Samuelsson

[Buildroot] svn commit: trunk/buildroot: package

[Peter Korsgaard]

>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:

Hi,

 Ulf> What happens if you want *some*   ".a" files in the target.
 Ulf> Didn't see the patch, just occured to me when I read this email.

Is that a realistic situation? E.G. we also only have a global switch
for man and info pages.

To me a global switch is nicer than all the per-package options we
have now (and right now, certainly not all packages have dev support).

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot: package

[Ulf Samuelsson]

>>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
> 
> Hi,
> 
> Ulf> What happens if you want *some*   ".a" files in the target.
> Ulf> Didn't see the patch, just occured to me when I read this email.
> 
> Is that a realistic situation? E.G. we also only have a global switch
> for man and info pages.

Yes we are not perfect.

> 
> To me a global switch is nicer than all the per-package options we
> have now (and right now, certainly not all packages have dev support).
> 
> -- 
> Bye, Peter Korsgaard

I might be wrong, since I didn't look at the patch, but it looks
to me that the patch will clean out the directory if unset.

If the switch is there, then the files should be copied to th target directory.
If the switch was never there, then there should not be any such files in the target directory.
If the switch was there and is unset then I think the directory should be cleaned out
with an explicit command.




Best Regards
Ulf Samuelsson

[Buildroot] svn commit: trunk/buildroot: package

[Peter Korsgaard]

>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:

Hi,

 Ulf> I might be wrong, since I didn't look at the patch, but it looks
 Ulf> to me that the patch will clean out the directory if unset.

 Ulf> If the switch is there, then the files should be copied to th
 Ulf> target directory.  If the switch was never there, then there
 Ulf> should not be any such files in the target directory.  If the
 Ulf> switch was there and is unset then I think the directory should
 Ulf> be cleaned out with an explicit command.

Sure, that's the nicest approach. But it also means every package .mk
needs to get fixed. This approach basically gives the same result with
only 4 lines or so of code.

So the basic system is here, but it can be refined by adding
HAVE_DEVFILES support to (library) packages (and the C library) one by
one. Once that is done this "dirty" solution can be removed.

Or we can simply decide it isn't worth it and stick with the current
solution.

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot: package

[Ulf Samuelsson]

----- Original Message ----- 
From: "Peter Korsgaard" <jacmet@uclibc.org>
To: "Ulf Samuelsson" <ulf.samuelsson@atmel.com>
Cc: "Peter Korsgaard" <jacmet@uclibc.org>; <buildroot@uclibc.org>
Sent: Monday, March 10, 2008 10:26 PM
Subject: Re: [Buildroot] svn commit: trunk/buildroot: package


>>>>>> "Ulf" == Ulf Samuelsson <ulf.samuelsson@atmel.com> writes:
> 
> Hi,
> 
> Ulf> I might be wrong, since I didn't look at the patch, but it looks
> Ulf> to me that the patch will clean out the directory if unset.
> 
> Ulf> If the switch is there, then the files should be copied to th
> Ulf> target directory.  If the switch was never there, then there
> Ulf> should not be any such files in the target directory.  If the
> Ulf> switch was there and is unset then I think the directory should
> Ulf> be cleaned out with an explicit command.
> 
> Sure, that's the nicest approach. But it also means every package .mk
> needs to get fixed. This approach basically gives the same result with
> only 4 lines or so of code.
> 
> So the basic system is here, but it can be refined by adding
> HAVE_DEVFILES support to (library) packages (and the C library) one by
> one. Once that is done this "dirty" solution can be removed.
> 
> Or we can simply decide it isn't worth it and stick with the current
> solution.
> 
> -- 
> Bye, Peter Korsgaard

Or add this to the Makefile:

nodevfiles:
            rm -rf $(TARGET_DIR)/usr/include
            find $(TARGET_DIR)/usr/lib -name '*.a' -delete

Then the user can make his own decisions.
The packages will not add any ".a" packages,
and none will be deleted, unless the user wishes them to be.

Best Regards
Ulf Samuelsson

[Buildroot] svn commit: trunk/buildroot: package

[Thiago A. Corrêa]

>
>  nodevfiles:
>
>             rm -rf $(TARGET_DIR)/usr/include
>
>             find $(TARGET_DIR)/usr/lib -name '*.a' -delete
>
>  Then the user can make his own decisions.
>  The packages will not add any ".a" packages,
>  and none will be deleted, unless the user wishes them to be.

Provided he actually reads this mailling list. IMHO we already have
too many magic targets.
Really, who, besides i386 will compile at the target?

Kind Regards,
   Thiago A. Correa

[Buildroot] svn commit: trunk/buildroot: package

[Ulf Samuelsson]

> >
>>  nodevfiles:
>>
>>             rm -rf $(TARGET_DIR)/usr/include
>>
>>             find $(TARGET_DIR)/usr/lib -name '*.a' -delete
>>
>>  Then the user can make his own decisions.
>>  The packages will not add any ".a" packages,
>>  and none will be deleted, unless the user wishes them to be.
> 
> Provided he actually reads this mailling list. IMHO we already have
> too many magic targets.

If a separate configuration was added to clean out the directory,
then that problem is solved.


Best Regards
Ulf Samuelsson

[Buildroot] svn commit: trunk/buildroot: package

[ulf at uclibc.org]

Author: ulf
Date: 2007-10-18 05:38:26 -0700 (Thu, 18 Oct 2007)
New Revision: 20287

Log:
Allow to remove _nofpu from directories and images

Modified:
   trunk/buildroot/Config.in
   trunk/buildroot/package/Makefile.in


Changeset:
Modified: trunk/buildroot/Config.in
===================================================================
--- trunk/buildroot/Config.in	2007-10-18 12:37:36 UTC (rev 20286)
+++ trunk/buildroot/Config.in	2007-10-18 12:38:26 UTC (rev 20287)
@@ -84,6 +84,14 @@
 	  Most people will leave this set to the default value of
 	  "$(BUILD_DIR)/staging_dir".
 
+config BR2_FPU_SUFFIX
+	bool "Add '_nofpu' suffix for softfloat toolchains"
+	default n
+	help
+	  If the toolchain is configured to use softfloat, then
+	  the "_nofpu" suffix will be added to the toolchain build
+	  directory name and to any rootfs image name
+
 config BR2_TOPDIR_PREFIX
 	string "Custom build dir prefix"
 	default ""

Modified: trunk/buildroot/package/Makefile.in
===================================================================
--- trunk/buildroot/package/Makefile.in	2007-10-18 12:37:36 UTC (rev 20286)
+++ trunk/buildroot/package/Makefile.in	2007-10-18 12:38:26 UTC (rev 20287)
@@ -74,12 +74,18 @@
 ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
 endif
 
+ifeq ($(strip $(subst ",, $(BR2_FPU_SUFFIX))),y)
+COND_ARCH_FPU_SUFFIX:=(ARCH_FPU_SUFFIX)
+else
+COND_ARCH_FPU_SUFFIX:=
+endif
+
 ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
-TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
+TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
 
 # Quotes are needed for spaces et al in path components.
 TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
 GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
 REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
 TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
@@ -90,10 +96,10 @@
 TOOLCHAIN_EXTERNAL_PATH:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PATH)))
 #"))
 #TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX)
-TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
+TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
 TARGET_PATH="$(STAGING_DIR)/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
 #IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
 
 REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
 GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)

[Buildroot] svn commit: trunk/buildroot: package

[ulf at uclibc.org]

Author: ulf
Date: 2007-10-07 11:23:01 -0700 (Sun, 07 Oct 2007)
New Revision: 20196

Log:
Allow date to be added to Image

Modified:
   trunk/buildroot/Config.in
   trunk/buildroot/package/Makefile.in


Changeset:
Modified: trunk/buildroot/Config.in
===================================================================
--- trunk/buildroot/Config.in	2007-10-07 18:10:44 UTC (rev 20195)
+++ trunk/buildroot/Config.in	2007-10-07 18:23:01 UTC (rev 20196)
@@ -102,6 +102,19 @@
 	  build_ARCH -> build_ARCH_[SUFFIX]
 	  toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX]
 
+config BR2_ROOTFS_PREFIX
+	string "Custom root fs prefix"
+	default "rootfs"
+	help
+	  Add a custom string to the beginning of the root file system name.
+
+config BR2_ROOTFS_SUFFIX
+	string "Custom root fs suffix"
+	default "$(DATE)" if BR2_TARGET_ATMEL
+	default "" if !BR2_TARGET_ATMEL
+	help
+	  Add a custom string to the end of the root file system name.
+
 config BR2_GNU_BUILD_SUFFIX
 	string "GNU build hostname suffix"
 	default "pc-linux-gnu"

Modified: trunk/buildroot/package/Makefile.in
===================================================================
--- trunk/buildroot/package/Makefile.in	2007-10-07 18:10:44 UTC (rev 20195)
+++ trunk/buildroot/package/Makefile.in	2007-10-07 18:23:01 UTC (rev 20196)
@@ -65,14 +65,18 @@
 TARGET_LDFLAGS=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
 endif
 #########################################################################
+ifeq ($(BR2_ROOTFS_SUFFIX),)
+ROOTFS_SUFFIX:=
+else
+ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
+endif
 
-
 ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
 TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
 
 # Quotes are needed for spaces et al in path components.
 TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-IMAGE:=$(BINARIES_DIR)/rootfs.$(ARCH)$(ARCH_FPU_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
 GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
 REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
 TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
@@ -82,9 +86,11 @@
 #"))
 TOOLCHAIN_EXTERNAL_PATH:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PATH)))
 #"))
-TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX)
+#TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX)
+TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
 TARGET_PATH="$(STAGING_DIR)/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
-IMAGE:=$(BINARIES_DIR)/rootfs.$(TOOLCHAIN_EXTERNAL_PREFIX)-$(DATE)
+#IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
 
 REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
 GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)

[Buildroot] svn commit: trunk/buildroot: package

[Bernhard Fischer]

On Sun, Oct 07, 2007 at 11:23:01AM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-10-07 11:23:01 -0700 (Sun, 07 Oct 2007)
>New Revision: 20196
>
>Log:
>Allow date to be added to Image

The COPYTO is the proper thing to use for this kind of stuff.
Why don't you just use the COPYTO that is already there?

[Buildroot] svn commit: trunk/buildroot: package

[Ulf Samuelsson]

s?n 2007-10-07 klockan 20:20 +0200 skrev Bernhard Fischer:
> On Sun, Oct 07, 2007 at 11:23:01AM -0700, ulf at uclibc.org wrote:
> >Author: ulf
> >Date: 2007-10-07 11:23:01 -0700 (Sun, 07 Oct 2007)
> >New Revision: 20196
> >
> >Log:
> >Allow date to be added to Image
> 
> The COPYTO is the proper thing to use for this kind of stuff.
> Why don't you just use the COPYTO that is already there?

Because I need the CopyTo to copy to /tftpboot,
and I still want to have some king of revision info
so I do not overwrite what is already there.
If something stops working, then I still have older revisions.


If you so dearly want to have it without a date, then it is
easy to create a link without the date.

BR
Ulf Samuelsson

[Buildroot] svn commit: trunk/buildroot: package

[aldot at uclibc.org]

Author: aldot
Date: 2007-09-17 14:50:54 -0700 (Mon, 17 Sep 2007)
New Revision: 19875

Log:
- add v9a and v9b settings.
  Will need to change the GCC_TARGET_TUNE accordingly.


Modified:
   trunk/buildroot/Config.in
   trunk/buildroot/package/Makefile.in


Changeset:
Modified: trunk/buildroot/Config.in
===================================================================
--- trunk/buildroot/Config.in	2007-09-17 13:44:03 UTC (rev 19874)
+++ trunk/buildroot/Config.in	2007-09-17 21:50:54 UTC (rev 19875)
@@ -315,6 +315,8 @@
 	bool "tsc701"
 config BR2_sparc_v9
 	bool "v9"
+config BR2_sparc_v9a
+	bool "v9a"
 config BR2_sparc_v9b
 	bool "v9b"
 config BR2_sparc_ultrasparc
@@ -334,6 +336,8 @@
 
 config BR2_sparc64_v9
 	bool "v9"
+config BR2_sparc64_v9a
+	bool "v9a"
 config BR2_sparc64_v9b
 	bool "v9b"
 config BR2_sparc64_ultrasparc
@@ -349,6 +353,7 @@
 	default V7	if BR2_sparc_v7 || BR2_sparc_cypress || BR2_sparc_sparclite || BR2_sparc_f930 || BR2_sparc_f934 || BR2_sparc_sparclite86x || BR2_sparc_sparclet || BR2_sparc_tsc701
 	default V8	if BR2_sparc_v8 || BR2_sparc_supersparc || BR2_sparc_hypersparc
 	default V9	if BR2_sparc_v9 || BR2_sparc_ultrasparc || BR2_sparc_ultrasparc3 || BR2_sparc_niagara || BR2_sparc64_v9 || BR2_sparc64_ultrasparc || BR2_sparc64_ultrasparc3 || BR2_sparc64_niagara
+	default V9	if BR2_sparc_v9a || BR2_sparc64_v9a
 	default V9B	if BR2_sparc_v9b || BR2_sparc64_v9b
 
 choice
@@ -584,7 +589,9 @@
 	default sparclite86x	if BR2_sparc_sparclite86x
 	default sparclet	if BR2_sparc_sparclet
 	default tsc701		if BR2_sparc_tsc701
-	default v9		if BR2_sparc_v9 || BR2_sparc_v9b || BR2_sparc64_v9 || BR2_sparc64_v9b
+	default v9		if BR2_sparc_v9 || BR2_sparc64_v9
+	default v9		if BR2_sparc_v9a || BR2_sparc64_v9a
+	default v9		if BR2_sparc_v9b || BR2_sparc64_v9b
 	default ultrasparc	if BR2_sparc_ultrasparc || BR2_sparc64_ultrasparc
 	default ultrasparc3	if BR2_sparc_ultrasparc3 || BR2_sparc64_ultrasparc3
 	default niagara		if BR2_sparc_niagara || BR2_sparc64_niagara

Modified: trunk/buildroot/package/Makefile.in
===================================================================
--- trunk/buildroot/package/Makefile.in	2007-09-17 13:44:03 UTC (rev 19874)
+++ trunk/buildroot/package/Makefile.in	2007-09-17 21:50:54 UTC (rev 19875)
@@ -46,12 +46,10 @@
 TARGET_CFLAGS+=-msoft-float
 endif
 
-ifeq ($(BR2_sparc_v9b),y)
+# enable VIS for v9a and v9b
+ifeq ($(findstring y,$(BR2_sparc_v9a)$(BR2_sparc64_v9a)$(BR2_sparc_v9b)$(BR2_sparc64_v9b)),y)
 TARGET_CFLAGS+=-mvis
 endif
-ifeq ($(BR2_sparc64_v9b),y)
-TARGET_CFLAGS+=-mvis
-endif
 
 TARGET_CXXFLAGS=$(TARGET_CFLAGS)
 

[Buildroot] svn commit: trunk/buildroot: package

[aldot at uclibc.org]

Author: aldot
Date: 2007-07-31 11:06:50 -0700 (Tue, 31 Jul 2007)
New Revision: 19362

Log:
- add possibility to select different flavours of strip (or none at all for debugging purposes)


Modified:
   trunk/buildroot/Config.in
   trunk/buildroot/package/Makefile.in


Changeset:
Modified: trunk/buildroot/Config.in
===================================================================
--- trunk/buildroot/Config.in	2007-07-31 17:09:44 UTC (rev 19361)
+++ trunk/buildroot/Config.in	2007-07-31 18:06:50 UTC (rev 19362)
@@ -652,11 +652,36 @@
 	  This option hides outdated/obsolete versions of packages.
 
 config BR2_USE_WCHAR
-	bool "Show packages that are require WCHAR support"
+	bool "Show packages that require WCHAR support"
 	default y
 	help
 	  This option hides packages which cannot be built without WCHAR.
 
+choice
+	prompt "strip"
+	default BR2_STRIP_strip
+	help
+	  Select whether to strip binaries and libraries for the target
+	  or not.
+	  strip   is the normal strip command
+	  sstrip  is a strip that discards more than the normal strip
+	  none    do not strip (only for debugging!)
+
+config BR2_STRIP_strip
+	bool "strip"
+	help
+	  strip   is the normal strip command
+config BR2_STRIP_sstrip
+	bool "sstrip"
+	select BR2_PACKAGE_SSTRIP_HOST
+	help
+	  sstrip  is a strip that discards more than the normal strip
+config BR2_STRIP_none
+	bool "none"
+	help
+	  none    do not strip (only for debugging!)
+endchoice
+
 config BR2_PREFER_STATIC_LIB
 	bool "prefer static libraries"
 	default n

Modified: trunk/buildroot/package/Makefile.in
===================================================================
--- trunk/buildroot/package/Makefile.in	2007-07-31 17:09:44 UTC (rev 19361)
+++ trunk/buildroot/package/Makefile.in	2007-07-31 18:06:50 UTC (rev 19362)
@@ -131,10 +131,17 @@
 TARGET_CC=$(TARGET_CROSS)gcc
 TARGET_CXX=$(TARGET_CROSS)g++
 TARGET_RANLIB=$(TARGET_CROSS)ranlib
+INSTALL=/usr/bin/install
+ifeq ($(BR2_STRIP_strip),y)
 STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
-INSTALL=/usr/bin/install
+endif
+ifeq ($(BR2_STRIP_sstrip),y)
+STRIP=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip
+endif
+ifeq ($(BR2_STRIP_none),y)
+STRIP=true -Not_stripping
+endif
 
-
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 	-e 's/sparc.*/sparc/' \
 	-e 's/arm.*/arm/g' \

[Buildroot] svn commit: trunk/buildroot: package

[ulf at uclibc.org]

Author: ulf
Date: 2007-07-20 00:34:28 -0700 (Fri, 20 Jul 2007)
New Revision: 19166

Log:
make source-check without permanently changing WGET command

Modified:
   trunk/buildroot/Makefile
   trunk/buildroot/package/Makefile.in


Changeset:
Modified: trunk/buildroot/Makefile
===================================================================
--- trunk/buildroot/Makefile	2007-07-19 22:50:47 UTC (rev 19165)
+++ trunk/buildroot/Makefile	2007-07-20 07:34:28 UTC (rev 19166)
@@ -252,13 +252,9 @@
 
 source: $(TARGETS_SOURCE) $(HOST_SOURCE)
 
-.config.check: dependencies
-	$(SED) '/BR2_WGET/s/\"$$/ --spider\"/g' .config
-	touch $@
+_source-check: 
+	$(MAKE) SPIDER=--spider source
 
-_source-check: .config.check
-	$(MAKE) source
-
 #############################################################
 #
 # Cleanup and misc junk

Modified: trunk/buildroot/package/Makefile.in
===================================================================
--- trunk/buildroot/package/Makefile.in	2007-07-19 22:50:47 UTC (rev 19165)
+++ trunk/buildroot/package/Makefile.in	2007-07-20 07:34:28 UTC (rev 19166)
@@ -12,7 +12,7 @@
 # Strip off the annoying quoting
 ARCH:=$(strip $(subst ",, $(BR2_ARCH)))
 #"))
-WGET:=$(strip $(subst ",, $(BR2_WGET)))
+WGET:=$(strip $(subst ",, $(BR2_WGET))) $(SPIDER)
 #"))
 SVN:=$(strip $(subst ",, $(BR2_SVN)))
 #"))

[Buildroot] svn commit: trunk/buildroot: package

[aldot at uclibc.org]

Author: aldot
Date: 2007-06-28 03:47:05 -0700 (Thu, 28 Jun 2007)
New Revision: 18957

Log:
- adjust infrastructure for new kconfig


Modified:
   trunk/buildroot/Makefile
   trunk/buildroot/package/Makefile.in


Changeset:
Modified: trunk/buildroot/Makefile
===================================================================
--- trunk/buildroot/Makefile	2007-06-28 10:46:19 UTC (rev 18956)
+++ trunk/buildroot/Makefile	2007-06-28 10:47:05 UTC (rev 18957)
@@ -37,6 +37,58 @@
 -include $(TOPDIR).config
 endif
 
+# To put more focus on warnings, be less verbose as default
+# Use 'make V=1' to see the full commands
+ifdef V
+  ifeq ("$(origin V)", "command line")
+    KBUILD_VERBOSE = $(V)
+  endif
+endif
+ifndef KBUILD_VERBOSE
+  KBUILD_VERBOSE = 0
+endif
+
+ifeq ($(KBUILD_VERBOSE),1)
+  quiet =
+  Q =
+else
+  quiet=quiet_
+  Q = @
+endif
+
+CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+	else if [ -x /bin/bash ]; then echo /bin/bash; \
+	else echo sh; fi ; fi)
+
+export CONFIG_SHELL quiet Q KBUILD_VERBOSE
+
+ifndef HOSTAR
+HOSTAR:=ar
+endif
+ifndef HOSTAS
+HOSTAS:=as
+endif
+ifndef HOSTCC
+HOSTCC:=gcc
+else
+endif
+ifndef HOSTCXX
+HOSTCXX:=g++
+endif
+ifndef HOSTLD
+HOSTLD:=ld
+endif
+HOSTAR:=$(shell $(CONFIG_SHELL) which $(HOSTAR) || type -p $(HOSTAR) || echo ar)
+HOSTAS:=$(shell $(CONFIG_SHELL) which $(HOSTAS) || type -p $(HOSTAS) || echo as)
+HOSTCC:=$(shell $(CONFIG_SHELL) which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
+HOSTCXX:=$(shell $(CONFIG_SHELL) which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
+HOSTLD:=$(shell $(CONFIG_SHELL) which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
+ifndef CFLAGS_FOR_BUILD
+CFLAGS_FOR_BUILD:="-g -O2"
+endif
+export HOSTAR HOSTAS HOSTCC HOSTCXX HOSTLD
+
+
 ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 
 # cc-option
@@ -212,12 +264,14 @@
 # ---------------------------------------------------------------------------
 
 $(CONFIG)/conf:
-	$(MAKE) -C $(CONFIG) conf
+	$(MAKE) CC="$(HOSTCC)" CFLAGS=$(CFLAGS_FOR_BUILD) MAKECMDGOALS="$(MAKECMDGOALS)" \
+		-C $(CONFIG) conf
 	- at if [ ! -f .config ] ; then \
 		cp $(CONFIG_DEFCONFIG) .config; \
 	fi
 $(CONFIG)/mconf:
-	$(MAKE) -C $(CONFIG) ncurses conf mconf
+	$(MAKE) CC="$(HOSTCC)" CFLAGS=$(CFLAGS_FOR_BUILD) MAKECMDGOALS="$(MAKECMDGOALS)" \
+		-C $(CONFIG) conf mconf
 	- at if [ ! -f .config ] ; then \
 		cp $(CONFIG_DEFCONFIG) .config; \
 	fi

Modified: trunk/buildroot/package/Makefile.in
===================================================================
--- trunk/buildroot/package/Makefile.in	2007-06-28 10:46:19 UTC (rev 18956)
+++ trunk/buildroot/package/Makefile.in	2007-06-28 10:47:05 UTC (rev 18957)
@@ -48,31 +48,7 @@
 endif
 #########################################################################
 
-ifndef HOSTAR
-HOSTAR:=ar
-endif
-ifndef HOSTAS
-HOSTAS:=as
-endif
-ifndef HOSTCC
-HOSTCC:=gcc
-endif
-ifndef HOSTCXX
-HOSTCXX:=g++
-endif
-ifndef HOSTLD
-HOSTLD:=ld
-endif
-HOSTAR:=$(shell which $(HOSTAR) || type -p $(HOSTAR) || echo ar)
-HOSTAS:=$(shell which $(HOSTAS) || type -p $(HOSTAS) || echo as)
-HOSTCC:=$(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
-HOSTCXX:=$(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
-HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
-ifndef CFLAGS_FOR_BUILD
-CFLAGS_FOR_BUILD:="-g -O2"
-endif
 
-
 BASE_DIR:=$(shell pwd)
 
 TOPDIR_PREFIX:=$(strip $(subst ",, $(BR2_TOPDIR_PREFIX)))_

[Buildroot] svn commit: trunk/buildroot: package

[andersen]

Author: andersen
Date: 2006-07-18 15:58:58 -0700 (Tue, 18 Jul 2006)
New Revision: 15719

Log:
move TAR_OPTIONS to its rightful place


Modified:
   trunk/buildroot/Makefile
   trunk/buildroot/package/Makefile.in


Changeset:
Modified: trunk/buildroot/Makefile
===================================================================
--- trunk/buildroot/Makefile	2006-07-18 18:32:17 UTC (rev 15718)
+++ trunk/buildroot/Makefile	2006-07-18 22:58:58 UTC (rev 15719)
@@ -35,9 +35,6 @@
 -include $(TOPDIR).config
 endif
 
-TAR_OPTIONS=$(subst ",, $(BR2_TAR_OPTIONS)) -xf
-#"
-
 ifeq ($(strip $(BR2_HAVE_DOT_CONFIG)),y)
 
 #############################################################

Modified: trunk/buildroot/package/Makefile.in
===================================================================
--- trunk/buildroot/package/Makefile.in	2006-07-18 18:32:17 UTC (rev 15718)
+++ trunk/buildroot/package/Makefile.in	2006-07-18 22:58:58 UTC (rev 15719)
@@ -8,6 +8,8 @@
 #"
 SVN:=$(strip $(subst ",, $(BR2_SVN)))
 #"
+TAR_OPTIONS=$(subst ",, $(BR2_TAR_OPTIONS)) -xf
+#"