[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.2.1/experimental r1991: explicitly set LD_PRELOAD



------------------------------------------------------------
revno: 1991
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2010-05-20 13:28:24 +0200
message:
  explicitly set LD_PRELOAD
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2010-05-19 20:14:44 +0000
+++ b/changelog	2010-05-20 11:28:24 +0000
@@ -16,8 +16,10 @@
   * debian/rules:
     - start a next try to run the smoketest after the build. move the tests in
       the non-fakeroot part of the build (call test in build)
+    - explicitly set LD_PRELOAD so that we don't get loads of
+      libfakeroot-sysv.so preloading errors during make install anymore
 
- -- Rene Engelhard <rene@debian.org>  Wed, 19 May 2010 19:54:36 +0000
+ -- Rene Engelhard <rene@debian.org>  Thu, 20 May 2010 00:52:55 +0200
 
 openoffice.org (1:3.2.1~rc1-2) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules	2010-05-19 20:14:44 +0000
+++ b/rules	2010-05-20 11:28:24 +0000
@@ -2055,8 +2055,12 @@
 	rm -rf $(SOURCE_TREE)/instsetoo_native/util/OpenOffice
 
 	# install OpenOffice.org.
+	# somehow in the installer LD_LIBRARY_PATH doesn't contain
+	# /usr/lib/libfakeroot anymore, causiong loads of ERROR:'s from
+	# ld.so. Set LD_PRELOAD to the full path here manually.
 	cd $(OOO_BUILD_TREE)/; PATH=$(BUILD_PATH) \
 		 LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)" \
+		 LD_PRELOAD=/usr/lib/libfakeroot/libfakeroot-$(shell update-alternatives --query fakeroot | grep Value: | cut -d"-" -f2).so \
 		 DESTDIR=$(CURDIR)/debian/tmp $(MAKE) install
 
 	# prepare install/dir files for dh


Reply to: