public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Cc: Adolf Belka <adolf.belka@ipfire.org>
Subject: [PATCH 1/4] json-glib: Move to be built after glib has been built
Date: Wed,  9 Jul 2025 14:09:49 +0200	[thread overview]
Message-ID: <20250709120952.210031-1-adolf.belka@ipfire.org> (raw)

- Shifted to build after glib is built and removed the dist entry that is used for
   addons.
- Checked the glib library and the libgio entries are uncommented so that should be okay
- Checked build and this package then built with no problems but in the addon package
   build section libtpms failed to build as it was missing the dist entry. Also the same
   with swtpm so this is a patch set with the changes to those two packages as well.
- Full build tested out and confirmed working on x86_64 with this patch set applied.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 lfs/json-glib | 3 ---
 make.sh       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lfs/json-glib b/lfs/json-glib
index 00617cd93..f0ac3b942 100644
--- a/lfs/json-glib
+++ b/lfs/json-glib
@@ -50,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 b2 : $(subst %,%_BLAKE2,$(objects))
 
-dist:
-	@$(PAK)
-
 ###############################################################################
 # Downloading, checking, b2sum
 ###############################################################################
diff --git a/make.sh b/make.sh
index 789d01540..dc1feb37a 100755
--- a/make.sh
+++ b/make.sh
@@ -1514,7 +1514,6 @@ build_system() {
 	lfsmake2 libarchive
 	lfsmake2 cmake
 	lfsmake2 json-c
-	lfsmake2 json-glib
 	lfsmake2 tcl
 	lfsmake2 python3-MarkupSafe
 	lfsmake2 python3-Jinja2
@@ -1526,6 +1525,7 @@ build_system() {
 	lfsmake2 lvm2
 	lfsmake2 multipath-tools
 	lfsmake2 glib
+	lfsmake2 json-glib
 	lfsmake2 libgudev
 	lfsmake2 libgpg-error
 	lfsmake2 libgcrypt
-- 
2.50.0



             reply	other threads:[~2025-07-09 12:09 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-09 12:09 Adolf Belka [this message]
2025-07-09 12:09 ` [PATCH 2/4] core197: Ship json-glib Adolf Belka
2025-07-09 12:09 ` [PATCH 3/4] libtpms: Add dist to lfs file Adolf Belka
2025-07-09 12:09 ` [PATCH 4/4] swtpm: " Adolf Belka
2025-07-10  9:26 ` [PATCH 1/4] json-glib: Move to be built after glib has been built Michael Tremer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250709120952.210031-1-adolf.belka@ipfire.org \
    --to=adolf.belka@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox