* [Buildroot] [PATCH v2, 1/1] package/wireshark: fix static build with brotli
@ 2020-01-03 13:48 Fabrice Fontaine
2020-01-03 14:23 ` Thomas Petazzoni
2020-01-10 17:35 ` Yann E. MORIN
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2020-01-03 13:48 UTC (permalink / raw)
To: buildroot
Fixes:
- http://autobuild.buildroot.org/results/2387d4590c5dce73d5f6d72bccf253e79f9a73d8
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Drop CMAKE_FIND_LIBRARY_SUFFIXES STREQUAL ".a" from patch
...-FindBROTLI.cmake-fix-static-linking.patch | 54 +++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 package/wireshark/0002-FindBROTLI.cmake-fix-static-linking.patch
diff --git a/package/wireshark/0002-FindBROTLI.cmake-fix-static-linking.patch b/package/wireshark/0002-FindBROTLI.cmake-fix-static-linking.patch
new file mode 100644
index 0000000000..1300a65167
--- /dev/null
+++ b/package/wireshark/0002-FindBROTLI.cmake-fix-static-linking.patch
@@ -0,0 +1,54 @@
+From e1d88b868f57d79a3e90af34f3961f56172998ba Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 3 Jan 2020 10:47:30 +0100
+Subject: [PATCH 2/2] FindBROTLI.cmake: fix static linking
+
+Use pkg-config to retrieve dependencies of libbrotlidec such as
+libbrotlicommon otherwise static build will fail on:
+
+[100%] Building C object CMakeFiles/tshark.dir/ui/cli/tap-smbsids.c.o
+/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libbrotlidec.a(decode.c.o): in function `ProcessCommands':
+decode.c:(.text+0x36d0): undefined reference to `BrotliTransformDictionaryWord'
+/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libbrotlidec.a(decode.c.o): in function `SafeProcessCommands':
+decode.c:(.text+0x418c): undefined reference to `BrotliTransformDictionaryWord'
+/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libbrotlidec.a(state.c.o): in function `BrotliDecoderStateInit':
+state.c:(.text+0x120): undefined reference to `BrotliGetDictionary'
+/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: state.c:(.text+0x128): undefined reference to `BrotliGetTransforms'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/2387d4590c5dce73d5f6d72bccf253e79f9a73d8
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: Not sent yet (waiting for feedback on first patch)]
+---
+ cmake/modules/FindBROTLI.cmake | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/cmake/modules/FindBROTLI.cmake b/cmake/modules/FindBROTLI.cmake
+index 4ab8dbb41c..687afd6e5e 100644
+--- a/cmake/modules/FindBROTLI.cmake
++++ b/cmake/modules/FindBROTLI.cmake
+@@ -11,6 +11,9 @@
+ include( FindWSWinLibs )
+ FindWSWinLibs( "brotli-.*" "BROTLI_HINTS" )
+
++find_package(PkgConfig QUIET)
++PKG_CHECK_MODULES(PC_BROTLI QUIET libbrotlidec)
++
+ find_path(BROTLI_INCLUDE_DIR
+ NAMES "brotli/decode.h"
+ HINTS "${BROTLI_HINTS}/include"
+@@ -28,6 +31,10 @@ if( BROTLI_FOUND )
+ set( BROTLI_INCLUDE_DIRS ${BROTLI_INCLUDE_DIR} )
+ set( BROTLI_LIBRARIES ${BROTLIDEC_LIBRARY} )
+
++ if(UNIX)
++ list(APPEND BROTLI_LIBRARIES ${PC_BROTLI_LIBRARIES})
++ endif()
++
+ if (WIN32)
+ set ( BROTLI_DLL_DIR "${BROTLI_HINTS}/bin"
+ CACHE PATH "Path to the brotli DLLs"
+--
+2.24.0
+
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2, 1/1] package/wireshark: fix static build with brotli
2020-01-03 13:48 [Buildroot] [PATCH v2, 1/1] package/wireshark: fix static build with brotli Fabrice Fontaine
@ 2020-01-03 14:23 ` Thomas Petazzoni
2020-01-10 17:35 ` Yann E. MORIN
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2020-01-03 14:23 UTC (permalink / raw)
To: buildroot
Hello Fabrice,
Thanks for your new iteration!
On Fri, 3 Jan 2020 14:48:21 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> ++find_package(PkgConfig QUIET)
> ++PKG_CHECK_MODULES(PC_BROTLI QUIET libbrotlidec)
> ++
> + find_path(BROTLI_INCLUDE_DIR
> + NAMES "brotli/decode.h"
> + HINTS "${BROTLI_HINTS}/include"
> +@@ -28,6 +31,10 @@ if( BROTLI_FOUND )
> + set( BROTLI_INCLUDE_DIRS ${BROTLI_INCLUDE_DIR} )
> + set( BROTLI_LIBRARIES ${BROTLIDEC_LIBRARY} )
> +
> ++ if(UNIX)
> ++ list(APPEND BROTLI_LIBRARIES ${PC_BROTLI_LIBRARIES})
> ++ endif()
I'm not sure the UNIX condition is needed.
Also, if pkg-config is available, I guess you could simply set
BROTLI_INCLUDE_DIRS and BROTLI_LIBRARIES from the results given by
pkg-config.
Ah, but looking at cmake/modules/FindLibXml2.cmake, I see that this is
where you took the:
# Include transitive dependencies for static linking.
if(UNIX AND CMAKE_FIND_LIBRARY_SUFFIXES STREQUAL ".a")
list(APPEND LIBXML2_LIBRARIES ${PC_LIBXML_LIBRARIES})
endif()
logic.
So, I'm not sure what Wireshark upstream wants to do. It's probably
best to work with them directly.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2, 1/1] package/wireshark: fix static build with brotli
2020-01-03 13:48 [Buildroot] [PATCH v2, 1/1] package/wireshark: fix static build with brotli Fabrice Fontaine
2020-01-03 14:23 ` Thomas Petazzoni
@ 2020-01-10 17:35 ` Yann E. MORIN
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2020-01-10 17:35 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2020-01-03 14:48 +0100, Fabrice Fontaine spake thusly:
> Fixes:
> - http://autobuild.buildroot.org/results/2387d4590c5dce73d5f6d72bccf253e79f9a73d8
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Since wireshark now depends on dynamic libraries, this build failure
with static brotli should no longer be a concern, right?
Patch marked as "not applicable" now.
Thanks again for looking at all such mess...
Regards,
Yann E. MORIN.
> ---
> Changes v1 -> v2 (after review of Thomas Petazzoni):
> - Drop CMAKE_FIND_LIBRARY_SUFFIXES STREQUAL ".a" from patch
>
> ...-FindBROTLI.cmake-fix-static-linking.patch | 54 +++++++++++++++++++
> 1 file changed, 54 insertions(+)
> create mode 100644 package/wireshark/0002-FindBROTLI.cmake-fix-static-linking.patch
>
> diff --git a/package/wireshark/0002-FindBROTLI.cmake-fix-static-linking.patch b/package/wireshark/0002-FindBROTLI.cmake-fix-static-linking.patch
> new file mode 100644
> index 0000000000..1300a65167
> --- /dev/null
> +++ b/package/wireshark/0002-FindBROTLI.cmake-fix-static-linking.patch
> @@ -0,0 +1,54 @@
> +From e1d88b868f57d79a3e90af34f3961f56172998ba Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Fri, 3 Jan 2020 10:47:30 +0100
> +Subject: [PATCH 2/2] FindBROTLI.cmake: fix static linking
> +
> +Use pkg-config to retrieve dependencies of libbrotlidec such as
> +libbrotlicommon otherwise static build will fail on:
> +
> +[100%] Building C object CMakeFiles/tshark.dir/ui/cli/tap-smbsids.c.o
> +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libbrotlidec.a(decode.c.o): in function `ProcessCommands':
> +decode.c:(.text+0x36d0): undefined reference to `BrotliTransformDictionaryWord'
> +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libbrotlidec.a(decode.c.o): in function `SafeProcessCommands':
> +decode.c:(.text+0x418c): undefined reference to `BrotliTransformDictionaryWord'
> +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-1/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libbrotlidec.a(state.c.o): in function `BrotliDecoderStateInit':
> +state.c:(.text+0x120): undefined reference to `BrotliGetDictionary'
> +/home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: state.c:(.text+0x128): undefined reference to `BrotliGetTransforms'
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/2387d4590c5dce73d5f6d72bccf253e79f9a73d8
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: Not sent yet (waiting for feedback on first patch)]
> +---
> + cmake/modules/FindBROTLI.cmake | 7 +++++++
> + 1 file changed, 7 insertions(+)
> +
> +diff --git a/cmake/modules/FindBROTLI.cmake b/cmake/modules/FindBROTLI.cmake
> +index 4ab8dbb41c..687afd6e5e 100644
> +--- a/cmake/modules/FindBROTLI.cmake
> ++++ b/cmake/modules/FindBROTLI.cmake
> +@@ -11,6 +11,9 @@
> + include( FindWSWinLibs )
> + FindWSWinLibs( "brotli-.*" "BROTLI_HINTS" )
> +
> ++find_package(PkgConfig QUIET)
> ++PKG_CHECK_MODULES(PC_BROTLI QUIET libbrotlidec)
> ++
> + find_path(BROTLI_INCLUDE_DIR
> + NAMES "brotli/decode.h"
> + HINTS "${BROTLI_HINTS}/include"
> +@@ -28,6 +31,10 @@ if( BROTLI_FOUND )
> + set( BROTLI_INCLUDE_DIRS ${BROTLI_INCLUDE_DIR} )
> + set( BROTLI_LIBRARIES ${BROTLIDEC_LIBRARY} )
> +
> ++ if(UNIX)
> ++ list(APPEND BROTLI_LIBRARIES ${PC_BROTLI_LIBRARIES})
> ++ endif()
> ++
> + if (WIN32)
> + set ( BROTLI_DLL_DIR "${BROTLI_HINTS}/bin"
> + CACHE PATH "Path to the brotli DLLs"
> +--
> +2.24.0
> +
> --
> 2.24.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-10 17:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-03 13:48 [Buildroot] [PATCH v2, 1/1] package/wireshark: fix static build with brotli Fabrice Fontaine
2020-01-03 14:23 ` Thomas Petazzoni
2020-01-10 17:35 ` Yann E. MORIN
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.