* [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark
@ 2021-05-24 8:55 Martin Jansa
2021-05-24 8:55 ` [meta-oe][PATCH 2/2] libtinyxml2: restore building shared library Martin Jansa
2021-05-24 14:07 ` [oe] [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark Khem Raj
0 siblings, 2 replies; 6+ messages in thread
From: Martin Jansa @ 2021-05-24 8:55 UTC (permalink / raw)
To: openembedded-devel; +Cc: Martin Jansa
* 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>
---
meta-oe/recipes-extended/snappy/snappy_1.1.9.bb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
index 2ebe3760a5..151c4ddc38 100644
--- a/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
+++ b/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
@@ -21,5 +21,4 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG[lzo] = "-DHAVE_LIBLZO2=1,-DHAVE_LIBLZO2=0,lzo,"
TARGET_CFLAGS += "-fPIC"
-EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" \
- '
+EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" -DSNAPPY_BUILD_TESTS="OFF" -DSNAPPY_BUILD_BENCHMARKS="OFF"'
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [meta-oe][PATCH 2/2] libtinyxml2: restore building shared library
2021-05-24 8:55 [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark Martin Jansa
@ 2021-05-24 8:55 ` Martin Jansa
2021-05-24 14:10 ` [oe] " Khem Raj
2021-05-24 14:07 ` [oe] [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark Khem Raj
1 sibling, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2021-05-24 8:55 UTC (permalink / raw)
To: openembedded-devel; +Cc: Martin Jansa
* 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>
---
meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb
index fea5aeff17..5245059a89 100644
--- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb
+++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb
@@ -13,3 +13,5 @@ S = "${WORKDIR}/git"
inherit cmake
BBCLASSEXTEND = "native"
+
+EXTRA_OECMAKE += "-Dtinyxml2_SHARED_LIBS=YES"
--
2.30.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [oe] [meta-oe][PATCH 2/2] libtinyxml2: restore building shared library
2021-05-24 8:55 ` [meta-oe][PATCH 2/2] libtinyxml2: restore building shared library Martin Jansa
@ 2021-05-24 14:10 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2021-05-24 14:10 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembeded-devel
On Mon, May 24, 2021 at 1:56 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
>
> * 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>
> ---
> meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb
> index fea5aeff17..5245059a89 100644
> --- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb
> +++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb
> @@ -13,3 +13,5 @@ S = "${WORKDIR}/git"
> inherit cmake
>
> BBCLASSEXTEND = "native"
> +
> +EXTRA_OECMAKE += "-Dtinyxml2_SHARED_LIBS=YES"
This fix is in fact fine. However I was wondering why .a is not built
using -fPIC since we do enable PIE/PIC in default distro now a days
> --
> 2.30.2
>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark
2021-05-24 8:55 [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark Martin Jansa
2021-05-24 8:55 ` [meta-oe][PATCH 2/2] libtinyxml2: restore building shared library Martin Jansa
@ 2021-05-24 14:07 ` Khem Raj
2021-05-24 14:17 ` Martin Jansa
1 sibling, 1 reply; 6+ messages in thread
From: Khem Raj @ 2021-05-24 14:07 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembeded-devel
its not clear what is the advantage of turning DBUILD_SHARED_LIBS on.
Disabling tests may get over the issue but perhaps having tests is
also good
so turning it into a packageconfig which can be enabled with ptest
might be a better option.
On Mon, May 24, 2021 at 1:56 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
>
> * 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>
> ---
> meta-oe/recipes-extended/snappy/snappy_1.1.9.bb | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
> index 2ebe3760a5..151c4ddc38 100644
> --- a/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
> +++ b/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
> @@ -21,5 +21,4 @@ PACKAGECONFIG ??= ""
> PACKAGECONFIG[lzo] = "-DHAVE_LIBLZO2=1,-DHAVE_LIBLZO2=0,lzo,"
> TARGET_CFLAGS += "-fPIC"
>
> -EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" \
> - '
> +EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" -DSNAPPY_BUILD_TESTS="OFF" -DSNAPPY_BUILD_BENCHMARKS="OFF"'
> --
> 2.30.2
>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark
2021-05-24 14:07 ` [oe] [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark Khem Raj
@ 2021-05-24 14:17 ` Martin Jansa
2021-05-24 14:26 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2021-05-24 14:17 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
[-- Attachment #1: Type: text/plain, Size: 12509 bytes --]
On Mon, May 24, 2021 at 07:07:16AM -0700, Khem Raj wrote:
> its not clear what is the advantage of turning DBUILD_SHARED_LIBS on.
that was already there.
> Disabling tests may get over the issue but perhaps having tests is
> also good
> so turning it into a packageconfig which can be enabled with ptest
> might be a better option.
Building and installing tests for snappy would be fine, but even
with it controlled by ptest you don't want snappy to install
gtest/gmock/google-benchmark frameworks which are provided by their
respective recipes:
http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-test/googletest/googletest_git.bb?h=master
https://github.com/ros/meta-ros/blob/master/meta-ros2/recipes-benchmark/google-benchmark/google-benchmark_git.bb
If someone is really interested in snappy tests then it could be
improved, but right now it's broken and this change just restores the
behavior from 1.1.8. (the same does apply for the libtinyxml2 change).
Regards,
> On Mon, May 24, 2021 at 1:56 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
> >
> > * 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>
> > ---
> > meta-oe/recipes-extended/snappy/snappy_1.1.9.bb | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
> > index 2ebe3760a5..151c4ddc38 100644
> > --- a/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
> > +++ b/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
> > @@ -21,5 +21,4 @@ PACKAGECONFIG ??= ""
> > PACKAGECONFIG[lzo] = "-DHAVE_LIBLZO2=1,-DHAVE_LIBLZO2=0,lzo,"
> > TARGET_CFLAGS += "-fPIC"
> >
> > -EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" \
> > - '
> > +EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" -DSNAPPY_BUILD_TESTS="OFF" -DSNAPPY_BUILD_BENCHMARKS="OFF"'
> > --
> > 2.30.2
> >
> >
> >
> >
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark
2021-05-24 14:17 ` Martin Jansa
@ 2021-05-24 14:26 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2021-05-24 14:26 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembeded-devel
On 5/24/21 7:17 AM, Martin Jansa wrote:
> On Mon, May 24, 2021 at 07:07:16AM -0700, Khem Raj wrote:
>> its not clear what is the advantage of turning DBUILD_SHARED_LIBS on.
>
> that was already there.
>
>> Disabling tests may get over the issue but perhaps having tests is
>> also good
>> so turning it into a packageconfig which can be enabled with ptest
>> might be a better option.
>
> Building and installing tests for snappy would be fine, but even
> with it controlled by ptest you don't want snappy to install
> gtest/gmock/google-benchmark frameworks which are provided by their
> respective recipes:
>
> http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-test/googletest/googletest_git.bb?h=master
> https://github.com/ros/meta-ros/blob/master/meta-ros2/recipes-benchmark/google-benchmark/google-benchmark_git.bb
>
> If someone is really interested in snappy tests then it could be
> improved, but right now it's broken and this change just restores the
> behavior from 1.1.8. (the same does apply for the libtinyxml2 change).
>
I am fine as such. somehow installing shared libs should be decoupled
from googletest shared libs option, if its controlling main package
being built as shared lib. Perhaps it should be broken into two options.
> Regards,
>
>> On Mon, May 24, 2021 at 1:56 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
>>>
>>> * 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>
>>> ---
>>> meta-oe/recipes-extended/snappy/snappy_1.1.9.bb | 3 +--
>>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
>>> index 2ebe3760a5..151c4ddc38 100644
>>> --- a/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
>>> +++ b/meta-oe/recipes-extended/snappy/snappy_1.1.9.bb
>>> @@ -21,5 +21,4 @@ PACKAGECONFIG ??= ""
>>> PACKAGECONFIG[lzo] = "-DHAVE_LIBLZO2=1,-DHAVE_LIBLZO2=0,lzo,"
>>> TARGET_CFLAGS += "-fPIC"
>>>
>>> -EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" \
>>> - '
>>> +EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" -DSNAPPY_BUILD_TESTS="OFF" -DSNAPPY_BUILD_BENCHMARKS="OFF"'
>>> --
>>> 2.30.2
>>>
>>>
>>>
>>>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-24 14:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-24 8:55 [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark Martin Jansa
2021-05-24 8:55 ` [meta-oe][PATCH 2/2] libtinyxml2: restore building shared library Martin Jansa
2021-05-24 14:10 ` [oe] " Khem Raj
2021-05-24 14:07 ` [oe] [meta-oe][PATCH 1/2] snappy: explicity disable building tests and benchmark Khem Raj
2021-05-24 14:17 ` Martin Jansa
2021-05-24 14:26 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.