VirtualBox

Changeset 61503 in vbox for trunk/src/VBox/Installer/linux


Ignore:
Timestamp:
Jun 6, 2016 5:57:57 PM (9 years ago)
Author:
vboxsync
Message:

deb/rpm: another chrpath fix

Location:
trunk/src/VBox/Installer/linux
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Installer/linux/debian/rules

    r61488 r61503  
    5757verfile  := $(builddir)/version-generated.mk
    5858ose      := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1))
     59arch     := $(shell if [ `uname -m` = "x86_64" ]; then echo "amd64"; else echo "i386"; fi)
    5960-include $(vboxroot)/SVN_REVISION
    6061svnrev   :=$(if $(svn_revision),$(svn_revision),)
     
    283284        mv $(archdir) $(prefix)/usr/lib/$(package)
    284285        if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \
    285             chrpath --keepgoing --replace /usr/lib/$(package) \
     286            ../../../../tools/linux.$(arch)/bin/chrpath rpm/$(rpmname)chrpath \
     287                --keepgoing --replace /usr/lib/$(package) \
    286288                $(prefix)/usr/lib/$(package)/*.so.5 \
    287289                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so \
  • trunk/src/VBox/Installer/linux/rpm/rules

    r61488 r61503  
    241241            rpm/VirtualBox.tmpl.spec > $(archdir)/VirtualBox.spec
    242242        mv rpm/VirtualBox-$(ver) rpm/$(rpmname)
    243         cp ../../../../tools/linux.amd64/bin/chrpath rpm/$(rpmname)
     243        cp ../../../../tools/linux.$(arch)/bin/chrpath rpm/$(rpmname)
    244244        tar -cf rpm/VirtualBox.tar -C rpm $(rpmname)
    245245        rm -f rpmbuild/RPMS/*/VirtualBox*rpm
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette