Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: [25683] trunk/buildroot:  package project
@ 2009-03-16 15:48 jacmet at uclibc.org
  2009-03-16 19:08 ` Thomas Petazzoni
  0 siblings, 1 reply; 5+ messages in thread
From: jacmet at uclibc.org @ 2009-03-16 15:48 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2009-03-16 15:48:43 +0000 (Mon, 16 Mar 2009)
New Revision: 25683

Log:
Makefile: introduce $(HOST_DIR) for host binaries

Add HOST_DIR directory handling. HOST_DIR should be used just like
STAGING_DIR, but for host files instead of target ones.

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


Changeset:
Modified: trunk/buildroot/Makefile
===================================================================
--- trunk/buildroot/Makefile	2009-03-16 15:48:35 UTC (rev 25682)
+++ trunk/buildroot/Makefile	2009-03-16 15:48:43 UTC (rev 25683)
@@ -282,7 +282,7 @@
 	cp -dpRf $(CONFIG)/buildroot-config $@
 
 dirs: $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \
+	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \
 	$(PROJECT_BUILD_DIR)/autotools-stamps
 
 $(BASE_TARGETS): dirs
@@ -294,7 +294,7 @@
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
 	$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \
+	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \
 	$(PROJECT_BUILD_DIR)/autotools-stamps
 
 #############################################################
@@ -303,7 +303,7 @@
 # dependencies anywhere else
 #
 #############################################################
-$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(PROJECT_BUILD_DIR) \
+$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(HOST_DIR) $(PROJECT_BUILD_DIR) \
 	$(PROJECT_BUILD_DIR)/autotools-stamps $(BINARIES_DIR):
 	@mkdir -p $@
 

Modified: trunk/buildroot/package/Makefile.in
===================================================================
--- trunk/buildroot/package/Makefile.in	2009-03-16 15:48:35 UTC (rev 25682)
+++ trunk/buildroot/package/Makefile.in	2009-03-16 15:48:43 UTC (rev 25683)
@@ -290,7 +290,9 @@
 		ORIGINAL_AS_FOR_TARGET="$(TARGET_AS)" \
 		ORIGINAL_LD_FOR_TARGET="$(TARGET_LD)" \
 		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
-		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)"
+		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
+		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
+		PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)"
 
 #######################################################################
 # settings we need to pass to configure

Modified: trunk/buildroot/project/Makefile.in
===================================================================
--- trunk/buildroot/project/Makefile.in	2009-03-16 15:48:35 UTC (rev 25682)
+++ trunk/buildroot/project/Makefile.in	2009-03-16 15:48:43 UTC (rev 25683)
@@ -68,6 +68,9 @@
 STAGING_DIR:=$(strip $(subst ",, $(BR2_STAGING_DIR)))
 #"))
 
+# packages compiled for the host goes here
+HOST_DIR:=$(BUILD_DIR)/host_dir
+
 # All configurable packages (like Busybox,Linux etc) should be built
 # in PROJECT_BUILD_DIR
 PROJECT_BUILD_DIR:=$(BASE_DIR)/$(TOPDIR_PREFIX)project_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)/$(PROJECT)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: [25683] trunk/buildroot: package project
  2009-03-16 15:48 [Buildroot] svn commit: [25683] trunk/buildroot: package project jacmet at uclibc.org
@ 2009-03-16 19:08 ` Thomas Petazzoni
  2009-03-16 19:26   ` Peter Korsgaard
  0 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2009-03-16 19:08 UTC (permalink / raw)
  To: buildroot

Le Mon, 16 Mar 2009 15:48:44 +0000 (UTC),
jacmet at uclibc.org a ?crit :

> -		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)"
> +		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
> +		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
> +             PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)"

I haven't read the whole patch in its context, but from a quick look, I
would I've written:

 PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
 PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig/:$(PKG_CONFIG_PATH)"

since the pkg-config binary compiled by Buildroot should probably be
installed in $(HOST_DIR) (since it's a host binary) and the .pc files
for the target architecture are installed in
$(STAGING_DIR)/usr/lib/pkgconfig.

Again, I might completely wrong.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: [25683] trunk/buildroot: package project
  2009-03-16 19:08 ` Thomas Petazzoni
@ 2009-03-16 19:26   ` Peter Korsgaard
  2009-03-17  7:55     ` Thomas Petazzoni
  0 siblings, 1 reply; 5+ messages in thread
From: Peter Korsgaard @ 2009-03-16 19:26 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 Thomas> I haven't read the whole patch in its context, but from a
 Thomas> quick look, I would I've written:

 Thomas>  PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
 Thomas>  PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig/:$(PKG_CONFIG_PATH)"

 Thomas> since the pkg-config binary compiled by Buildroot should probably be
 Thomas> installed in $(HOST_DIR) (since it's a host binary) and the .pc files
 Thomas> for the target architecture are installed in
 Thomas> $(STAGING_DIR)/usr/lib/pkgconfig.

Yes, but I didn't want to move pkgconfig just yet. The PKG_CONFIG_PATH
is correct though, as this is HOST_CONFIGURE_OPTS, E.G. the options to
configure where you're compiling for the host.

I'll move over the existing host tools (pkgconfig, auto*, libtool)
soonish.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: [25683] trunk/buildroot: package project
  2009-03-16 19:26   ` Peter Korsgaard
@ 2009-03-17  7:55     ` Thomas Petazzoni
  2009-03-17  8:23       ` Peter Korsgaard
  0 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2009-03-17  7:55 UTC (permalink / raw)
  To: buildroot

Le Mon, 16 Mar 2009 20:26:59 +0100,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :

> Yes, but I didn't want to move pkgconfig just yet. The PKG_CONFIG_PATH
> is correct though, as this is HOST_CONFIGURE_OPTS, E.G. the options to
> configure where you're compiling for the host.

Ok, got it.

> I'll move over the existing host tools (pkgconfig, auto*, libtool)
> soonish.

Great. What about the toolchain itself ? It is a host tool after all,
isn't it ?

Sincerly,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Buildroot] svn commit: [25683] trunk/buildroot: package project
  2009-03-17  7:55     ` Thomas Petazzoni
@ 2009-03-17  8:23       ` Peter Korsgaard
  0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2009-03-17  8:23 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 >> I'll move over the existing host tools (pkgconfig, auto*, libtool)
 >> soonish.

 Thomas> Great. What about the toolchain itself ? It is a host tool after all,
 Thomas> isn't it ?

True - But it seems like setting BR2_STAGING_DIR to something outside
the tree (E.G. /opt/toolchain) and using it outside buildroot is
fairly common - The other host tools are just needed for building the
rootfs and are not (generally) useful outside BR.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2009-03-17  8:23 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-16 15:48 [Buildroot] svn commit: [25683] trunk/buildroot: package project jacmet at uclibc.org
2009-03-16 19:08 ` Thomas Petazzoni
2009-03-16 19:26   ` Peter Korsgaard
2009-03-17  7:55     ` Thomas Petazzoni
2009-03-17  8:23       ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox