Fixes #11018.
Signed-off-by: Stefan Schantl stefan.schantl@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 = 1 ver_minor = 60 ver_plevel = 0 version = %{ver_major}.%{ver_minor}.%{ver_plevel} -release = 1 +release = 2
groups = System/Libraries url = 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 + + 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)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + } + + +@@ -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=-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 * )
I suppose this was sent with an incorrect bug id.
On Mon, 2016-11-28 at 13:18 +0100, Stefan Schantl wrote:
Fixes #11018.
Signed-off-by: Stefan Schantl stefan.schantl@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 = 1 ver_minor = 60 ver_plevel = 0 version = %{ver_major}.%{ver_minor}.%{ver_plevel} -release = 1 +release = 2 groups = System/Libraries url = 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 +
- 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)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
- }
+ + +@@ -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=-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 * )
-
Michael Tremer -
Stefan Schantl