From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCHv2] boost: Fix RPATH issue on i686.
Date: Mon, 28 Nov 2016 13:20:15 +0100
Message-ID: <1480335615-4175-1-git-send-email-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2166662711029913643=="
List-Id: <development.lists.ipfire.org>

--===============2166662711029913643==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Fixes #11176.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 boost/boost.nm                             |  2 +-
 boost/patches/boost-1.60.0-no-rpath.patch0 | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 boost/patches/boost-1.60.0-no-rpath.patch0

diff --git a/boost/boost.nm b/boost/boost.nm
index 0a6af33..1e6038c 100644
--- a/boost/boost.nm
+++ b/boost/boost.nm
@@ -8,7 +8,7 @@ ver_major  =3D 1
 ver_minor  =3D 60
 ver_plevel =3D 0
 version    =3D %{ver_major}.%{ver_minor}.%{ver_plevel}
-release    =3D 1
+release    =3D 2
=20
 groups     =3D System/Libraries
 url        =3D http://www.boost.org/
diff --git a/boost/patches/boost-1.60.0-no-rpath.patch0 b/boost/patches/boost=
-1.60.0-no-rpath.patch0
new file mode 100644
index 0000000..eed65c2
--- /dev/null
+++ b/boost/patches/boost-1.60.0-no-rpath.patch0
@@ -0,0 +1,21 @@
+diff -up tools/build/src/tools/gcc.jam.rpath tools/build/src/tools/gcc.jam
+--- tools/build/src/tools/gcc.jam.rpath	2016-05-27 13:30:01.092192721 -0500
++++ tools/build/src/tools/gcc.jam	2016-05-27 13:30:46.686987585 -0500
+@@ -952,7 +952,7 @@ rule link ( targets * : sources * : prop
+=20
+ actions link bind LIBRARIES
+ {
+-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=3D-R)$(SPACE)-=
Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROU=
P) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PF=
X) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
++    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(=
LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLI=
BS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
+ }
+=20
+=20
+@@ -1018,7 +1018,7 @@ rule link.dll ( targets * : sources * :
+ # Differs from 'link' above only by -shared.
+ actions link.dll bind LIBRARIES
+ {
+-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=3D-R)$(SPACE)-=
Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SON=
AME_OPTION)$(SPACE)-Wl,$(<[-1]:D=3D) -shared $(START-GROUP) "$(>)" "$(LIBRARI=
ES)" $(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=3D) -shared $(=
START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FIND=
LIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
+ }
+=20
+ rule setup-threading ( targets * : sources * : properties * )
--=20
2.7.4


--===============2166662711029913643==--