From c214923c555d86a9f05f7b4cbbffa597392e0e6b Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 17 Feb 2015 15:16:59 +0000 Subject: [PATCH] boost: moved to github Signed-off-by: Steven Barth SVN-Revision: 44483 --- libs/boost/Makefile | 378 ------------------ libs/boost/patches/100-do-not-use-librt.patch | 25 -- .../patches/200-cstdint_missing_include.patch | 12 - 3 files changed, 415 deletions(-) delete mode 100644 libs/boost/Makefile delete mode 100644 libs/boost/patches/100-do-not-use-librt.patch delete mode 100644 libs/boost/patches/200-cstdint_missing_include.patch diff --git a/libs/boost/Makefile b/libs/boost/Makefile deleted file mode 100644 index 42ee58e3b..000000000 --- a/libs/boost/Makefile +++ /dev/null @@ -1,378 +0,0 @@ -# -# Copyright (C) 2009-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -# Dude, this "boost" is really one of the most crude stuff I ported yet. - -include $(TOPDIR)/rules.mk - -PKG_NAME:=boost -PKG_VERSION:=1_51_0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/boost -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION) -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_VERSION) -PKG_MD5SUM:=6a1f32d902203ac70fbec78af95b3cf8 - -PKG_BUILD_DEPENDS:=boost/host -PKG_BUILD_PARALLEL:=0 -PKG_USE_MIPS16:=0 - -PKG_CONFIG_DEPENDS := \ - CONFIG_PACKAGE_boost-date_time \ - CONFIG_PACKAGE_boost-filesystem \ - CONFIG_PACKAGE_boost-graph \ - CONFIG_PACKAGE_boost-iostreams \ - CONFIG_PACKAGE_boost-math \ - CONFIG_PACKAGE_boost-program_options \ - CONFIG_PACKAGE_boost-python \ - CONFIG_PACKAGE_boost-regex \ - CONFIG_PACKAGE_boost-serialization \ - CONFIG_PACKAGE_boost-signals \ - CONFIG_PACKAGE_boost-system \ - CONFIG_PACKAGE_boost-test \ - CONFIG_PACKAGE_boost-thread \ - CONFIG_PACKAGE_boost-wave \ - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk - -define Package/boost/Default - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Boost C++ source libraries - URL:=http://www.boost.org - DEPENDS:=+libstdcpp +libpthread +librt - MAINTAINER:=Mirko Vogt -endef - -define Package/boost/Default/description - Boost provides free peer-reviewed portable C++ source libraries -endef - -define Package/boost-chrono - $(call Package/boost/Default) - TITLE+= (chrono) - DEPENDS+= +boost-system -endef - -define Package/boost-date_time - $(call Package/boost/Default) - TITLE+= (date_time) -endef - -define Package/boost-exception - $(call Package/boost/Default) - TITLE+= (exception) -endef - -define Package/boost-filesystem - $(call Package/boost/Default) - TITLE+= (filesystem) - DEPENDS+= +boost-system -endef - -define Package/boost-graph - $(call Package/boost/Default) - TITLE+= (graph) - DEPENDS+= +boost-regex -endef - -define Package/boost-graph_parallel - $(call Package/boost/Default) - TITLE+= (graph_parallel) -endef - -define Package/boost-iostreams - $(call Package/boost/Default) - TITLE+= (iostreams) - DEPENDS+= +zlib -endef - -define Package/boost-locale - $(call Package/boost/Default) - TITLE+= (locale) -endef - -define Package/boost-math - $(call Package/boost/Default) - TITLE+= (math) -endef - -define Package/boost-mpi - $(call Package/boost/Default) - TITLE+= (mpi) -endef - -define Package/boost-program_options - $(call Package/boost/Default) - TITLE+= (program_options) -endef - -define Package/boost-python - $(call Package/boost/Default) - TITLE+= (python) - DEPENDS+= +PACKAGE_boost-python:python -endef - -define Package/boost-random - $(call Package/boost/Default) - TITLE+= (random) -endef - -define Package/boost-regex - $(call Package/boost/Default) - TITLE+= (regex) -endef - -define Package/boost-serialization - $(call Package/boost/Default) - TITLE+= (serialization) -endef - -define Package/boost-signals - $(call Package/boost/Default) - TITLE+= (signals) -endef - -define Package/boost-system - $(call Package/boost/Default) - TITLE+= (system) -endef - -define Package/boost-test - $(call Package/boost/Default) - TITLE+= (test) -endef - -define Package/boost-thread - $(call Package/boost/Default) - TITLE+= (thread) - DEPENDS+= +boost-system +boost-chrono -endef - -define Package/boost-timer - $(call Package/boost/Default) - TITLE+= (timer) - DEPENDS+= boost-chrono -endef - -define Package/boost-wave - $(call Package/boost/Default) - TITLE+= (wave) - DEPENDS+= +boost-date_time +boost-thread +boost-filesystem -endef - -define Package/boost - $(call Package/boost/Default) - TITLE+= (header-only) - BUILDONLY:=1 -endef - -define Build/Configure -endef - -define Host/Compile - # bjam does not provide a configure-script nor a Makefile - ( cd $(HOST_BUILD_DIR)/tools/build/v2/engine ; ./build.sh gcc ) -endef - -CONFIGURE_PREFIX:=$(PKG_INSTALL_DIR) -TARGET_LDFLAGS += -pthread -lrt - -define Build/Compile - ( cd $(PKG_BUILD_DIR) ; \ - echo "using gcc : $(ARCH) : $(GNU_TARGET_NAME)-gcc : \"$(TARGET_CFLAGS)\" \"$(TARGET_CXXFLAGS)\" \"$(TARGET_LDFLAGS)\" ;" > tools/build/v2/user-config.jam ; \ - $(if $(CONFIG_PACKAGE_boost-python), \ - echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python : $(STAGING_DIR)/usr/include/python2.7/ ;" >> \ - tools/build/v2/user-config.jam; \ - ) \ - bjam \ - '-sBUILD=release space on off' \ - --toolset=gcc-$(ARCH) --build-type=minimal --layout=system \ - --disable-long-double \ - $(CONFIGURE_ARGS) \ - $(if $(CONFIG_PACKAGE_boost-chrono),,--without-chrono) \ - $(if $(CONFIG_PACKAGE_boost-date_time),,--without-date_time) \ - $(if $(CONFIG_PACKAGE_boost-exception),,--without-exception) \ - $(if $(CONFIG_PACKAGE_boost-filesystem),,--without-filesystem) \ - $(if $(CONFIG_PACKAGE_boost-graph),,--without-graph) \ - $(if $(CONFIG_PACKAGE_boost-graph_parallel),,--without-graph_parallel) \ - $(if $(CONFIG_PACKAGE_boost-iostreams),,--without-iostreams) \ - $(if $(CONFIG_PACKAGE_boost-locale),,--without-locale) \ - $(if $(CONFIG_PACKAGE_boost-math),,--without-math) \ - $(if $(CONFIG_PACKAGE_boost-mpi),,--without-mpi) \ - $(if $(CONFIG_PACKAGE_boost-program_options),,--without-program_options) \ - $(if $(CONFIG_PACKAGE_boost-python),,--without-python) \ - $(if $(CONFIG_PACKAGE_boost-random),,--without-random) \ - $(if $(CONFIG_PACKAGE_boost-regex),,--without-regex) \ - $(if $(CONFIG_PACKAGE_boost-serialization),,--without-serialization) \ - $(if $(CONFIG_PACKAGE_boost-signals),,--without-signals) \ - $(if $(CONFIG_PACKAGE_boost-system),,--without-system) \ - $(if $(CONFIG_PACKAGE_boost-test),,--without-test) \ - $(if $(CONFIG_PACKAGE_boost-thread),,--without-thread) \ - $(if $(CONFIG_PACKAGE_boost-timer),,--without-timer) \ - $(if $(CONFIG_PACKAGE_boost-wave),,--without-wave) \ - \ - $(if $(CONFIG_PACKAGE_boost-iostreams),-sNO_BZIP2=1 -sZLIB_INCLUDE=$(STAGING_DIR)/usr/include \ - -sZLIB_LIBPATH=$(STAGING_DIR)/usr/lib) \ - install \ - ) -endef - -define Build/InstallDev - $(INSTALL_DIR) \ - $(1)/usr/include/boost/ - - $(CP) \ - $(PKG_INSTALL_DIR)/include/boost/* \ - $(1)/usr/include/boost/ \ - # copies _all_ header files - independent of <--with-library>-argument above - - if [ -d $(PKG_INSTALL_DIR)/lib ]; then \ - $(INSTALL_DIR) \ - $(1)/usr/lib; \ - $(CP) \ - $(PKG_INSTALL_DIR)/lib/*.a \ - $(1)/usr/lib/; \ - $(CP) \ - $(PKG_INSTALL_DIR)/lib/*.so* \ - $(1)/usr/lib/; \ - fi -endef - -define Host/Install - $(INSTALL_DIR) \ - $(STAGING_DIR_HOST)/bin - - $(CP) \ - $(HOST_BUILD_DIR)/tools/build/v2/engine/bin.*/bjam \ - $(STAGING_DIR_HOST)/bin/ -endef - -define Package/boost/Default/install - $(INSTALL_DIR) \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/lib/libboost_$(2)*.so* \ - $(1)/usr/lib/ -endef - -define Package/boost-chrono/install - $(call Package/boost/Default/install,$(1),chrono) -endef - -define Package/boost-date_time/install - $(call Package/boost/Default/install,$(1),date_time) -endef - -define Package/boost-exception/install - $(call Package/boost/Default/install,$(1),exception) -endef - -define Package/boost-filesystem/install - $(call Package/boost/Default/install,$(1),filesystem) -endef - -define Package/boost-graph/install - $(call Package/boost/Default/install,$(1),graph) -endef - -define Package/boost-graph_parallel/install - $(call Package/boost/Default/install,$(1),graph_parallel) -endef - -define Package/boost-iostreams/install - $(call Package/boost/Default/install,$(1),iostreams) -endef - -define Package/boost-math/install - $(call Package/boost/Default/install,$(1),math) -endef - -define Package/boost-mpi/install - $(call Package/boost/Default/install,$(1),mpi) -endef - -define Package/boost-program_options/install - $(call Package/boost/Default/install,$(1),program_options) -endef - -define Package/boost-python/install - $(call Package/boost/Default/install,$(1),python) -endef - -define Package/boost-random/install - $(call Package/boost/Default/install,$(1),random) -endef - -define Package/boost-regex/install - $(call Package/boost/Default/install,$(1),regex) -endef - -define Package/boost-serialization/install - $(call Package/boost/Default/install,$(1),serialization) -endef - -define Package/boost-signals/install - $(call Package/boost/Default/install,$(1),signals) -endef - -define Package/boost-system/install - $(call Package/boost/Default/install,$(1),system) -endef - -define Package/boost-test/install - $(INSTALL_DIR) \ - $(1)/usr/lib - - $(CP) \ - $(PKG_INSTALL_DIR)/lib/libboost_unit_test_framework*.so* \ - $(1)/usr/lib/ - - $(CP) \ - $(PKG_INSTALL_DIR)/lib/libboost_prg_exec_monitor*.so* \ - $(1)/usr/lib/ -endef - -define Package/boost-thread/install - $(call Package/boost/Default/install,$(1),thread) -endef - -define Package/boost-timer/install - $(call Package/boost/Default/install,$(1),timer) -endef - -define Package/boost-wave/install - $(call Package/boost/Default/install,$(1),wave) -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,boost)) -$(eval $(call BuildPackage,boost-chrono)) -$(eval $(call BuildPackage,boost-date_time)) -#$(eval $(call BuildPackage,boost-exception)) -$(eval $(call BuildPackage,boost-filesystem)) -$(eval $(call BuildPackage,boost-graph)) -#$(eval $(call BuildPackage,boost-graph_parallel)) -$(eval $(call BuildPackage,boost-iostreams)) -$(eval $(call BuildPackage,boost-locale)) -$(eval $(call BuildPackage,boost-math)) -#$(eval $(call BuildPackage,boost-mpi)) -$(eval $(call BuildPackage,boost-program_options)) -$(eval $(call BuildPackage,boost-random)) -$(eval $(call BuildPackage,boost-python)) -$(eval $(call BuildPackage,boost-regex)) -$(eval $(call BuildPackage,boost-serialization)) -$(eval $(call BuildPackage,boost-signals)) -$(eval $(call BuildPackage,boost-system)) -$(eval $(call BuildPackage,boost-test)) -$(eval $(call BuildPackage,boost-thread)) -$(eval $(call BuildPackage,boost-timer)) -$(eval $(call BuildPackage,boost-wave)) diff --git a/libs/boost/patches/100-do-not-use-librt.patch b/libs/boost/patches/100-do-not-use-librt.patch deleted file mode 100644 index d1c0f3785..000000000 --- a/libs/boost/patches/100-do-not-use-librt.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/tools/build/v2/tools/gcc.jam -+++ b/tools/build/v2/tools/gcc.jam -@@ -1063,8 +1063,7 @@ rule setup-threading ( targets * : sourc - } - case * : - { -- option = -pthread ; -- libs = rt ; -+ # pass appropriate options via OpenWrt - } - } - ---- a/tools/build/v2/tools/gcc.py -+++ b/tools/build/v2/tools/gcc.py -@@ -685,8 +685,8 @@ elif bjam.variable('UNIX'): - # Darwin has no threading options, don't set anything here. - pass - else: -- flags('gcc', 'OPTIONS', ['multi'], ['-pthread']) -- flags('gcc', 'FINDLIBS-SA', [], ['rt']) -+ # pass appropriate options via OpenWrt -+ pass - - def cpu_flags(toolset, variable, architecture, instruction_set, values, default=None): - #FIXME: for some reason this fails. Probably out of date feature code diff --git a/libs/boost/patches/200-cstdint_missing_include.patch b/libs/boost/patches/200-cstdint_missing_include.patch deleted file mode 100644 index 4cb778de8..000000000 --- a/libs/boost/patches/200-cstdint_missing_include.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/libs/context/src/fcontext.cpp.new 2012-12-11 17:59:59.349131458 +0100 -+++ b/libs/context/src/fcontext.cpp 2012-12-11 18:00:06.925131652 +0100 -@@ -9,6 +9,9 @@ - #include - - #include -+extern "C" { -+#include -+} - - #ifdef BOOST_HAS_ABI_HEADERS - # include BOOST_ABI_PREFIX -- 2.30.2