Bläddra i källkod

synergy: fix resolving of Buildroot git revision

Starting version v1.10.0-stable, Synergy tries to resolve the git revision in
the build directory. This causes CMake to either detect the Buildroot commit
or fail when no git repo is found.

By manually setting SYNERGY_VERSION_STAGE to another value then snapshot, this
behavior is skipped.

Fixes:
  http://autobuild.buildroot.net/results/5bab942322357bd71901cfc13ed3cff0c17edcce

Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Pieterjan Camerlynck 7 år sedan
förälder
incheckning
8ebe67a96f
1 ändrade filer med 4 tillägg och 0 borttagningar
  1. 4 0
      package/synergy/synergy.mk

+ 4 - 0
package/synergy/synergy.mk

@@ -10,6 +10,10 @@ SYNERGY_LICENSE = GPL-2.0
 SYNERGY_LICENSE_FILES = LICENSE
 SYNERGY_LICENSE_FILES = LICENSE
 SYNERGY_DEPENDENCIES = xlib_libX11 xlib_libXtst
 SYNERGY_DEPENDENCIES = xlib_libX11 xlib_libXtst
 
 
+# Avoid using buildroot commit hash inside cmake/Version.cmake
+# by setting SYNERGY_VERSION_STAGE != snapshot
+SYNERGY_CONF_ENV += SYNERGY_VERSION_STAGE="beta"
+
 ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y)
 ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y)
 SYNERGY_DEPENDENCIES += xlib_libXext
 SYNERGY_DEPENDENCIES += xlib_libXext
 endif
 endif