bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] boost: update to v1.48.0, fix compilation with gcc 4.6

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@30524 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-02-14 17:20:23 +00:00
parent 3f20ac0443
commit 5935f39396
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/boost/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2009-2010 OpenWrt.org # Copyright (C) 2009-2012 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -10,14 +10,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=boost PKG_NAME:=boost
PKG_VERSION:=1_46_0 PKG_VERSION:=1_48_0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz 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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_VERSION)
PKG_MD5SUM:=820393d5746553c192db7b81ba0e53fe PKG_MD5SUM:=313a11e97eb56eb7efd18325354631be
PKG_BUILD_DEPENDS:=boost/host PKG_BUILD_DEPENDS:=boost/host
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
@ -141,11 +141,11 @@ endef
define Host/Compile define Host/Compile
# bjam does not provide a configure-script nor a Makefile # bjam does not provide a configure-script nor a Makefile
( cd $(HOST_BUILD_DIR)/tools/build/v2/engine/src ; ./build.sh gcc ) ( cd $(HOST_BUILD_DIR)/tools/build/v2/engine ; ./build.sh gcc )
endef endef
CONFIGURE_PREFIX:=$(PKG_INSTALL_DIR) CONFIGURE_PREFIX:=$(PKG_INSTALL_DIR)
TARGET_LDFLAGS += -pthreads -lrt TARGET_LDFLAGS += -pthread -lrt
define Build/Compile define Build/Compile
( cd $(PKG_BUILD_DIR) ; \ ( cd $(PKG_BUILD_DIR) ; \
@ -195,7 +195,7 @@ endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
$(CP) $(HOST_BUILD_DIR)/tools/build/v2/engine/src/bin.*/bjam $(STAGING_DIR_HOST)/bin/ $(CP) $(HOST_BUILD_DIR)/tools/build/v2/engine/bin.*/bjam $(STAGING_DIR_HOST)/bin/
endef endef
define Package/boost/Default/install define Package/boost/Default/install

2
libs/boost/patches/100-do-not-use-librt.patch
View File

@ -1,6 +1,6 @@
--- a/tools/build/v2/tools/gcc.jam --- a/tools/build/v2/tools/gcc.jam
+++ b/tools/build/v2/tools/gcc.jam +++ b/tools/build/v2/tools/gcc.jam
@@ -1018,8 +1018,7 @@ rule setup-threading ( targets * : sourc @@ -1063,8 +1063,7 @@ rule setup-threading ( targets * : sourc
} }
case * : case * :
{ {