From ef37c1c2feb50684e796a59e096eb3e374a5d445 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Tue, 1 Mar 2011 13:23:27 +0100
Subject: boost: fix rpath isusse with version 1.45 and add bzip do depends

* add a patch to rip out -Wl,R stuff from gcc jam defs
* add bzip to depends as on the recipes before
* remove the doubled icu depend
* bump INC_PR und PR
---
 recipes/boost/boost-1.45.0/no_rpath.patch | 42 +++++++++++++++++++++++++++++++
 recipes/boost/boost-with-bjam.inc         |  4 +--
 recipes/boost/boost_1.45.0.bb             |  7 +++---
 3 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 recipes/boost/boost-1.45.0/no_rpath.patch

(limited to 'recipes/boost')

diff --git a/recipes/boost/boost-1.45.0/no_rpath.patch b/recipes/boost/boost-1.45.0/no_rpath.patch
new file mode 100644
index 0000000000..28dfcf1916
--- /dev/null
+++ b/recipes/boost/boost-1.45.0/no_rpath.patch
@@ -0,0 +1,42 @@
+Index: boost_1_45_0/tools/build/v2/tools/gcc.jam
+===================================================================
+--- boost_1_45_0.orig/tools/build/v2/tools/gcc.jam	2011-03-01 12:58:14.260753119 +0100
++++ boost_1_45_0/tools/build/v2/tools/gcc.jam	2011-03-01 12:59:19.683448119 +0100
+@@ -823,7 +823,7 @@
+ 
+ actions link bind LIBRARIES
+ {
+-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
++    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
+ 
+ }
+ 
+@@ -888,7 +888,7 @@
+ # Differs from 'link' above only by -shared.
+ actions link.dll bind LIBRARIES
+ {
+-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
++    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
+ }
+ 
+ rule setup-threading ( targets * : sources * : properties * )
+Index: boost_1_45_0/tools/build/v2/tools/gcc.py
+===================================================================
+--- boost_1_45_0.orig/tools/build/v2/tools/gcc.py	2011-03-01 12:59:22.784998119 +0100
++++ boost_1_45_0/tools/build/v2/tools/gcc.py	2011-03-01 12:59:49.821843119 +0100
+@@ -586,7 +586,6 @@
+ engine.register_action(
+     'gcc.link',
+     '"$(CONFIG_COMMAND)" -L"$(LINKPATH)" ' +
+-        '-Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" ' +
+         '-Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" ' +
+         '$(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) ' +
+         '-l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) ' +
+@@ -648,7 +647,6 @@
+     'gcc.link.dll',
+     # Differ from 'link' above only by -shared.
+     '"$(CONFIG_COMMAND)" -L"$(LINKPATH)" ' +
+-        '-Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" ' +
+         '"$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" ' +
+         '$(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) ' +
+         '-shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) ' +
diff --git a/recipes/boost/boost-with-bjam.inc b/recipes/boost/boost-with-bjam.inc
index ac6f485a10..68d9e748ed 100644
--- a/recipes/boost/boost-with-bjam.inc
+++ b/recipes/boost/boost-with-bjam.inc
@@ -10,10 +10,10 @@
 DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
 HOMEPAGE = "http://www.boost.org/"
 SECTION = "libs"
-DEPENDS = "zlib icu"
+DEPENDS = "zlib bzip2 icu"
 PRIORITY = "optional"
 LICENSE = "Boost Software License"
-INC_PR = "r9"
+INC_PR = "r10"
 
 BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
 BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
diff --git a/recipes/boost/boost_1.45.0.bb b/recipes/boost/boost_1.45.0.bb
index 1d9373601d..fc9bcf6c4b 100644
--- a/recipes/boost/boost_1.45.0.bb
+++ b/recipes/boost/boost_1.45.0.bb
@@ -1,17 +1,16 @@
 require boost-with-bjam.inc
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = " \
   http://downloads.sourceforge.net/project/boost/boost/1.45.0/boost_1_45_0.tar.gz \
   file://01-fix-default-python-config.patch \
+  file://no_rpath.patch \
 "
+
 S = "${WORKDIR}/boost_1_45_0"
 
 SRC_URI[md5sum] = "739792c98fafb95e7a6b5da23a30062c"
 SRC_URI[sha256sum] = "7cd7a327ebe0f43db829eccce024b7f3b0d9d4d382422d59dc710793d55c6a12"
-
-DEPENDS += " icu "
-
-- 
cgit 1.2.3-korg