[pkg-boost-commits] r14596 - in boost/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2010-09-07 02:17:25 +0000 (Tue, 07 Sep 2010)
New Revision: 14596

Added:
   boost/trunk/debian/patches/remove-rpath.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
New patch to disable rpath-setting build code.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2010-09-02 06:46:08 UTC (rev 14595)
+++ boost/trunk/debian/changelog	2010-09-07 02:17:25 UTC (rev 14596)
@@ -1,4 +1,4 @@
-boost1.44 (1.44.0-1) unstable; urgency=low
+boost1.44 (1.44.0-1) UNRELEASED; urgency=low
 
   * New upstream.
     - patches/boost-build-pythonid.patch: Modify.  Partially applied upstream.
@@ -8,7 +8,9 @@
   
   * rules: The python build ID now specified using --python-buildid.
 
- -- Steve M. Robbins <smr at debian.org>  Tue, 31 Aug 2010 20:26:01 -0500
+  * patches/remove-rpath.patch: New.  Disable rpath-setting code.
+  
+ -- Steve M. Robbins <smr at debian.org>  Mon, 06 Sep 2010 21:16:55 -0500
 
 boost1.42 (1.42.0-4) unstable; urgency=low
 

Added: boost/trunk/debian/patches/remove-rpath.patch
===================================================================
--- boost/trunk/debian/patches/remove-rpath.patch	                        (rev 0)
+++ boost/trunk/debian/patches/remove-rpath.patch	2010-09-07 02:17:25 UTC (rev 14596)
@@ -0,0 +1,38 @@
+--- boost1.44-1.44.0.orig/tools/build/v2/tools/gcc.jam
++++ boost1.44-1.44.0/tools/build/v2/tools/gcc.jam
+@@ -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 * )
+--- boost1.44-1.44.0.orig/tools/build/v2/tools/gcc.py
++++ boost1.44-1.44.0/tools/build/v2/tools/gcc.py
+@@ -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) ' +

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2010-09-02 06:46:08 UTC (rev 14595)
+++ boost/trunk/debian/patches/series	2010-09-07 02:17:25 UTC (rev 14596)
@@ -10,3 +10,4 @@
 hurd-execution_monitor.patch
 kfreebsd-thread.patch
 fusion-name-qual.patch
+remove-rpath.patch