summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2015-12-05 15:05:32 +0100
committerPeter Korsgaard <peter@korsgaard.com>2015-12-05 15:38:05 +0100
commit7c35f31552b2259c9b60e081e4a317acc9a6e4fc (patch)
tree2fd639dff02fc29757b1bc8ec29d856d07d03c8a
parent27281af4bf969a943c81afcfbcd881728a3c1172 (diff)
downloadbuildroot-7c35f31552b2259c9b60e081e4a317acc9a6e4fc.tar.gz
buildroot-7c35f31552b2259c9b60e081e4a317acc9a6e4fc.zip
boost: reorder build steps
The host and target build steps were mixed between eachother. Reorder them so we have the target steps before the host ones. No functional change, but helps readability. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/boost/boost.mk30
1 files changed, 15 insertions, 15 deletions
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 36710f7339..b96969d662 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -128,12 +128,6 @@ define BOOST_CONFIGURE_CMDS
echo "" >> $(@D)/user-config.jam
endef
-define HOST_BOOST_CONFIGURE_CMDS
- (cd $(@D) && ./bootstrap.sh $(HOST_BOOST_FLAGS))
- echo "using gcc : `$(HOST_CC) -dumpversion` : $(HOSTCXX) : <cxxflags>\"$(HOST_CXXFLAGS)\" <linkflags>\"$(HOST_LDFLAGS)\" ;" > $(@D)/user-config.jam
- echo "" >> $(@D)/user-config.jam
-endef
-
define BOOST_INSTALL_TARGET_CMDS
(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \
--user-config=$(@D)/user-config.jam \
@@ -143,6 +137,21 @@ define BOOST_INSTALL_TARGET_CMDS
--layout=$(BOOST_LAYOUT) install )
endef
+define BOOST_INSTALL_STAGING_CMDS
+ (cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -q \
+ --user-config=$(@D)/user-config.jam \
+ $(BOOST_OPTS) \
+ --prefix=$(STAGING_DIR)/usr \
+ --ignore-site-config \
+ --layout=$(BOOST_LAYOUT) install)
+endef
+
+define HOST_BOOST_CONFIGURE_CMDS
+ (cd $(@D) && ./bootstrap.sh $(HOST_BOOST_FLAGS))
+ echo "using gcc : `$(HOST_CC) -dumpversion` : $(HOSTCXX) : <cxxflags>\"$(HOST_CXXFLAGS)\" <linkflags>\"$(HOST_LDFLAGS)\" ;" > $(@D)/user-config.jam
+ echo "" >> $(@D)/user-config.jam
+endef
+
define HOST_BOOST_BUILD_CMDS
(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \
--user-config=$(@D)/user-config.jam \
@@ -160,14 +169,5 @@ define HOST_BOOST_INSTALL_CMDS
--layout=$(BOOST_LAYOUT) install )
endef
-define BOOST_INSTALL_STAGING_CMDS
- (cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -q \
- --user-config=$(@D)/user-config.jam \
- $(BOOST_OPTS) \
- --prefix=$(STAGING_DIR)/usr \
- --ignore-site-config \
- --layout=$(BOOST_LAYOUT) install)
-endef
-
$(eval $(generic-package))
$(eval $(host-generic-package))
OpenPOWER on IntegriCloud