Hi,
I noticed, that the boost package is broken. There is a wrong '\' at
end of a line. Patch is attached.

Editing the boost package, I changed the config style for the libraries
to build to a Config.in interface and added some other libs someone
maybe need and also python bindings. Patch is attached, too.


Alex
Index: libs/boost/Config.in
===================================================================
--- libs/boost/Config.in	(revision 0)
+++ libs/boost/Config.in	(revision 0)
@@ -0,0 +1,41 @@
+config BOOST_WITH_SERIALIZATION
+	bool "Include boost-serialization library"
+	depends PACKAGE_boost
+	default n
+
+config BOOST_WITH_REGEX
+	bool "Include boost-regex library"
+	depends PACKAGE_boost
+	default n
+
+config BOOST_WITH_SYSTEM
+	bool "Include boost-system library"
+	depends PACKAGE_boost
+	default n
+
+config BOOST_WITH_DATE_TIME
+	bool "Include boost-date_time library"
+	depends PACKAGE_boost
+	default n
+
+config BOOST_WITH_IOSTREAMS
+	bool "Include boost-iostreams library"
+	depends PACKAGE_boost
+	depends PACKAGE_zlib
+	default n
+
+config BOOST_WITH_FILESYSTEM
+	bool "Include boost-filesystem library"
+	depends PACKAGE_boost
+	default n
+
+config BOOST_WITH_PROGRAM_OPTIONS
+	bool "Include boost-program_options library"
+	depends PACKAGE_boost
+	default n
+
+config BOOST_WITH_PYTHON
+	bool "Include python bindings"
+	depends PACKAGE_boost
+	depends PACKAGE_python
+	default n
Index: libs/boost/Makefile
===================================================================
--- libs/boost/Makefile	(revision 19829)
+++ libs/boost/Makefile	(working copy)
@@ -29,20 +29,10 @@
   URL:=http://www.boost.org/
 endef
 
-define Package/boost-serialization
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Boost-serialization library
-  DEPENDS:=+boost
+define Package/boost/config
+	source "$(SOURCE)/Config.in"
 endef
 
-define Package/boost-regex
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Boost-regex library
-  DEPENDS:=+boost
-endef
-
 define Build/Configure
 endef
 
@@ -52,11 +42,19 @@
 define Build/Compile
 	( cd $(PKG_BUILD_DIR) ; \
 		echo "using gcc : : $(GNU_TARGET_NAME)-gcc : <cflags>$(CFLAGS) <cxxflags>$(CXXFLAGS) <linkflags>$(LDFLAGS) ;" > tools/build/v2/site-config.jam ; \
+		$(if $(CONFIG_BOOST_WITH_PYTHON),echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python : $(STAGING_DIR)/usr/include/python2.6/ ;" >> tools/build/v2/site-config.jam ;) \
 		bjam \
 			'-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
 			--toolset=gcc --build-type=minimal --layout=system \
-			$(patsubst %,--with-regex,$(filter y m,$(CONFIG_PACKAGE_boost-regex))) \
-			$(patsubst %,--with-serialization,$(filter y m,$(CONFIG_PACKAGE_boost-serialization))) \
+			$(patsubst %,--with-regex,$(CONFIG_BOOST_WITH_REGEX)) \
+			$(patsubst %,--with-serialization,$(CONFIG_BOOST_WITH_SERIALIZATION)) \
+			$(patsubst %,--with-system,$(CONFIG_BOOST_WITH_SYSTEM)) \
+			$(patsubst %,--with-date_time,$(CONFIG_BOOST_WITH_DATE_TIME)) \
+			$(patsubst %,--with-iostreams -sNO_BZIP2=1 -sZLIB_INCLUDE=$(STAGEING_DIR)/usr/include \
+				     -sZLIB_LIBPATH=$(STAGEING_DIR)/usr/lib,$(CONFIG_BOOST_WITH_IOSTREAMS)) \
+			$(patsubst %,--with-filesystem,$(CONFIG_BOOST_WITH_FILESYSTEM)) \
+			$(patsubst %,--with-program_options,$(CONFIG_BOOST_WITH_PROGRAM_OPTIONS)) \
+			$(patsubst %,--with-python,$(CONFIG_BOOST_WITH_PYTHON)) \
 			$(CONFIGURE_ARGS) \
 			install \
 	)
@@ -78,6 +76,4 @@
 	$(CP) $(PKG_INSTALL_DIR)/lib/*.so* $(1)/usr/lib/
 endef
 
-$(eval $(call BuildPackage,boost-serialization))
-$(eval $(call BuildPackage,boost-regex))
 $(eval $(call BuildPackage,boost))
Index: libs/boost/Makefile
===================================================================
--- libs/boost/Makefile	(revision 19829)
+++ libs/boost/Makefile	(working copy)
@@ -14,7 +14,7 @@
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=...@sf/boost \
+PKG_SOURCE_URL:=...@sf/boost
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
 PKG_MD5SUM:=a4fc691c4e7c49b3b9b54a667d8f5529
 

Attachment: signature.asc
Description: PGP signature

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to