diff options
| author | Jose <jose@zeroc.com> | 2017-07-17 22:56:29 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-07-17 22:56:29 +0200 |
| commit | 11d41cbcd520919786cd083f45354f57fb150892 (patch) | |
| tree | 7207de7b2d72d2d329864eca5ccdd3cd7b73e59e | |
| parent | ICE-8348 - ES5 browser tests looking in source lib dir for ice when using bin... (diff) | |
| download | ice-11d41cbcd520919786cd083f45354f57fb150892.tar.bz2 ice-11d41cbcd520919786cd083f45354f57fb150892.tar.xz ice-11d41cbcd520919786cd083f45354f57fb150892.zip | |
ICE-8349 - yocto static test build failure
| -rw-r--r-- | cpp/config/Make.rules | 4 | ||||
| -rw-r--r-- | cpp/src/IceBT/Makefile.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 271bbcd2515..b9977b87ca2 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -36,7 +36,7 @@ coreandstub_components = IceUtil \ IcePatch2 # Add the Bluetooth transport for Debian/Ubuntu/Yocto -ifneq ($(filter debian ubuntu yocto,$(linux_id)),) +ifneq ($(filter debian ubuntu yocto poky,$(linux_id)),) coreandstub_components += IceBT endif @@ -138,7 +138,7 @@ $1_srcext := cpp $1_dependencies := $$(or $$($1_dependencies),TestCommon Ice) # Also link with IceSSL and IceBT (Debian/Ubuntu/Yocto) when compiling the project with the static configuration -$1[static]_dependencies := IceSSL $(if $(filter debian ubuntu yocto,$(linux_id)),IceBT) +$1[static]_dependencies := IceSSL $(if $(filter debian ubuntu yocto poky,$(linux_id)),IceBT) # Dependencies and target dirs for Xcode SDK test projects $1[xcodesdk]_dependencies := IceSSL diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk index 9c7a18240ef..ad41973fe45 100644 --- a/cpp/src/IceBT/Makefile.mk +++ b/cpp/src/IceBT/Makefile.mk @@ -7,7 +7,7 @@ # # ********************************************************************** -ifneq ($(filter debian ubuntu yocto,$(linux_id)),) +ifneq ($(filter debian ubuntu yocto poky,$(linux_id)),) # # Only build the IceBT plugin if pkg-config, BlueZ and D-Bus requirements are |