Skip to contentSkip to conversation

libevent: add host variant

PATCH New Gustavo Zacarias 4 participants 10 messages Oct 14, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 libevent: add host variant

---
 package/libevent/libevent.mk | 1 +
 1 file changed, 1 insertion(+)
package/libevent/libevent.mk +1 -0
index a6def1a..14ebf72 100644
@@ -20,3 +20,4 @@ LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT
 endif
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 2/3 boost: add host variant

---
 package/boost/boost.mk | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
package/boost/boost.mk +33 -0
index a745ce1..8f2c2db 100644
@@ -11,11 +11,19 @@ BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSIO
 BOOST_INSTALL_STAGING = YES
 
 TARGET_CC_VERSION = $(shell $(TARGET_CC) -dumpversion)
+HOST_CC_VERSION = $(shell $(HOSTCC) -dumpversion)
 
 BOOST_DEPENDENCIES =
 
 BOOST_FLAGS =
 
+# keep host variant as minimal as possible
+HOST_BOOST_FLAGS = --without-icu \
+	--without-libraries=$(subst $(space),$(comma),atomic chrono context \
+	coroutine date_time exception filesystem graph graph_parallel \
+	iostreams locale log math mpi program_options python random regex \
+	serialization signals system test thread timer wave)
+
 # atomic library compile only with upstream version, wait for next release
 BOOST_WITHOUT_FLAGS = python atomic
 
@@ -52,6 +60,9 @@ ifeq ($(BR2_PACKAGE_BOOST_IOSTREAMS),y)
 BOOST_DEPENDENCIES += bzip2 zlib
 endif
 
+HOST_BOOST_OPT += toolset=gcc threading=multi variant=release link=shared \
+	runtime-link=shared
+
 BOOST_OPT += toolset=gcc \
 	     threading=multi \
 	     variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \
@@ -76,6 +87,12 @@ 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_VERSION) : $(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 -d+1 \
 	--user-config=$(@D)/user-config.jam \
@@ -84,6 +101,21 @@ define BOOST_INSTALL_TARGET_CMDS
 	--layout=system install )
 endef
 
+define HOST_BOOST_BUILD_CMDS
+	(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
+	--user-config=$(@D)/user-config.jam \
+	$(HOST_BOOST_OPT) \
+	--prefix=$(HOST_DIR)/usr )
+endef
+
+define HOST_BOOST_INSTALL_CMDS
+	(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
+	--user-config=$(@D)/user-config.jam \
+	$(HOST_BOOST_OPT) \
+	--prefix=$(HOST_DIR)/usr \
+	--layout=system install )
+endef
+
 define BOOST_INSTALL_STAGING_CMDS
 	(cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -d+1 \
 	--user-config=$(@D)/user-config.jam \
@@ -93,3 +125,4 @@ define BOOST_INSTALL_STAGING_CMDS
 endef
 
 $(eval $(generic-package))
+$(eval $(host-autotools-package))
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 2/3 boost: add host variant

Dear Gustavo Zacarias,

Quoted 4 lines · Gustavo Zacarias
---
 package/boost/boost.mk | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

Why?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 3/3 boost: fix build failures after version bump

In reply to Gustavo Zacarias

Fix build failures that happened after the version bump such as:
http://autobuild.buildroot.net/results/570/570b091702763b29843d9207bc14dea67085fea0/
http://autobuild.buildroot.net/results/c26/c26498f1a4e6bcbc3a2dfce6a51fa7d21b72f21f/
and other failures by disabling the new (1.54+) coroutine and log libraries which weren't handled and hence enabled by default.

These also made the target size bigger and build times longer unnecessarily.

When/if they are needed for some future user this can be revisited and their proper conditions for enablement assesed.

---
 package/boost/boost.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/boost/boost.mk +3 -1
index 8f2c2db..8a1a8f7 100644
@@ -25,7 +25,9 @@ HOST_BOOST_FLAGS = --without-icu \
 	serialization signals system test thread timer wave)
 
 # atomic library compile only with upstream version, wait for next release
-BOOST_WITHOUT_FLAGS = python atomic
+# coroutine breaks on some weak toolchains and it's new for 1.54+
+# log breaks with some toolchain combinations and it's new for 1.54+
+BOOST_WITHOUT_FLAGS = atomic coroutine log python
 
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context)
Signature · 1 line
1.8.1.5
#4 lore raw

PATCH 3/3 boost: fix build failures after version bump

Hi Gustavo,

Quoted 6 lines · Gustavo Zacarias

Fix build failures that happened after the version bump such as:
http://autobuild.buildroot.net/results/570/570b091702763b29843d9207bc14dea67085fea0/
http://autobuild.buildroot.net/results/c26/c26498f1a4e6bcbc3a2dfce6a51fa7d21b72f21f/
and other failures by disabling the new (1.54+) coroutine and log libraries which weren't handled and hence enabled by default.

Quoted 7 lines

These also made the target size bigger and build times longer unnecessarily.

When/if they are needed for some future user this can be revisited and their proper conditions for enablement assesed.

This one bit me as well, thanks for the fix.

Signature · 1 line
Luca
#5 lore raw

PATCH 3/3 boost: fix build failures after version bump

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Fix build failures that happened after the version bump such as:
Gustavo> http://autobuild.buildroot.net/results/570/570b091702763b29843d9207bc14dea67085fea0/
Gustavo> http://autobuild.buildroot.net/results/c26/c26498f1a4e6bcbc3a2dfce6a51fa7d21b72f21f/
Gustavo> and other failures by disabling the new (1.54+) coroutine and log Gustavo> libraries which weren't handled and hence enabled by default.

Gustavo> These also made the target size bigger and build times longer Gustavo> unnecessarily.

Gustavo> When/if they are needed for some future user this can be revisited and Gustavo> their proper conditions for enablement assesed.

Committed, thanks.

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

PATCH 1/3 libevent: add host variant

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 10 lines · Gustavo Zacarias
---
 package/libevent/libevent.mk | 1 +
 1 file changed, 1 insertion(+)
package/libevent/libevent.mk +0 -0
index a6def1a..14ebf72 100644

package/libevent/libevent.mk LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT · line 23

Quoted 4 lines
package/libevent/libevent.mk +1 -0
@@ -20,3 +20,4 @@ LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT
 endif
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))

Why?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#7 lore raw

PATCH 1/3 libevent: add host variant

Quoted 1 line · Thomas Petazzoni

Why?

Apache thrift, upcoming package, same as host-boost. Regards.

#8 lore raw

PATCH 1/3 libevent: add host variant

Dear Gustavo Zacarias,

Quoted 4 lines · Gustavo Zacarias
Quoted 1 line · Thomas Petazzoni

Why?

Apache thrift, upcoming package, same as host-boost.

Then please say so, or include such packages in the patch series. Otherwise, there's no way for us, mere reviewers, to know what's coming next in your patch queue.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#9 lore raw

PATCH 1/3 libevent: add host variant

Quoted 5 lines · Thomas Petazzoni
Quoted 1 line

Apache thrift, upcoming package, same as host-boost.

Then please say so, or include such packages in the patch series. Otherwise, there's no way for us, mere reviewers, to know what's coming next in your patch queue.

That's because i wanted to send the boost bump breakage fix and it was on top of what i've already had done to boost.
Thrift needs some more testing and i didn't want to hold the fix back (and also a filename collision fix with python-thrift because someone thought it was wise to use the same naming convention for tarballs as the upstream project for a subset of said thing).
Regards.