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

level up boost to version 0.46

Browse Source 
- remove dedicated bjam-package since its maintaincene seems to only happen inside the boost tree now
 - remove not anymore required patches
 - add patch to remove hardcoded linker flags from jam file and move them into the OpenWrt Makefile (-pthreads -lrt)
 - remove package boost-function_types

git-svn-id: svn://svn.openwrt.org/openwrt/packages@29189 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mirko
2011-11-16 17:09:20 +00:00
parent 5130b47998
commit f84f8b88fd
5 changed files with 45 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/boost/patches/010-one-cpu.patch
View File

@ -1,12 +0,0 @@
diff -Naur boost_1_35_0.orig/libs/thread/src/pthread/thread.cpp boost_1_35_0/libs/thread/src/pthread/thread.cpp
--- boost_1_35_0.orig/libs/thread/src/pthread/thread.cpp 2008-05-08 06:18:57.000000000 -0400
+++ boost_1_35_0/libs/thread/src/pthread/thread.cpp 2008-05-08 06:20:15.000000000 -0400
@@ -419,7 +419,7 @@
#if defined(PTW32_VERSION) || defined(__hpux)
return pthread_num_processors_np();
#elif defined(__linux__)
- return get_nprocs();
+ return 1;
#elif defined(__APPLE__) || defined(__FreeBSD__)
int count;
size_t size=sizeof(count);

11
libs/boost/patches/020-buildin-offsetof.patch
View File

@ -1,11 +0,0 @@
--- boost_1_38_0/boost/python/detail/config.hpp 2007-11-25 19:07:19.000000000 +0100
+++ boost_1_38_0/boost/python/detail/config.hpp 2010-02-26 02:06:26.000000000 +0100
@@ -111,7 +111,7 @@
# define BOOST_PYTHON_OFFSETOF(s_name, s_member) \
((size_t)__INTADDR__(&(((s_name *)0)->s_member)))
#else
-# define BOOST_PYTHON_OFFSETOF offsetof
+# define BOOST_PYTHON_OFFSETOF __builtin_offsetof
#endif
// enable automatic library variant selection ------------------------------//

27
libs/boost/patches/100-do-not-use-librt.patch Normal file
View File

@ -0,0 +1,27 @@
diff -ruN boost_1_48_0.orig/tools/build/v2/tools/gcc.jam boost_1_48_0/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
+++ boost_1_48_0/tools/build/v2/tools/gcc.jam 2011-11-16 13:15:49.071254804 +0100
@@ -1063,8 +1063,7 @@
}
case * :
{
- option = -pthread ;
- libs = rt ;
+ # pass appropriate options via OpenWrt
}
}
diff -ruN boost_1_48_0.orig/tools/build/v2/tools/gcc.py boost_1_48_0/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
+++ boost_1_48_0/tools/build/v2/tools/gcc.py 2011-11-16 13:16:12.601254423 +0100
@@ -685,8 +685,8 @@
# Darwin has no threading options, don't set anything here.
pass
else:
- flags('gcc', 'OPTIONS', ['<threading>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