All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vladimir Serbinenko <phcoder@gmail.com>
To: grub-devel@gnu.org
Cc: Vladimir Serbinenko <phcoder@gmail.com>
Subject: [PATCH v8 8/9] Remove now unneeded gcrypt compilation flag
Date: Fri,  4 Apr 2025 02:05:10 +0300	[thread overview]
Message-ID: <20250403230630.3572282-9-phcoder@gmail.com> (raw)
In-Reply-To: <20250403230630.3572282-1-phcoder@gmail.com>

HAVE_STRTOUL is now defined in stdlib.h. Include it in g10lib.h rather than
defining on command line

Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
---
 conf/Makefile.common | 2 +-
 util/import_gcry.py  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/Makefile.common b/conf/Makefile.common
index 5cada4568..0df4d6e7a 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -82,7 +82,7 @@ CFLAGS_POSIX = -fno-builtin
 CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
 
 CFLAGS_GCRY = -Wno-error=sign-compare -Wno-missing-field-initializers -Wno-redundant-decls -Wno-undef $(CFLAGS_POSIX)
-CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap $(CPPFLAGS_POSIX) -D_GCRYPT_IN_LIBGCRYPT=1 -D_GCRYPT_CONFIG_H_INCLUDED=1 -DHAVE_STRTOUL=1 -I$(top_srcdir)/include/grub/gcrypt
+CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap $(CPPFLAGS_POSIX) -D_GCRYPT_IN_LIBGCRYPT=1 -D_GCRYPT_CONFIG_H_INCLUDED=1 -I$(top_srcdir)/include/grub/gcrypt
 
 CPPFLAGS_EFIEMU = -I$(top_srcdir)/grub-core/efiemu/runtime
 
diff --git a/util/import_gcry.py b/util/import_gcry.py
index 489356d37..1be18cf91 100644
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -617,6 +617,7 @@ for src in sorted (os.listdir (os.path.join (indir, "src"))):
     if src == "g10lib.h":
         fw.write("#include <cipher_wrap.h>\n")
         fw.write("#include <grub/crypto.h>\n")
+        fw.write("#include <stdlib.h>\n")
         fw.write (f.read ().replace ("(printf,f,a)", "(__printf__,f,a)").replace ("#include \"../compat/libcompat.h\"", "").replace("#define N_(a) (a)", ""))
         f.close ()
         fw.close ()
-- 
2.49.0


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

  parent reply	other threads:[~2025-04-03 23:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-03 23:05 [PATCH v8 0/9] Update libgcrypt to 1.11 Vladimir Serbinenko
2025-04-03 23:05 ` [PATCH v8 1/9] Import libgcrypt 1.11 Vladimir Serbinenko
2025-04-03 23:05 ` [PATCH v8 2/9] Import b64dec from gpg-error Vladimir Serbinenko
2025-04-03 23:05 ` [PATCH v8 3/9] b64dec: Adjust for compilation in GRUB environment Vladimir Serbinenko
2025-04-03 23:05 ` [PATCH v8 4/9] Adjust import script, definitions and API users for libgcrypt 1.11 Vladimir Serbinenko
2025-04-03 23:05 ` [PATCH v8 5/9] Add DSA and RSA SEXP tests Vladimir Serbinenko
2025-04-03 23:05 ` [PATCH v8 6/9] keccak: Disable acceleration with SSE asm Vladimir Serbinenko
2025-04-03 23:05 ` [PATCH v8 7/9] libgcrypt: Fix coverity warnings Vladimir Serbinenko
2025-04-03 23:05 ` Vladimir Serbinenko [this message]
2025-04-03 23:05 ` [PATCH v8 9/9] Implement __aeabi_uldivmod Vladimir Serbinenko
2025-04-07 19:14 ` [PATCH v8 0/9] Update libgcrypt to 1.11 Daniel Kiper

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=20250403230630.3572282-9-phcoder@gmail.com \
    --to=phcoder@gmail.com \
    --cc=grub-devel@gnu.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 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.