Skip to content

gpgme: use target staging gpgrt-config#29982

Open
fwerkor wants to merge 1 commit into
openwrt:masterfrom
fwerkor:gpgme-pin-target-gpgrt-config
Open

gpgme: use target staging gpgrt-config#29982
fwerkor wants to merge 1 commit into
openwrt:masterfrom
fwerkor:gpgme-pin-target-gpgrt-config

Conversation

@fwerkor

@fwerkor fwerkor commented Jul 12, 2026

Copy link
Copy Markdown

📦 Package Details

Maintainer: @dangowrt
(You can find this by checking the history of the package Makefile.)

Description:

gpgme's configure script looks up gpgrt-config through PATH. When the host tool is installed, configure may select the host copy and inject host paths such as /usr/include and /usr/lib into the cross build, mixing glibc headers with the target musl headers.

This change pins the configure lookup to the target staging tool:

CONFIGURE_VARS += ac_cv_path_GPGRT_CONFIG="$(STAGING_DIR)/usr/bin/gpgrt-config"

This matches the existing handling in libassuan. PKG_RELEASE is also incremented from 2 to 3.

Related: #19880

The fix was validated in an OpenWrt-derived x86_64 full image build: configure no longer selected the host gpgrt-config, and gpgme compiled successfully.


🧪 Run Testing Details

  • OpenWrt Version: master
  • OpenWrt Target/Subtarget: x86/64
  • OpenWrt Device: Not run on upstream master; issue reproduced in an OpenWrt-derived x86_64 build

✅ Formalities

  • I have reviewed the CONTRIBUTING.md file for detailed contributing guidelines.

If your PR contains a patch:

  • It can be applied using git am
  • It has been refreshed to avoid offsets, fuzzes, etc., using
    make package/<your-package>/refresh V=s
  • It is structured in a way that it is potentially upstreamable
    (e.g., subject line, commit description, etc.)
    We must try to upstream patches to reduce maintenance burden.

@openwrt-ai openwrt-ai left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Reviewed 1 new commit; no new issues found.


Generated by Claude Code

@openwrt-ai openwrt-ai left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Reviewed 1 new commit. One inline note on the missing PKG_RELEASE bump for this build-affecting change; the configure pinning itself matches libassuan and looks correct.


Generated by Claude Code

Comment thread libs/gpgme/Makefile
@fwerkor
fwerkor force-pushed the gpgme-pin-target-gpgrt-config branch from 457354d to b94e783 Compare July 16, 2026 07:31
@github-actions
github-actions Bot force-pushed the gpgme-pin-target-gpgrt-config branch from 68b05b1 to 4680274 Compare July 16, 2026 07:45
@fwerkor
fwerkor marked this pull request as draft July 16, 2026 07:45
@github-actions
github-actions Bot force-pushed the gpgme-pin-target-gpgrt-config branch from ca6660d to 509778a Compare July 16, 2026 07:48
gpgme's configure script looks up gpgrt-config through PATH and
may select the host copy. This injects host include and library
paths into cross builds, causing glibc headers to be mixed with
the target musl headers.

Pin gpgrt-config to the target staging directory, matching
libassuan, and bump PKG_RELEASE to 3.

Signed-off-by: Cao Yuhang <caoyuhang@fwerkor.com>
@github-actions
github-actions Bot force-pushed the gpgme-pin-target-gpgrt-config branch from 3a725f5 to 6a37e36 Compare July 16, 2026 07:49
@fwerkor
fwerkor marked this pull request as ready for review July 16, 2026 07:50
@fwerkor
fwerkor marked this pull request as draft July 16, 2026 07:53
@fwerkor
fwerkor marked this pull request as ready for review July 16, 2026 08:06
@fwerkor
fwerkor requested a review from openwrt-ai July 16, 2026 08:06

@openwrt-ai openwrt-ai left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Reviewed 1 new commit; no new issues found. The PKG_RELEASE bump to 3 addresses the prior note, and the commit message now matches the diff.


Generated by Claude Code

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants