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

[packages] boost: fix compile failure (#10535, thanks zhenglei), refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@29873 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
swalker 2012-01-23 12:31:38 +00:00
parent c7d5e5dbd4
commit 92c8129c46
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/boost/Makefile
View File

@ -149,7 +149,7 @@ TARGET_LDFLAGS += -pthreads -lrt
define Build/Compile define Build/Compile
( cd $(PKG_BUILD_DIR) ; \ ( cd $(PKG_BUILD_DIR) ; \
echo "using gcc : : $(GNU_TARGET_NAME)-gcc : <cflags>$(TARGET_CFLAGS) <cxxflags>$(TARGET_CXXFLAGS) <linkflags>$(TARGET_LDFLAGS) ;" > tools/build/v2/site-config.jam ; \ echo "using gcc : : $(GNU_TARGET_NAME)-gcc : <compileflags>\"$(TARGET_CFLAGS)\" <cxxflags>\"$(TARGET_CXXFLAGS)\" <linkflags>\"$(TARGET_LDFLAGS)\" ;" > tools/build/v2/site-config.jam ; \
$(if $(CONFIG_PACKAGE_boost-python), \ $(if $(CONFIG_PACKAGE_boost-python), \
echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python : $(STAGING_DIR)/usr/include/python2.6/ ;" >> \ echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python : $(STAGING_DIR)/usr/include/python2.6/ ;" >> \
tools/build/v2/site-config.jam; \ tools/build/v2/site-config.jam; \

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

@ -1,7 +1,6 @@
diff -ruN boost_1_48_0.orig/tools/build/v2/tools/gcc.jam boost_1_48_0/tools/build/v2/tools/gcc.jam --- a/tools/build/v2/tools/gcc.jam
--- boost_1_48_0.orig/tools/build/v2/tools/gcc.jam 2011-06-06 22:36:21.000000000 +0200 +++ b/tools/build/v2/tools/gcc.jam
+++ boost_1_48_0/tools/build/v2/tools/gcc.jam 2011-11-16 13:15:49.071254804 +0100 @@ -1018,8 +1018,7 @@ rule setup-threading ( targets * : sourc
@@ -1063,8 +1063,7 @@
} }
case * : case * :
{ {
@ -11,10 +10,9 @@ diff -ruN boost_1_48_0.orig/tools/build/v2/tools/gcc.jam boost_1_48_0/tools/buil
} }
} }
diff -ruN boost_1_48_0.orig/tools/build/v2/tools/gcc.py boost_1_48_0/tools/build/v2/tools/gcc.py --- a/tools/build/v2/tools/gcc.py
--- boost_1_48_0.orig/tools/build/v2/tools/gcc.py 2011-01-25 19:06:12.000000000 +0100 +++ b/tools/build/v2/tools/gcc.py
+++ boost_1_48_0/tools/build/v2/tools/gcc.py 2011-11-16 13:16:12.601254423 +0100 @@ -685,8 +685,8 @@ elif bjam.variable('UNIX'):
@@ -685,8 +685,8 @@
# Darwin has no threading options, don't set anything here. # Darwin has no threading options, don't set anything here.
pass pass
else: else: