diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-16 17:11:34 -0800 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-08 18:21:44 -0500 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.gz talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.zip |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch new file mode 100644 index 000000000..e6f64772d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest/system-brotli.patch @@ -0,0 +1,38 @@ +Description: Find system brotli +Author: Gianfranco Costamagna <locutusofborg@debian.org> +Forwarded: https://github.com/Microsoft/cpprestsdk/pull/952 +Last-Update: 2018-11-05 + +--- cpprest-2.10.7.orig/Release/cmake/cpprest_find_brotli.cmake ++++ cpprest-2.10.7/Release/cmake/cpprest_find_brotli.cmake +@@ -3,8 +3,17 @@ function(cpprest_find_brotli) + return() + endif() + +- find_package(unofficial-brotli REQUIRED) + +- add_library(cpprestsdk_brotli_internal INTERFACE) +- target_link_libraries(cpprestsdk_brotli_internal INTERFACE unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon) ++ find_package(PkgConfig) ++ pkg_check_modules(BROTLIENC libbrotlienc) ++ pkg_check_modules(BROTLIDEC libbrotlidec) ++ if(BROTLIDEC_FOUND AND BROTLIENC_FOUND) ++ target_link_libraries(cpprest PRIVATE ${BROTLIDEC_LDFLAGS} ${BROTLIENC_LDFLAGS}) ++ else(BROTLIDEC_FOUND AND BROTLIENC_FOUND) ++ find_package(unofficial-brotli REQUIRED) ++ add_library(cpprestsdk_brotli_internal INTERFACE) ++ target_link_libraries(cpprestsdk_brotli_internal INTERFACE unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon) ++ target_link_libraries(cpprest PRIVATE cpprestsdk_brotli_internal) ++ endif(BROTLIDEC_FOUND AND BROTLIENC_FOUND) ++ + endfunction() +--- cpprest-2.10.7.orig/Release/src/CMakeLists.txt ++++ cpprest-2.10.7/Release/src/CMakeLists.txt +@@ -84,7 +84,6 @@ else() + target_compile_definitions(cpprest PRIVATE -DCPPREST_EXCLUDE_BROTLI=1) + else() + cpprest_find_brotli() +- target_link_libraries(cpprest PRIVATE cpprestsdk_brotli_internal) + endif() + endif() + |