diff options
| author | Stefan Wildemann <gta04@metalstrolche.de> | 2017-12-26 11:54:13 +0100 |
|---|---|---|
| committer | Stefan Wildemann <gta04@metalstrolche.de> | 2017-12-26 12:43:50 +0100 |
| commit | 84541ba6dce2c81ae34903dbcb4d8aaff581f78f (patch) | |
| tree | 642e9df767ba9bb8faf2e973ef1a353057acb3ba | |
| parent | 6f880edfe029dee18cbe63bafd5e3b5bb92d4bdd (diff) | |
| download | navit-84541ba6dce2c81ae34903dbcb4d8aaff581f78f.tar.gz | |
Allow building on new sailfish SDK which uses different tool paths
| -rwxr-xr-x | contrib/sailfish/build_on_sailfish_sdk.sh | 4 | ||||
| -rwxr-xr-x | contrib/sailfish/navit-sailfish.spec | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/contrib/sailfish/build_on_sailfish_sdk.sh b/contrib/sailfish/build_on_sailfish_sdk.sh index 663d31b48..f9e75ec24 100755 --- a/contrib/sailfish/build_on_sailfish_sdk.sh +++ b/contrib/sailfish/build_on_sailfish_sdk.sh @@ -1,7 +1,7 @@ #! /bin/sh #run on the Sailfish OS sdk virtual machine. Check that rpmbuild directory exists. #arm devices -sb2 -t SailfishOS-armv7hl -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec +sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec #intel devices -sb2 -t SailfishOS-i486 -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec +sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec index a798aa487..d8799fb41 100755 --- a/contrib/sailfish/navit-sailfish.spec +++ b/contrib/sailfish/navit-sailfish.spec @@ -15,6 +15,8 @@ License: GPL Group: Applications/Productivity URL: http://navit-projet.org/ +#git is vor version info while building +BuildRequires: git BuildRequires: gcc BuildRequires: cmake BuildRequires: glib2-devel |