diff options
| author | aehs29@gmail.com <aehs29@gmail.com> | 2019-09-08 00:13:28 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-09-08 16:26:17 -0700 |
| commit | 9598df227def2c3933406b1f51cd6756a4ff3005 (patch) | |
| tree | aaf0f64bbaf6dd1ad1b56127855a2c678c9a76ed | |
| parent | e23ac2e27efd16d0793f5b9aff862244850fdabd (diff) | |
| download | meta-openembedded-9598df227def2c3933406b1f51cd6756a4ff3005.tar.gz | |
remmina: Fix spice protocol dependency and configuration
Spice is only compatible with x86 architectures, its dependency triggers
a build error on other archs since the build system isnt able to find a
provider for it.
Fix dependencies to only include spice when an x86 architecture is being
built, and configure the package accordingly.
Signed-off-by: Alejandro Hernandez <aehs29@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index b95c400b28..cd6bc145c1 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb | |||
| @@ -3,7 +3,10 @@ HOMEPAGE = "https://remmina.org" | |||
| 3 | SECTION = "Support" | 3 | SECTION = "Support" |
| 4 | LICENSE = "GPLv2 & openssl" | 4 | LICENSE = "GPLv2 & openssl" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" |
| 6 | DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver spice spice-protocol libsecret" | 6 | DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret" |
| 7 | |||
| 8 | DEPENDS_append_x86 = " spice spice-protocol" | ||
| 9 | DEPENDS_append_x86-64 = " spice spice-protocol" | ||
| 7 | 10 | ||
| 8 | DEPENDS_append_libc-musl = "libexecinfo" | 11 | DEPENDS_append_libc-musl = "libexecinfo" |
| 9 | LDFLAGS_append_libc-musl = " -lexecinfo" | 12 | LDFLAGS_append_libc-musl = " -lexecinfo" |
| @@ -17,7 +20,11 @@ S = "${WORKDIR}/Remmina-v${PV}" | |||
| 17 | 20 | ||
| 18 | inherit cmake | 21 | inherit cmake |
| 19 | 22 | ||
| 20 | EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" | 23 | EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF" |
| 24 | |||
| 25 | EXTRA_OECMAKE_append_x86 = " -DWITH_SPICE=ON" | ||
| 26 | EXTRA_OECMAKE_append_x86-64 = " -DWITH_SPICE=ON" | ||
| 27 | |||
| 21 | 28 | ||
| 22 | do_install_append(){ | 29 | do_install_append(){ |
| 23 | # We dont need the extra stuff form other desktop environments | 30 | # We dont need the extra stuff form other desktop environments |
| @@ -29,5 +36,3 @@ do_install_append(){ | |||
| 29 | RDEPENDS_${PN} = "bash" | 36 | RDEPENDS_${PN} = "bash" |
| 30 | 37 | ||
| 31 | FILES_${PN}_append = " ${datadir}/icons/hicolor/*" | 38 | FILES_${PN}_append = " ${datadir}/icons/hicolor/*" |
| 32 | |||
| 33 | COMPATIBLE_HOST = '(x86_64|i.86).*-linux' | ||