summaryrefslogtreecommitdiffstats
path: root/meta-oe
Commit message (Collapse)AuthorAgeFilesLines
...
* libgpiod: ptest: warn if the gpio-mockup kernel module is not selectedBartosz Golaszewski2021-06-041-0/+7
| | | | | | | | | libgpiod test-suites work with the gpio-mockup kernel module. When using linux-yocto, it's enabled using the gpio/mockup.scc kernel feature. Check if this feature is present in KERNEL_FEATURE and warn if not. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* libgpiod: ptest: run all test-suites if possibleBartosz Golaszewski2021-06-042-8/+33
| | | | | | | | | | We have four test-suites total in libgpiod: for the core C library, gpio-tools and for C++ and Python bindings. Modify the recipe to install all of them depending on build settings and make run-ptest execute them if available. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* libgpiod: redirect stdout from the ptest executable to a fileBartosz Golaszewski2021-06-041-1/+1
| | | | | | | | Most tests redirect their standard output to a file. Let's make libgpiod consistent with this pattern. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* libgpiod: add RDEPENDS for testsBartosz Golaszewski2021-06-041-1/+1
| | | | | | | | | The libgpiod-tools test-suite requires bats at run-time. The python test-suite needs the packaging module. Add both to the RDEPENDS in the tests PACKAGECONFIG option Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* libgpiod: correctly split output files into packagesBartosz Golaszewski2021-06-041-1/+15
| | | | | | | | | Currently, the files that should go into libgpiod-ptest are part of either the main library package of libgpiod-tools. Use more fine-grained values for package files variables. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* libgpiod: fix RRECOMMENDS for python bindingsBartosz Golaszewski2021-06-041-2/+2
| | | | | | | | | RRECOMMENDS for the python module doesn't work because it specifies the module itself as its own RRECOMMENDS. Fix it to recommend the python package if python3 is in PACKAGECONFIG for the main package. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* libgpiod: list all packages in a single assignmentBartosz Golaszewski2021-06-041-3/+1
| | | | | | | | Don't have assignments to PACKAGES scattered across the recipe - use a single place for that before assigning FILES. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* libgpiod: coding style fixesBartosz Golaszewski2021-06-041-4/+5
| | | | | | | | | The recipe is getting bigger so try to keep a consistent coding style. Use four spaces instead of tabs and use the common way of splitting multi-line strings for minimum git diff lines at modification. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* poppler: upgrade 21.06.0 -> 21.06.1Andreas Müller2021-06-031-1/+1
| | | | | | | | | | | This came in right after 21.06.0 and fixes a regression just introduced: Release 21.06.1 glib: * fix poppler_rectangle_free() regression. Issue #1087 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* icewm: upgrade 2.3.3 -> 2.3.4Andreas Müller2021-06-031-1/+1
| | | | | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* libmbim: upgrade 1.24.6 -> 1.24.8Andreas Müller2021-06-031-3/+1
| | | | | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* dbus-broker: upgrade 28 -> 29Andreas Müller2021-06-031-1/+1
| | | | | | | | | | | | * Improve SELinux audit messages. This requires the new libselinux-3.2 and libaudit-3.0 releases. If audit/selinux support is enabled, those are now the minimum required versions. * Make linux-4.17 a hard-requirements. Older kernels are no longer supported. * Fix startup failures when at-console users have consecutive uids. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* poppler: upgrade 21.05.0 -> 21.06.0Andreas Müller2021-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Release 21.06.0 core: * Fix rendering of some extended latin1 characters in annotations. Issue #1070 * Support some not so well formed documents with password. Issue #1083 * Add API to get notified if the xref is reconstructed * Add somewhat fancier left/right signature visual representation * Fix crashes in malformed files * Minor code improvements qt6: * Change some functions to return std::unique_ptr qt5/qt6: * Add API to get notified if the xref is reconstructed * Add somewhat fancier left/right signature visual representation * Don't assert when trying to invert singular matrices build system: * make boost opt-out if building splash Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* nss: Fix build on Centos 7Marek Vasut2021-06-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Centos 7 has glibc 2.18 and nss-native build fails due to implicit declaration of function putenv during build. This is because of the Feature Test Macro Requirements for glibc (see feature_test_macros(7)): putenv(): _XOPEN_SOURCE || /* Glibc since 2.19: */ _DEFAULT_SOURCE || /* Glibc versions <= 2.19: */ _SVID_SOURCE and because nss coreconf/Linux.mk only defines -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE So on such system with glibc 2.18, neither macro makes putenv() available. Add -D_XOPEN_SOURCE for the Centos 7 and glibc 2.18 native build case. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Armin Kuster <akuster808@gmail.com> Cc: Armin Kuster <akuster@mvista.com> Cc: Khem Raj <raj.khem@gmail.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@arm.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* memtester: upgrade 4.5.0 -> 4.5.1zhengruoqin2021-06-031-2/+2
| | | | | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* gensio: upgrade 2.2.5 -> 2.2.7zhengruoqin2021-06-031-1/+1
| | | | | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* fio: upgrade 3.26 -> 3.27zhengruoqin2021-06-031-1/+1
| | | | | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* glog: Upgrade to 0.5.0Khem Raj2021-06-023-128/+8
| | | | | | | Libunwind is being detected now via cmake correctly Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Martin Jansa <Martin.Jansa@gmail.com>
* debootstrap: fix runtime failure on nativesdkHongxu Jia2021-06-022-0/+34
| | | | | | | | | | | | | While calling debootstrap in sdk, if host does not install dpkg package, the full path calling will fail Do not hardcode the full path of dpkg, then the sdk's dpkg will be used. In Yocto, for debootstrap, only dpkg is used, so the fix do not take care of other utilities (such as /usr/bin/udpkg) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* mariadb: Include missing sys/type.h for ssize_tKhem Raj2021-06-012-0/+16
| | | | | | | | | | | | | musl finds this problem in sources where its missing to include needed system header for ssize_t Fixes wsrep-lib/include/wsrep/gtid.hpp:80:5: error: unknown type name 'ssize_t'; did you mean 'size_t'? ssize_t scan_from_c_str(const char* buf, size_t buf_len, ^~~~~~~ size_t Signed-off-by: Khem Raj <raj.khem@gmail.com>
* mongodb: Fix -Wc++11-narrowing warning on 32bitKhem Raj2021-06-012-0/+36
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* mongodb: Change PV to 4.4.6Khem Raj2021-06-011-2/+2
| | | | | | 4.4.6 has been released from same SHA which was used for rc0 Signed-off-by: Khem Raj <raj.khem@gmail.com>
* vk-gl-cts: Fix O_TRUNC conflict with fcntl.hKhem Raj2021-06-012-0/+41
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* packagegroup-meta-oe: Add evemu-toolsKhem Raj2021-06-011-0/+1
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* evemu-tools: Add initial recipeAyoub Zaki2021-06-011-0/+21
| | | | | Signed-off-by: Ayoub Zaki <ayoub.zaki@embexus.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* mpich: Upgrade to 3.4.2Khem Raj2021-06-011-1/+3
| | | | | | | | Explicitly link with libgcc for __addtf3, __multf3 etc 128bit builtins on x86_64 as they are not available with compiler-rt and when using compiler-rt the link would fail Signed-off-by: Khem Raj <raj.khem@gmail.com>
* packagegroup-meta-oe: Add qperf packageKhem Raj2021-05-311-0/+1
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qperf: add qperf recipeGuy Morand2021-05-311-0/+19
| | | | | Signed-off-by: Guy Morand <guy@guy-morand.ch> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* grpc: Upgrade to 1.38.0Khem Raj2021-05-312-2/+39
| | | | | | Fix build with musl by checking for iovec redefinition Signed-off-by: Khem Raj <raj.khem@gmail.com>
* heaptrack: Fix build with clang and llvm libunwindKhem Raj2021-05-312-0/+42
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* gtkwave: set REQUIRED_DISTRO_FEATURES only to waylandMartin Jansa2021-05-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * after the migration to gtk3 in: https://git.openembedded.org/meta-openembedded/commit/?id=8221db74e300619d002e2b385d12a5fe13e8999a this was now failing with: | In file included from ../../gtkwave-gtk3-3.3.109/src/debug.h:17, | from ../../gtkwave-gtk3-3.3.109/src/vlist.h:18, | from ../../gtkwave-gtk3-3.3.109/src/analyzer.h:18, | from ../../gtkwave-gtk3-3.3.109/src/symbol.h:20, | from ../../gtkwave-gtk3-3.3.109/src/vcd.h:32, | from ../../gtkwave-gtk3-3.3.109/src/ae2.h:16, | from ../../gtkwave-gtk3-3.3.109/src/globals.h:27, | from ../../gtkwave-gtk3-3.3.109/src/timeentry.c:11: | ../../gtkwave-gtk3-3.3.109/src/gtk23compat.h:12:10: fatal error: gdk/gdkwayland.h: No such file or directory | 12 | #include <gdk/gdkwayland.h> | | ^~~~~~~~~~~~~~~~~~ for distributions without wayland in DISTRO_FEATURES. * because https://github.com/gtkwave/gtkwave/blob/f9d82a82aa3ddc30ca47984278371f62c9a3bd81/gtkwave3-gtk3/src/gtk23compat.h#L10 explicitly includes gdk/gdkwayland.h for gtk-3.22.26 and newer (oe-core currently has 3.24.29) * restrict REQUIRED_DISTRO_FEATURES to wayland _and_ x11 (instead of either of them through ANY_OF_DISTRO_FEATURES and GTK3DISTROFEATURES) because wayland is needed for gtk3 to provide this gdkwayland.h and x11 is needed by tk dependency Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* p7zip: refresh patches with devtool to apply cleanlyMartin Jansa2021-05-314-14/+41
| | | | | | | | | | | | | | | | | | | | | | | | change_numMethods_from_bool_to_unsigned.patch added in: https://git.openembedded.org/meta-openembedded/commit/?id=3c36a8efe2a964c3aa9bfcd836cee3f80a837fcd doesn't apply cleanly: ERROR: p7zip-16.02-r0 do_patch: Fuzz detected: Applying patch change_numMethods_from_bool_to_unsigned.patch patching file CPP/7zip/Archive/Wim/WimHandler.cpp Hunk #1 succeeded at 298 with fuzz 1. The context lines in the patches can be updated with devtool: devtool modify p7zip devtool finish --force-patch-refresh p7zip <layer_path> Don't forget to review changes done by devtool! ERROR: p7zip-16.02-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* sdbus-cpp: Do not fetch googletest on the flyKhem Raj2021-05-282-1/+51
| | | | | | | | | This package downloads code ( gtest ) post do_fetch task Now this is checked out by bitbake fetcher into decided source directory, this ensures reproducibility Signed-off-by: Khem Raj <raj.khem@gmail.com>
* minifi-cpp: Fix build with llvm C++ runtimeKhem Raj2021-05-282-0/+37
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* opencv: Do not lock to gcc only compilerKhem Raj2021-05-281-2/+0
| | | | | | Latest version of openCV + clang compiles fine Signed-off-by: Khem Raj <raj.khem@gmail.com>
* projucer: Update to latest master tipKhem Raj2021-05-281-0/+41
| | | | | | | | | | | Drop patch which no longer is needed as it has been fixed differently upstream License-Update: Updated to reflect JUCE 6 Terms [1] [1] https://github.com/juce-framework/JUCE/commit/de6ecc57f84294e82a608bcc6d0f5d11645f15e3#diff-4673a3aba01813b595de187a7a6e9e63a3491d55821606fecd9f13a10c188a1d Signed-off-by: Khem Raj <raj.khem@gmail.com>
* valijson: upgrade 0.3 -> 0.4zhengruoqin2021-05-281-1/+1
| | | | | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* libndp: upgrade 1.7 -> 1.8zhengruoqin2021-05-281-2/+2
| | | | | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* snappy: fix native build with older gcc on hostMartin Jansa2021-05-282-1/+74
| | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* p7zip: build and package lib7z.so needed for fastbootNisha Parrakat2021-05-282-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | a) use option 7z to build the lib7z.so library This is needed for android-tools for building fastboot from android-tools b) Packaged the lib7z.so and codec libraries as a part of this recipe Fastboot RDepends on it lib7z.so c) Fixed a C++17 forbidden error when lib7z.so is built fixes the below error | ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp: In member function 'virtual LONG NArchive::NWim::CHandler::GetArchiveProperty(PROPID, PROPVARIANT*)': | ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:308:11: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17 | 308 | numMethods++; | | ^~~~~~~~~~ | ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:318:9: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17 | 318 | numMethods++; Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> Signed-off-by: Nisha Parrakat <nishaparrakat@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* nyancat: add new packageDaniel Ammann2021-05-282-0/+18
| | | | | Signed-off-by: Daniel Ammann <daniel.ammann@bytesatwork.ch> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* uftrace: upgrade 0.9.4 -> 0.10wangmy2021-05-282-49/+1
| | | | | | | | 0001-aarch64-Fix-a-plthook-crash-on-aarch64-with-binutils.patch removed since it is removed in 0.10 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* hunspell-dictionaries: use better names for dictionary filesAndreas Müller2021-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Played around with gspell and followed their suggestion to prefer hunspell [1] in enchant [2]. Tests with gedit showed that all entries for sub-languages (e.g English UK) were missing. By changing names of *.dic and *.aff from <language>-<SUBLANGUAGE>.* to <language>_<SUBLANGUAGE>.* languages as 'English UK' appear and can be selected in gedit. Tested also on libreoffice: That displayed all languages properly before and does still with files renamed. [1] https://gitlab.gnome.org/GNOME/gspell [2] https://github.com/schnitzeltony/meta-mortsgna/commit/b5d17de7cf9fd033339c2609c5b14c108bbbff4f Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* pm-graph: parse separated cpu exec lineLiweiSong2021-05-282-0/+52
| | | | | | | | | | | | | | if cpu exec line was split into different line, there will be an error when parse it: File "/usr/bin/sleepgraph", line 3165, in parseTraceLog proclist[name] = int(val[1]) IndexError: list index out of range check this case and append to parse the unfinished line. Signed-off-by: Liwei Song <liwei.song@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* zsh: work around file-rdeps QA issues with usrmerge in DISTRO_FEATURESMartin Jansa2021-05-281-0/+5
| | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* renderdoc: upgrade 1.7 -> 1.13Andreas Müller2021-05-282-36/+5
| | | | | | | | * backported patch can go * license checksum was changed by update of copyright year Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* mpv: upgrade 0.32.0 -> 0.33.1Andreas Müller2021-05-281-10/+12
| | | | | | | | | | | Some PACKAGECONFIG / configuration changes were necessary: * libass is mandatory * luajit on aarch64 is fine * wayland requires egl * --disable-libsmbclient is gone Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* mime-support: upgrade 3.48 -> 3.62Andreas Müller2021-05-282-17/+31
| | | | | | | | | | | * Many changes since 2009 (!!!) - most notable: CVE-2014-7209: run-mailcap shellcommand injection. * They added Bellcore license for mailcap.man * There is a later version 3.66 available but tarball is almost empty because with 3.65 they splitted mime-support into several packages Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* libtinyxml2: restore building shared libraryMartin Jansa2021-05-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * since the upgrade to 8.1.0 which includes: https://github.com/leethomason/tinyxml2/commit/7df6b3ff4ab3e3cec7a242fa5f8749decd129e13 it no longer produces shared libraries by default and linking with static one will often fail, e.g.: rosbag2-storage/0.2.4-1-r0/recipe-sysroot/usr/lib/libtinyxml2.a(tinyxml2.cpp.o): relocation R_ARM_THM_MOVW_ABS_NC against `_ZN8tinyxml210XMLPrinter11CompactModeERKNS_10XMLElementE' can not be used when making a shared object; recompile with -fPIC rosbag2-storage/0.2.4-1-r0/recipe-sysroot/usr/lib/libtinyxml2.a(tinyxml2.cpp.o)(.text+0x162): unresolvable R_ARM_THM_CALL relocation against symbol `vfprintf@@GLIBC_2.4' fastrtps/1.9.3-2-r0/recipe-sysroot/usr/lib/libtinyxml2.a(tinyxml2.cpp.o): relocation R_ARM_THM_MOVW_ABS_NC against `_ZN8tinyxml210XMLPrinter11CompactModeERKNS_10XMLElementE' can not be used when making a shared object; recompile with -fPIC fastrtps/1.9.3-2-r0/recipe-sysroot/usr/lib/libtinyxml2.a(tinyxml2.cpp.o)(.text+0x162): unresolvable R_ARM_THM_CALL relocation against symbol `vfprintf@@GLIBC_2.4' fastrtps-native/1.9.3-2-r0/recipe-sysroot-native/usr/lib/libtinyxml2.a(tinyxml2.cpp.o): relocation R_X86_64_PC32 against symbol `_ZN8tinyxml27StrPair5ResetEv' can not be used when making a shared object; recompile with -fPIC * restore building shared library as 8.0.0 did * it also fixes PN package being empty: diff --git a/packages/core2-64-webos-linux/libtinyxml2/libtinyxml2/latest b/packages/core2-64-webos-linux/libtinyxml2/libtinyxml2/latest index 594585fe..496a109d 100644 --- a/packages/core2-64-webos-linux/libtinyxml2/libtinyxml2/latest +++ b/packages/core2-64-webos-linux/libtinyxml2/libtinyxml2/latest @@ -1,9 +1,8 @@ -PV = 8.0.0 +PV = 8.1.0 PR = r0 -PKG = libtinyxml2-8 -RPROVIDES = libtinyxml2 (=8.0.0) -RDEPENDS = glibc (>= 2.33) libgcc (>= 11.1.0) libstdc++ (>= 11.1.0) +RPROVIDES = +RDEPENDS = RRECOMMENDS = libtinyxml2-lic -PKGSIZE = 90076 +PKGSIZE = 0 FILES = /usr/bin/* /usr/sbin/* /usr/libexec/* /usr/lib/lib*.so.* /etc /com /var /bin/* /sbin/* /lib/*.so.* /lib/udev /usr/lib/udev /lib/udev /usr/lib/udev /usr/share/libtinyxml2 /usr/lib/libtinyxml2/* /usr/share/pixmaps /usr/share/applications /usr/share/idl /usr/share/omf /usr/share/sounds /usr/lib/bonobo/servers -FILELIST = /usr/lib/libtinyxml2.so.8 /usr/lib/libtinyxml2.so.8.0.0 +FILELIST = Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
* snappy: explicity disable building tests and benchmarkMartin Jansa2021-05-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * with these changes introduced in 1.1.9: https://github.com/google/snappy/commit/549685a https://github.com/google/snappy/commit/4ebd8b2 it now installs gtest,gmock,benchmark with snappy which causes conflicts when something depends on both snappy and googletest or google-benchmark, e.g. leveldb-tl.do_prepare_recipe_sysroot: ERROR: The file /usr/lib/pkgconfig/gmock_main.pc is installed by both snappy and googletest, aborting * looking at buildhistory the 1.1.9 upgrade added a lot of files to snappy: diff --git a/packages/core2-64-webos-linux/snappy/snappy-dev/files-in-package.txt b/packages/core2-64-webos-linux/snappy/snappy-dev/files-in-package.txt index 4bb97db2..559c84fc 100644 --- a/packages/core2-64-webos-linux/snappy/snappy-dev/files-in-package.txt +++ b/packages/core2-64-webos-linux/snappy/snappy-dev/files-in-package.txt @@ -1,14 +1,85 @@ drwxr-xr-x root root 4096 ./usr drwxr-xr-x root root 4096 ./usr/include +drwxr-xr-x root root 4096 ./usr/include/benchmark +-rw-r--r-- root root 56897 ./usr/include/benchmark/benchmark.h +drwxr-xr-x root root 4096 ./usr/include/gmock +-rw-r--r-- root root 61607 ./usr/include/gmock/gmock-actions.h +-rw-r--r-- root root 6037 ./usr/include/gmock/gmock-cardinalities.h +-rw-r--r-- root root 24223 ./usr/include/gmock/gmock-function-mocker.h +-rw-r--r-- root root 30996 ./usr/include/gmock/gmock-generated-actions.h +-rw-r--r-- root root 15545 ./usr/include/gmock/gmock-generated-actions.h.pump +-rw-r--r-- root root 3711 ./usr/include/gmock/gmock.h +-rw-r--r-- root root 200261 ./usr/include/gmock/gmock-matchers.h +-rw-r--r-- root root 3341 ./usr/include/gmock/gmock-more-matchers.h +-rw-r--r-- root root 8967 ./usr/include/gmock/gmock-nice-strict.h +-rw-r--r-- root root 76003 ./usr/include/gmock/gmock-spec-builders.h +drwxr-xr-x root root 4096 ./usr/include/gmock/internal +drwxr-xr-x root root 4096 ./usr/include/gmock/internal/custom +-rw-r--r-- root root 365 ./usr/include/gmock/internal/custom/gmock-generated-actions.h +-rw-r--r-- root root 451 ./usr/include/gmock/internal/custom/gmock-generated-actions.h.pump +-rw-r--r-- root root 1861 ./usr/include/gmock/internal/custom/gmock-matchers.h +-rw-r--r-- root root 1894 ./usr/include/gmock/internal/custom/gmock-port.h +-rw-r--r-- root root 439 ./usr/include/gmock/internal/custom/README.md +-rw-r--r-- root root 17975 ./usr/include/gmock/internal/gmock-internal-utils.h +-rw-r--r-- root root 3788 ./usr/include/gmock/internal/gmock-port.h +-rw-r--r-- root root 13530 ./usr/include/gmock/internal/gmock-pp.h +drwxr-xr-x root root 4096 ./usr/include/gtest +-rw-r--r-- root root 14374 ./usr/include/gtest/gtest-death-test.h +-rw-r--r-- root root 94367 ./usr/include/gtest/gtest.h +-rw-r--r-- root root 27455 ./usr/include/gtest/gtest-matchers.h +-rw-r--r-- root root 8030 ./usr/include/gtest/gtest-message.h +-rw-r--r-- root root 22681 ./usr/include/gtest/gtest-param-test.h +-rw-r--r-- root root 14850 ./usr/include/gtest/gtest_pred_impl.h +-rw-r--r-- root root 32033 ./usr/include/gtest/gtest-printers.h +-rw-r--r-- root root 2519 ./usr/include/gtest/gtest_prod.h +-rw-r--r-- root root 10097 ./usr/include/gtest/gtest-spi.h +-rw-r--r-- root root 6853 ./usr/include/gtest/gtest-test-part.h +-rw-r--r-- root root 15988 ./usr/include/gtest/gtest-typed-test.h +drwxr-xr-x root root 4096 ./usr/include/gtest/internal +drwxr-xr-x root root 4096 ./usr/include/gtest/internal/custom +-rw-r--r-- root root 1843 ./usr/include/gtest/internal/custom/gtest.h +-rw-r--r-- root root 1858 ./usr/include/gtest/internal/custom/gtest-port.h +-rw-r--r-- root root 2079 ./usr/include/gtest/internal/custom/gtest-printers.h +-rw-r--r-- root root 1682 ./usr/include/gtest/internal/custom/README.md +-rw-r--r-- root root 13436 ./usr/include/gtest/internal/gtest-death-test-internal.h +-rw-r--r-- root root 9764 ./usr/include/gtest/internal/gtest-filepath.h +-rw-r--r-- root root 61757 ./usr/include/gtest/internal/gtest-internal.h +-rw-r--r-- root root 35114 ./usr/include/gtest/internal/gtest-param-util.h +-rw-r--r-- root root 4090 ./usr/include/gtest/internal/gtest-port-arch.h +-rw-r--r-- root root 84530 ./usr/include/gtest/internal/gtest-port.h +-rw-r--r-- root root 7213 ./usr/include/gtest/internal/gtest-string.h +-rw-r--r-- root root 6270 ./usr/include/gtest/internal/gtest-type-util.h -rw-r--r-- root root 5414 ./usr/include/snappy-c.h --rw-r--r-- root root 9885 ./usr/include/snappy.h --rw-r--r-- root root 7256 ./usr/include/snappy-sinksource.h --rw-r--r-- root root 2845 ./usr/include/snappy-stubs-public.h +-rw-r--r-- root root 9909 ./usr/include/snappy.h +-rw-r--r-- root root 7265 ./usr/include/snappy-sinksource.h +-rw-r--r-- root root 2579 ./usr/include/snappy-stubs-public.h drwxr-xr-x root root 4096 ./usr/lib drwxr-xr-x root root 4096 ./usr/lib/cmake +drwxr-xr-x root root 4096 ./usr/lib/cmake/benchmark +-rw-r--r-- root root 60 ./usr/lib/cmake/benchmark/benchmarkConfig.cmake +-rw-r--r-- root root 2742 ./usr/lib/cmake/benchmark/benchmarkConfigVersion.cmake +-rw-r--r-- root root 4247 ./usr/lib/cmake/benchmark/benchmarkTargets.cmake +-rw-r--r-- root root 1380 ./usr/lib/cmake/benchmark/benchmarkTargets-noconfig.cmake +drwxr-xr-x root root 4096 ./usr/lib/cmake/GTest +-rw-r--r-- root root 1438 ./usr/lib/cmake/GTest/GTestConfig.cmake +-rw-r--r-- root root 1978 ./usr/lib/cmake/GTest/GTestConfigVersion.cmake +-rw-r--r-- root root 4958 ./usr/lib/cmake/GTest/GTestTargets.cmake +-rw-r--r-- root root 2525 ./usr/lib/cmake/GTest/GTestTargets-noconfig.cmake drwxr-xr-x root root 4096 ./usr/lib/cmake/Snappy -rw-r--r-- root root 2864 ./usr/lib/cmake/Snappy/SnappyConfig.cmake -rw-r--r-- root root 2742 ./usr/lib/cmake/Snappy/SnappyConfigVersion.cmake -rw-r--r-- root root 3616 ./usr/lib/cmake/Snappy/SnappyTargets.cmake -rw-r--r-- root root 806 ./usr/lib/cmake/Snappy/SnappyTargets-noconfig.cmake +lrwxrwxrwx root root 22 ./usr/lib/libbenchmark_main.so -> libbenchmark_main.so.1 +lrwxrwxrwx root root 17 ./usr/lib/libbenchmark.so -> libbenchmark.so.1 +lrwxrwxrwx root root 23 ./usr/lib/libgmock_main.so -> libgmock_main.so.1.10.0 +lrwxrwxrwx root root 18 ./usr/lib/libgmock.so -> libgmock.so.1.10.0 +lrwxrwxrwx root root 23 ./usr/lib/libgtest_main.so -> libgtest_main.so.1.10.0 +lrwxrwxrwx root root 18 ./usr/lib/libgtest.so -> libgtest.so.1.10.0 lrwxrwxrwx root root 14 ./usr/lib/libsnappy.so -> libsnappy.so.1 +drwxr-xr-x root root 4096 ./usr/lib/pkgconfig +-rw-r--r-- root root 240 ./usr/lib/pkgconfig/benchmark.pc +-rw-r--r-- root root 275 ./usr/lib/pkgconfig/gmock_main.pc +-rw-r--r-- root root 268 ./usr/lib/pkgconfig/gmock.pc +-rw-r--r-- root root 275 ./usr/lib/pkgconfig/gtest_main.pc +-rw-r--r-- root root 243 ./usr/lib/pkgconfig/gtest.pc diff --git a/packages/core2-64-webos-linux/snappy/snappy-dev/latest b/packages/core2-64-webos-linux/snappy/snappy-dev/latest index 0cc143d2..19a23796 100644 --- a/packages/core2-64-webos-linux/snappy/snappy-dev/latest +++ b/packages/core2-64-webos-linux/snappy/snappy-dev/latest @@ -1,9 +1,8 @@ -PV = 1.1.8 +PV = 1.1.9 PR = r0 -PKG = libsnappy-dev -RPROVIDES = snappy-dev (=1.1.8) -RDEPENDS = snappy (= 1.1.8-r0) +RPROVIDES = +RDEPENDS = snappy (= 1.1.9-r0) RRECOMMENDS = glibc-dev libgcc-dev libstdc++-dev snappy-lic -PKGSIZE = 35442 +PKGSIZE = 1062733 FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal /lib/*.o /usr/lib/snappy/*.la /lib/*.la /usr/lib/cmake /usr/share/cmake -FILELIST = /usr/lib/libsnappy.so.1 /usr/lib/libsnappy.so.1.1.8 +FILELIST = /usr/lib/libbenchmark.so.1 /usr/lib/libbenchmark.so.1.5.2 /usr/lib/libbenchmark_main.so.1 /usr/lib/libbenchmark_main.so.1.5.2 /usr/lib/libgmock.so.1.10.0 /usr/lib/libgmock_main.so.1.10.0 /usr/lib/libgtest.so.1.10.0 /usr/lib/libgtest_main.so.1.10.0 /usr/lib/libsnappy.so.1 /usr/lib/libsnappy.so.1.1.9 * disable tests and benchmarks to install only the files 1.1.8 version used to install Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>