Browse Source

Merge pull request #3510 from ClaymorePT/boost_1_62_5

boost: Patch to support Fiber
lilik-openwrt-22.03
Ted Hess 8 years ago
committed by GitHub
parent
commit
48499d5f3b
2 changed files with 27 additions and 3 deletions
  1. +2
    -3
      libs/boost/Makefile
  2. +25
    -0
      libs/boost/patches/01_fiber_fix.patch

+ 2
- 3
libs/boost/Makefile View File

@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/target.mk
PKG_NAME:=boost PKG_NAME:=boost
PKG_VERSION:=1.62.0 PKG_VERSION:=1.62.0
PKG_SOURCE_VERSION:=1_62_0 PKG_SOURCE_VERSION:=1_62_0
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2
PKG_SOURCE_URL:=https://sourceforge.net/projects/boost/files/boost/$(PKG_VERSION) PKG_SOURCE_URL:=https://sourceforge.net/projects/boost/files/boost/$(PKG_VERSION)
@ -253,7 +253,6 @@ define Package/boost/config
prompt "Boost $(lib) library." prompt "Boost $(lib) library."
default m if ALL default m if ALL
$(if $(findstring locale,$(lib)),depends on BUILD_NLS,)\ $(if $(findstring locale,$(lib)),depends on BUILD_NLS,)\
$(if $(findstring fiber,$(lib)),depends on BROKEN,)\
$(if $(findstring python,$(lib)),depends on PACKAGE_$(lib),) $(if $(findstring python,$(lib)),depends on PACKAGE_$(lib),)
) )
@ -303,7 +302,7 @@ $(eval $(call DefineBoostLibrary,context,chrono system thread,))
$(eval $(call DefineBoostLibrary,coroutine,system chrono context thread,)) $(eval $(call DefineBoostLibrary,coroutine,system chrono context thread,))
$(eval $(call DefineBoostLibrary,date_time,,)) $(eval $(call DefineBoostLibrary,date_time,,))
#$(eval $(call DefineBoostLibrary,exception,,)) #$(eval $(call DefineBoostLibrary,exception,,))
$(eval $(call DefineBoostLibrary,fiber,coroutine,,BROKEN))
$(eval $(call DefineBoostLibrary,fiber,coroutine,,))
$(eval $(call DefineBoostLibrary,filesystem,system,)) $(eval $(call DefineBoostLibrary,filesystem,system,))
$(eval $(call DefineBoostLibrary,graph,regex,)) $(eval $(call DefineBoostLibrary,graph,regex,))
$(eval $(call DefineBoostLibrary,iostreams,,+zlib)) $(eval $(call DefineBoostLibrary,iostreams,,+zlib))


+ 25
- 0
libs/boost/patches/01_fiber_fix.patch View File

@ -0,0 +1,25 @@
Index: boost_1_62_0/libs/fiber/build/Jamfile.v2
===================================================================
--- boost_1_62_0.orig/libs/fiber/build/Jamfile.v2
+++ boost_1_62_0/libs/fiber/build/Jamfile.v2
@@ -43,19 +43,6 @@ lib boost_fiber
recursive_timed_mutex.cpp
timed_mutex.cpp
scheduler.cpp
- : <link>shared:<library>../../context/build//boost_context
- [ requires cxx11_auto_declarations
- cxx11_constexpr
- cxx11_defaulted_functions
- cxx11_final
- cxx11_hdr_tuple
- cxx11_lambdas
- cxx11_noexcept
- cxx11_nullptr
- cxx11_rvalue_references
- cxx11_template_aliases
- cxx11_thread_local
- cxx11_variadic_templates ]
- ;
+ : <link>shared:<library>../../context/build//boost_context ;
boost-install boost_fiber ;

Loading…
Cancel
Save