* [Buildroot] svn commit: trunk/buildroot/package/make
@ 2007-07-09 18:36 aldot at uclibc.org
0 siblings, 0 replies; 6+ messages in thread
From: aldot at uclibc.org @ 2007-07-09 18:36 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-09 11:36:01 -0700 (Mon, 09 Jul 2007)
New Revision: 19057
Log:
- cosmetics: rename _VER to _VERSION and touch at
Modified:
trunk/buildroot/package/make/make.mk
Changeset:
Modified: trunk/buildroot/package/make/make.mk
===================================================================
--- trunk/buildroot/package/make/make.mk 2007-07-09 18:23:20 UTC (rev 19056)
+++ trunk/buildroot/package/make/make.mk 2007-07-09 18:36:01 UTC (rev 19057)
@@ -3,10 +3,10 @@
# make
#
#############################################################
-GNUMAKE_VER:=3.81
-GNUMAKE_SOURCE:=make-$(GNUMAKE_VER).tar.bz2
+GNUMAKE_VERSION:=3.81
+GNUMAKE_SOURCE:=make-$(GNUMAKE_VERSION).tar.bz2
GNUMAKE_SITE:=http://ftp.gnu.org/pub/gnu/make
-GNUMAKE_DIR:=$(BUILD_DIR)/make-$(GNUMAKE_VER)
+GNUMAKE_DIR:=$(BUILD_DIR)/make-$(GNUMAKE_VERSION)
GNUMAKE_CAT:=$(BZCAT)
GNUMAKE_BINARY:=make
GNUMAKE_TARGET_BINARY:=usr/bin/make
@@ -19,7 +19,7 @@
$(GNUMAKE_DIR)/.unpacked: $(DL_DIR)/$(GNUMAKE_SOURCE)
$(GNUMAKE_CAT) $(DL_DIR)/$(GNUMAKE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
$(CONFIG_UPDATE) $(GNUMAKE_DIR)/config
- touch $(GNUMAKE_DIR)/.unpacked
+ touch $@
$(GNUMAKE_DIR)/.configured: $(GNUMAKE_DIR)/.unpacked
(cd $(GNUMAKE_DIR); rm -rf config.cache; \
@@ -46,7 +46,7 @@
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
);
- touch $(GNUMAKE_DIR)/.configured
+ touch $@
$(GNUMAKE_DIR)/$(GNUMAKE_BINARY): $(GNUMAKE_DIR)/.configured
$(MAKE) -C $(GNUMAKE_DIR)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/make
@ 2007-07-31 18:40 ulf at uclibc.org
0 siblings, 0 replies; 6+ messages in thread
From: ulf at uclibc.org @ 2007-07-31 18:40 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-31 11:40:17 -0700 (Tue, 31 Jul 2007)
New Revision: 19367
Log:
Ensure host make is used when building 'make'
Modified:
trunk/buildroot/package/make/make.mk
Changeset:
Modified: trunk/buildroot/package/make/make.mk
===================================================================
--- trunk/buildroot/package/make/make.mk 2007-07-31 18:37:52 UTC (rev 19366)
+++ trunk/buildroot/package/make/make.mk 2007-07-31 18:40:17 UTC (rev 19367)
@@ -49,7 +49,7 @@
touch $@
$(GNUMAKE_DIR)/$(GNUMAKE_BINARY): $(GNUMAKE_DIR)/.configured
- $(MAKE) -C $(GNUMAKE_DIR)
+ $(MAKE) MAKE=$(HOSTMAKE) -C $(GNUMAKE_DIR)
$(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY): $(GNUMAKE_DIR)/$(GNUMAKE_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) install
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/make
@ 2008-11-05 8:09 egtvedt at uclibc.org
2008-11-05 8:31 ` Peter Korsgaard
0 siblings, 1 reply; 6+ messages in thread
From: egtvedt at uclibc.org @ 2008-11-05 8:09 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-11-05 00:09:30 -0800 (Wed, 05 Nov 2008)
New Revision: 23928
Log:
make: select gettext and libintl if locale is enabled
This patch makes sure gettext and libintl are selected if locale support is
enabled. Gettext must also be compiled before make so appropriate headers are
available to make.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Modified:
trunk/buildroot/package/make/Config.in
trunk/buildroot/package/make/make.mk
Changeset:
Modified: trunk/buildroot/package/make/Config.in
===================================================================
--- trunk/buildroot/package/make/Config.in 2008-11-04 22:29:02 UTC (rev 23927)
+++ trunk/buildroot/package/make/Config.in 2008-11-05 08:09:30 UTC (rev 23928)
@@ -1,5 +1,7 @@
config BR2_PACKAGE_MAKE
bool "make"
+ select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
help
A tool which controls the generation of executables and other
non-source files of a program from the program's source files.
Modified: trunk/buildroot/package/make/make.mk
===================================================================
--- trunk/buildroot/package/make/make.mk 2008-11-04 22:29:02 UTC (rev 23927)
+++ trunk/buildroot/package/make/make.mk 2008-11-05 08:09:30 UTC (rev 23928)
@@ -71,5 +71,5 @@
#
#############################################################
ifeq ($(strip $(BR2_PACKAGE_MAKE)),y)
-TARGETS+=make
+TARGETS+=$(if $(BR2_PACKAGE_GETTEXT),gettext) make
endif
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/make
2008-11-05 8:09 egtvedt at uclibc.org
@ 2008-11-05 8:31 ` Peter Korsgaard
2008-11-05 8:42 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2008-11-05 8:31 UTC (permalink / raw)
To: buildroot
>>>>> "egtvedt" == egtvedt <egtvedt@uclibc.org> writes:
egtvedt> Author: egtvedt
egtvedt> Date: 2008-11-05 00:09:30 -0800 (Wed, 05 Nov 2008)
egtvedt> New Revision: 23928
egtvedt> Log:
egtvedt> make: select gettext and libintl if locale is enabled
egtvedt> ifeq ($(strip $(BR2_PACKAGE_MAKE)),y)
egtvedt> -TARGETS+=make
egtvedt> +TARGETS+=$(if $(BR2_PACKAGE_GETTEXT),gettext) make
We normally do this by adding it as a dependency to the make: target,
E.G.:
make: uclibc $(if $(BR2_PACKAGE_GETTEXT),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
Adding it to TARGETS doesn't ensure that gettext gets built before
make (well, actually it does, but it isn't very clear or robust)
Could you please change it?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/make
2008-11-05 8:31 ` Peter Korsgaard
@ 2008-11-05 8:42 ` Hans-Christian Egtvedt
0 siblings, 0 replies; 6+ messages in thread
From: Hans-Christian Egtvedt @ 2008-11-05 8:42 UTC (permalink / raw)
To: buildroot
On Wed, 05 Nov 2008 09:31:51 +0100
Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "egtvedt" == egtvedt <egtvedt@uclibc.org> writes:
>
> egtvedt> Author: egtvedt
> egtvedt> Date: 2008-11-05 00:09:30 -0800 (Wed, 05 Nov 2008)
> egtvedt> New Revision: 23928
>
> egtvedt> Log:
> egtvedt> make: select gettext and libintl if locale is enabled
>
> egtvedt> ifeq ($(strip $(BR2_PACKAGE_MAKE)),y)
> egtvedt> -TARGETS+=make
> egtvedt> +TARGETS+=$(if $(BR2_PACKAGE_GETTEXT),gettext) make
>
> We normally do this by adding it as a dependency to the make: target,
> E.G.:
>
> make: uclibc $(if $(BR2_PACKAGE_GETTEXT),gettext)
> $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
>
> Adding it to TARGETS doesn't ensure that gettext gets built before
> make (well, actually it does, but it isn't very clear or robust)
>
> Could you please change it?
>
Jupp, no problem (-:
--
Best regards,
Hans-Christian Egtvedt
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/make
@ 2008-11-05 8:43 egtvedt at uclibc.org
0 siblings, 0 replies; 6+ messages in thread
From: egtvedt at uclibc.org @ 2008-11-05 8:43 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-11-05 00:43:04 -0800 (Wed, 05 Nov 2008)
New Revision: 23931
Log:
make: add gettext dependency to make rule instead of TARGETS
This patch adds gettext dependency to make: rule instead of the TARGETS
variable if locale is selected. Just to conform with common syntax.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Modified:
trunk/buildroot/package/make/make.mk
Changeset:
Modified: trunk/buildroot/package/make/make.mk
===================================================================
--- trunk/buildroot/package/make/make.mk 2008-11-05 08:18:16 UTC (rev 23930)
+++ trunk/buildroot/package/make/make.mk 2008-11-05 08:43:04 UTC (rev 23931)
@@ -56,7 +56,7 @@
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
-make: uclibc $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
+make: uclibc $(if $(BR2_PACKAGE_GETTEXT),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
make-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) uninstall
@@ -71,5 +71,5 @@
#
#############################################################
ifeq ($(strip $(BR2_PACKAGE_MAKE)),y)
-TARGETS+=$(if $(BR2_PACKAGE_GETTEXT),gettext) make
+TARGETS+=make
endif
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-11-05 8:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-09 18:36 [Buildroot] svn commit: trunk/buildroot/package/make aldot at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-07-31 18:40 ulf at uclibc.org
2008-11-05 8:09 egtvedt at uclibc.org
2008-11-05 8:31 ` Peter Korsgaard
2008-11-05 8:42 ` Hans-Christian Egtvedt
2008-11-05 8:43 egtvedt at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox