Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hiredis: uprev to 1.1.0 and add ptest support #695

Closed
wants to merge 6 commits into from

Conversation

pberginkonsult
Copy link
Contributor

No description provided.

@kraj
Copy link
Contributor

kraj commented May 23, 2023

I guess redis-plus-plus also needs to adjust to swallow this update. bitbake redis-plus-plus with

| -- Configuring done (0.7s)
| CMake Error at CMakeLists.txt:210 (target_link_libraries):
|   Target "redis++_static" links to:
|
|     hiredis::hiredis_static_ssl
|
|   but the target was not found.  Possible reasons include:
|                                                                                                               |     * There is a typo in the target name.
|     * A find_package call is missing for an IMPORTED target.                                                  |     * An ALIAS target is missing.
|                                                                                                               |
|                                                                                                               | -- Generating done (0.0s)
| CMake Warning:                                                                                                |   Manually-specified variables were not used by the project:
|                                                                                                               |     CMAKE_EXPORT_NO_PACKAGE_REGISTRY
|     FETCHCONTENT_FULLY_DISCONNECTED                                                                           |     LIB_SUFFIX
|     PYTHON_EXECUTABLE
|     Python3_EXECUTABLE                                                                                        |     Python_EXECUTABLE
|                                                                                                               |
| CMake Generate step failed.  Build files cannot be regenerated correctly.
| WARNING: /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/redis-plus-plus/1.3.8-r0/temp/run.do_configu
re.4169437:162 exit 1 from 'cmake -G 'Ninja' -DCMAKE_MAKE_PROGRAM=ninja $oecmake_sitefile /mnt/b/yoe/master/buil
d/tmp/work/core2-64-yoe-linux-musl/redis-plus-plus/1.3.8-r0/git -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_INSTALL
_BINDIR:PATH=bin -DCMAKE_INSTALL_SBINDIR:PATH=sbin -DCMAKE_INSTALL_LIBEXECDIR:PATH=libexec -DCMAKE_INSTALL_SYSCO
NFDIR:PATH=/etc -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=../com -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=/var -DCMAKE_INSTA
LL_LIBDIR:PATH=lib -DCMAKE_INSTALL_INCLUDEDIR:PATH=include -DCMAKE_INSTALL_DATAROOTDIR:PATH=share -DPYTHON_EXECU
TABLE:PATH=/usr/bin/python3 -DPython_EXECUTABLE:PATH=/usr/bin/python3 -DPython3_EXECUTABLE:PATH=/usr/bin/python3
 -DLIB_SUFFIX= -DCMAKE_INSTALL_SO_NO_EXE=0 -DCMAKE_TOOLCHAIN_FILE=/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-
linux-musl/redis-plus-plus/1.3.8-r0/toolchain.cmake -DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 -DCMAKE_EXPORT_NO_PACKAGE_
REGISTRY=ON -DFETCHCONTENT_FULLY_DISCONNECTED=ON -DREDIS_PLUS_PLUS_USE_TLS=ON -Wno-dev'
| WARNING: Backtrace (BB generated script):
|       #1: cmake_do_configure, /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/redis-plus-plus/1.3.8-r
0/temp/run.do_configure.4169437, line 162
|       #2: do_configure, /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/redis-plus-plus/1.3.8-r0/temp
/run.do_configure.4169437, line 141
|       #3: main, /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/redis-plus-plus/1.3.8-r0/temp/run.do_
configure.4169437, line 198

Copy link
Contributor

@kraj kraj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please take a look at redis-plus-plus as well.

@pberginkonsult
Copy link
Contributor Author

Remove unneeded statements in the code.
Align with style guide.
Introduce PACKAGECONFIG for ssl and test.
Remove QA warning.

Signed-off-by: Peter Bergin <peter.bergin@windriver.com>
Signed-off-by: Peter Bergin <peter@berginkonsult.se>
When building static library a substitution for library name
was bad. Reported in sewenew/redis-plus-plus#486
and detected when building new version of hiredis that also builds
a static library.

Signed-off-by: Peter Bergin <peter.bergin@windriver.com>
Signed-off-by: Peter Bergin <peter@berginkonsult.se>
Removed patch now applied upstream.

Signed-off-by: Peter Bergin <peter.bergin@windriver.com>
Signed-off-by: Peter Bergin <peter@berginkonsult.se>
Upgrade to revision 1.1.0. Make use of PACKAGECONFIG to
configure ssl support.

In version 1.1.0 the library is built as both dynamic and
static.

Signed-off-by: Peter Bergin <peter.bergin@windriver.com>
Signed-off-by: Peter Bergin <peter@berginkonsult.se>
hiredis package builds fine without the dependency to
redis. Using hiredis on target without redis is quite
useless and instead adding redis as a run-time dependency.

Signed-off-by: Peter Bergin <peter.bergin@windriver.com>
Signed-off-by: Peter Bergin <peter@berginkonsult.se>
Use internal test from hiredis project as ptest. If ptest
is in DISTRO_FEATURES tests are enabled default
but can be handled individually through PACKAGECONFIG.
Test config 'testssl' requires 'ssl' option but is not
enabled default as the redis recipe does not build it
with ssl support.

Tested on qemux86_64 and qemuarm64.

Signed-off-by: Peter Bergin <peter.bergin@windriver.com>
Signed-off-by: Peter Bergin <peter@berginkonsult.se>
@pberginkonsult
Copy link
Contributor Author

Please take a look at redis-plus-plus as well.

I've done some work on redis-plus-plus as well and it builds in my setup now. Take a look if it works on your side.

@kraj
Copy link
Contributor

kraj commented May 26, 2023

applied at b818cc6 in master

@kraj kraj closed this May 26, 2023
krsh pushed a commit to krsh/meta-openembedded that referenced this pull request Jun 7, 2023
Update xfce4-panel from 4.18.0 to 4.18.3

* rebase 2 patches

Release notes for 4.18.3
========================
- launcher: Show action menu also when there are several items
- Fix memory management of vala generated plugins
- panel: Rephrase "Don't reserve space on borders" (V2)
- panel: Make property migration generic
- launcher: Avoid "no trigger event" warning when showing the menu
- launcher: Guard access to the plugin menu GdkWindow
- libxfce4panel: Unregister menu also on GtkWidget::hide
- panel: Do not reset output name if a monitor does not have a model name
- libxfce4panel: Fix memory management of source for menu positioning
- panel: Delay removal of ExternalPlugin to prevent use-after-free
- systray: Cancel any async D-Bus operation in finalize()
- tasklist: Do not try to resolve /proc/pid/exe to launch new instance
- Translation Updates:
  Albanian, Arabic, Armenian (Armenia), Asturian, Basque, Belarusian,
  Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese
  (Taiwan), Croatian, Czech, Danish, Dutch, Eastern Armenian, English
  (Australia), English (United Kingdom), Estonian, Finnish, French,
  Galician, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian,
  Italian, Japanese, Kazakh, Korean, Lithuanian, Malay, Norwegian
  Bokmål, Norwegian Nynorsk, Occitan (post 1500), Polish, Portuguese,
  Portuguese (Brazil), Romanian, Russian, Serbian, Slovak, Slovenian,
  Spanish, Swedish, Thai, Turkish, Ukrainian, Uyghur, Vietnamese

Release notes for 4.18.2
========================
- directorymenu: Add missing sanity check
- panel: Properly handle null string as property default value
- Revert "Use RGBA visual only if compositing is enabled (Fixes openembedded#251)" (openembedded#672)
- Revert "systray: Do not require compositing to be enabled to use RGBA visual"
- systray: Fix blurry icons in prefs dialog when UI scale &gt; 1
- launcher: Fix blurry icons in prefs and add dialogs when UI scale &gt; 1
- launcher: Use GIcon for the tooltip icon (openembedded#674)
- pager: Use WnckHandle if available (openembedded#695)
- Translation Updates:
  Albanian, Finnish, Greek, Italian, Portuguese, Slovenian

Release notes for 4.18.1
========================
- Update copyright year
- tasklist: Fix scrolling through window buttons (Fixes openembedded#692)
- tasklist: Fix group button visibility
- libxfce4panel: Deprecate XfcePanelImage
- tasklist: Do not duplicate menu item activation
- clock: Fix sync timeout
- docs: Fix version for xfce_panel_set_image_from_source()
- clock: Add missing sanity check
- windowmenu: Adapt wnck default icon size when UI scale &gt; 1 (Fixes openembedded#682)
- tasklist: Adapt wnck default icon size when UI scale &gt; 1 (Fixes openembedded#681)
- tasklist: Fix window count positioning when UI scale &gt; 1
- tasklist: Keep icon pixbuf around and use surface also for menu items
- clock: Do not override custom font formats
- Translation Updates:
  Albanian, Amharic, Arabic, Armenian (Armenia), Asturian, Basque,
  Belarusian, Bengali, Bulgarian, Catalan, Chinese (China), Chinese
  (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch,
  Eastern Armenian, English (Australia), English (United Kingdom),
  Estonian, Finnish, French, Galician, Georgian, German, Greek, Hebrew,
  Hungarian, Icelandic, Indonesian, Interlingue, Italian, Japanese,
  Kazakh, Korean, Lithuanian, Malay, Norwegian Bokmål, Norwegian
  Nynorsk, Occitan (post 1500), Panjabi (Punjabi), Polish, Portuguese,
  Portuguese (Brazil), Romanian, Russian, Serbian, Sinhala, Slovak,
  Slovenian, Spanish, Swedish, Thai, Turkish, Ukrainian, Uyghur,
  Vietnamese

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Feb 10, 2024
Changes 1.26.0:

Brad House (14):
      update release notes format
      update format slightly
      RELEASE-NOTES -> RELEASE-NOTES.md
      test: fix outdated license headers
      no reason to include sys/random.h all the time (openembedded#684)
      Do not sanity check RR Name vs Question (openembedded#685)
      autotools: fix building for 32bit windows due to stdcall symbol mangling (openembedded#689)
      man ares_fds(3): mark as deprecated and add explanation (openembedded#691)
      fix doxygen typo
      Autotools allow make to override CFLAGS/CPPFLAGS/CXXFLAGS (openembedded#695)
      Event Subsystem: No longer require integrators to have their own (openembedded#696)
      adig: Differentiate between internal and server error
      Release prep for c-ares 1.26.0 (openembedded#698)
      clusterfuzz: enforce maximum DNS packet size due to long parser time

Erik Lax (1):
      Added flags to are_dns_parse to force RAW packet parsing (openembedded#693)

Gregor Jasny (1):
      cmake: improve some include related code (openembedded#680)

Changes 1.25.0:

Brad House (22):
      fix test building with symbol hiding
      ci: add test case for building with hidden symbol visibility
      ci: disable static for symbol hiding tests
      getrandom() may require sys/random.h on some systems
      fix support with older google test versions
      CI: Add Alpine Linux and old Ubuntu (openembedded#667)
      Fix bad stub for ares__iface_ips_enumerate()
      ahost should use ares_getaddrinfo() these days (openembedded#669)
      Connection failure should increment server failure count first
      sonarcloud: const
      clang-format
      ares_strsplit() rewrite as wrapper around ares__buf_split()
      clang-format
      Autotools warning fixes (openembedded#671)
      Old MacOS SDKs require you include sys/socket.h before net/if.h (openembedded#673)
      docs: host -> ip
      Autotools: rework to simplify and fix recent issues (openembedded#674)
      set winver consistently across build systems
      autotools: update logic for building tests to provide more feedback
      OSSFuzz: it assumes autotools builds a static library by default, which means the old autotools must have done that even though there were comments saying it wasn't.  Disable static by default on Windows however since it can't build both simultaneously.
      tests: replace google DNS with CloudFlare for reverse lookups as google's servers stopped responding properly
      1.25.0 release prep (openembedded#676)

Gregor Jasny (1):
      Fix minor warnings and documentation typos (openembedded#666)

Martin Chang (1):
      Use SOCK_DNS extension on socket on OpenBSD (openembedded#659)

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants