vbox的更動 61503 路徑 trunk/src/VBox/Installer

時間撮記:

2016-6-6 下午05:57:57 (8 年 以前)

作者:

vboxsync

訊息:

deb/rpm: another chrpath fix

位置:

trunk/src/VBox/Installer/linux

檔案:

• debian/rules (修改) (2 筆差異)
• rpm/rules (修改) (1 筆差異)

trunk/src/VBox/Installer/linux/debian/rules

@@ -57 +57 @@
 verfile  := $(builddir)/version-generated.mk
 ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
+arch     := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "i386"; fi)
 -include $(vboxroot)/SVN_REVISION
 svnrev   :=$(if $(svn_revision),$(svn_revision),)
@@ -283 +284 @@
         mv $(archdir) $(prefix)/usr/lib/$(package)
         if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \
-            chrpath --keepgoing --replace /usr/lib/$(package) \
+            ../../../../tools/linux.$(arch)/bin/chrpath rpm/$(rpmname)chrpath \
+                --keepgoing --replace /usr/lib/$(package) \
                 $(prefix)/usr/lib/$(package)/*.so.5 \
                 $(prefix)/usr/lib/$(package)/plugins/platforms/*.so \

trunk/src/VBox/Installer/linux/rpm/rules

@@ -241 +241 @@
             rpm/VirtualBox.tmpl.spec > $(archdir)/VirtualBox.spec
         mv rpm/VirtualBox-$(ver) rpm/$(rpmname)
-        cp ../../../../tools/linux.amd64/bin/chrpath rpm/$(rpmname)
+        cp ../../../../tools/linux.$(arch)/bin/chrpath rpm/$(rpmname)
         tar -cf rpm/VirtualBox.tar -C rpm $(rpmname)
         rm -f rpmbuild/RPMS/*/VirtualBox*rpm