Various build and doc fixes
v3 cover Various build and doc fixes
Hey,
As in subject... Please review...
Daniel
INSTALL | 47 +++++++++++++++++++++++++++++++---------------- autogen.sh | 2 +- configure.ac | 19 ++++++++++++++----- 3 files changed, 46 insertions(+), 22 deletions(-)
Daniel Kiper (5):
configure: Drop unneeded TARGET_CFLAGS expansion
configure: Set gnu99 C language standard by default INSTALL/configure: Update install doc and configure comment
INSTALL: Update configure example
autogen: Replace -iname with -ipath in find command
PATCH v3 1/5 configure: Drop unneeded TARGET_CFLAGS expansion
--- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configure.ac +1 -1
@@ -77,7 +77,7 @@ grub_TRANSFORM([grub-file]) # Optimization flag. Allow user to override. if test "x$TARGET_CFLAGS" = x; then - TARGET_CFLAGS="$TARGET_CFLAGS -Os" + TARGET_CFLAGS=-Os fi # Default HOST_CPPFLAGS
Signature · 1 line
2.11.0
PATCH v3 2/5 configure: Set gnu99 C language standard by default
In reply to Daniel KiperCommit d5a32255d (misc: Make grub_strtol() "end" pointers have safer const qualifiers) introduced "restrict" keyword into some functions definitions. This keyword was introduced in C99 standard. However, some compilers by default may use C89 or something different. This behavior leads to the breakage during builds when c89 or gnu89 is in force. So, let's set gnu99 C language standard for all compilers by default. This way a bit random build issue will be fixed and the GRUB source will be build consistently regardless of type and version of the compiler.
It was decided to use gnu99 C language standard because it fixes the issue mentioned above and also provides some useful extensions which are used here and there in the GRUB source. Potentially we can use gnu11 too. However, this may reduce pool of older compilers which can be used to build the GRUB. So, let's live with gnu99 until we discover that we strongly require a feature from newer C standard.
The user is still able to override C language standard using relevant *_CFLAGS variables.
---
v3 - suggestions/fixes:
- add a comment before the change in configure.ac (suggested by Javier Martinez Canillas and Leif Lindholm),
- improve commit message
(suggested by Javier Martinez Canillas and Leif Lindholm).
v2 - suggestions/fixes:
- unconditionally enforce gnu99 C language standard (suggested by Leif Lindholm).
--- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+)
configure.ac +6 -0
@@ -80,6 +80,12 @@ if test "x$TARGET_CFLAGS" = x; then TARGET_CFLAGS=-Os fi +# Enable support for "restrict" keyword and other +# features from gnu99 C language standard. +BUILD_CFLAGS="-std=gnu99 $BUILD_CFLAGS" +HOST_CFLAGS="-std=gnu99 $HOST_CFLAGS" +TARGET_CFLAGS="-std=gnu99 $TARGET_CFLAGS" + # Default HOST_CPPFLAGS HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W" HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
Signature · 1 line
2.11.0
Re: [PATCH v3 2/5] configure: Set gnu99 C language standard by default
Hi Daniel,
Quoted 9 lines
Commit
d5a32255d(misc: Makegrub_strtol()"end" pointers have safer const qualifiers) introduced "restrict" keyword into some functions definitions. This keyword was introduced in C99 standard. However, some compilers by default may use C89 or something different. This behavior leads to the breakage during builds when c89 or gnu89 is in force. So, let's set gnu99 C language standard for all compilers by default. This way a bit random build issue will be fixed and the GRUB source will be build consistently regardless of type and version of the compiler.
Quoted 6 lines
It was decided to use gnu99 C language standard because it fixes the issue mentioned above and also provides some useful extensions which are used here and there in the GRUB source. Potentially we can use gnu11 too. However, this may reduce pool of older compilers which can be used to build the GRUB. So, let's live with gnu99 until we discover that we strongly require a feature from newer C standard.
I tried building this with CC=clang just to see if it didn't like gnu99 for some reason.
It does not, but for different reasons to what I expected:
clang -DHAVE_CONFIG_H -I. -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub-core/lib/json/json.c\" -I. -I. -I. -I. -I./include -I./include -I./grub-core/lib/libgcrypt-grub/src/ -I./grub-core/lib/gnulib -I./grub-core/lib/gnulib -I./grub-core/lib/json -D_FILE_OFFSET_BITS=64 -std=gnu99 -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -Wcast-align -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -Werror -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -MT grub-core/lib/json/libgrubkern_a-json.o -MD -MP -MF grub-core/lib/json/.deps-util/libgrubkern_a-json.Tpo -c -o grub-core/lib/json/libgrubkern_a-json.o test -f 'grub-core/lib/json/json.c' || echo './'grub-core/lib/json/json.c In file included from grub-core/lib/json/json.c:24:./grub-core/lib/json/json.h:39:24: error: redefinition of typedef 'jsmntok_t' is a C11 feature [-Werror,-Wtypedef-redefinition]
typedef struct jsmntok jsmntok_t;
^./grub-core/lib/json/jsmn.h:77:3: note: previous definition is here } jsmntok_t;
^
1 error generated.
clang --version
clang version 9.0.0-2 (tags/RELEASE_900/final)
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir: /usr/bin
Without this patch, clang-9 fails on the use of nested functions in commit cb2f15c54489 ("normal/main: Search for specific config files for netboot") - I'll send a fix for that shortly. If I revert that as a temporary measure, clang will build.
I notice from ./configure that it already does some form of testing for restrict:
checking for C/C++ restrict keyword... __restrict
I'm not sure what brings that test in to configure (gnulib?), and accessing it is a little bit tricky because we use AC_CONFIG_FILES for config.h rather than AC_CONFIG_HEADER, but that could be a general purpose solution.
Regards,
Daniel
Quoted 43 lines
The user is still able to override C language standard using relevant
*_CFLAGSvariables.Signed-off-by Daniel Kiper <[email protected]>---
v3 - suggestions/fixes:
- add a comment before the change in configure.ac (suggested by Javier Martinez Canillas and Leif Lindholm),
- improve commit message
(suggested by Javier Martinez Canillas and Leif Lindholm).v2 - suggestions/fixes:
- unconditionally enforce gnu99 C language standard (suggested by Leif Lindholm).--- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+)configure.ac +6
-0@@ -80,6 +80,12 @@ if test "x$TARGET_CFLAGS" = x; then TARGET_CFLAGS=-Os fi +# Enable support for "restrict" keyword and other +# features from gnu99 C language standard. +BUILD_CFLAGS="-std=gnu99 $BUILD_CFLAGS" +HOST_CFLAGS="-std=gnu99 $HOST_CFLAGS" +TARGET_CFLAGS="-std=gnu99 $TARGET_CFLAGS" + # Default HOST_CPPFLAGS HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W" HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"Signature · 7 lines
2.11.0 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH v3 2/5] configure: Set gnu99 C language standard by default
Hi Daniel,
Adding Patrick...
Quoted 18 lines · Daniel Axtens
Hi Daniel,
Quoted 9 lines
Commit
d5a32255d(misc: Makegrub_strtol()"end" pointers have safer const qualifiers) introduced "restrict" keyword into some functions definitions. This keyword was introduced in C99 standard. However, some compilers by default may use C89 or something different. This behavior leads to the breakage during builds when c89 or gnu89 is in force. So, let's set gnu99 C language standard for all compilers by default. This way a bit random build issue will be fixed and the GRUB source will be build consistently regardless of type and version of the compiler.Quoted 6 lines
It was decided to use gnu99 C language standard because it fixes the issue mentioned above and also provides some useful extensions which are used here and there in the GRUB source. Potentially we can use gnu11 too. However, this may reduce pool of older compilers which can be used to build the GRUB. So, let's live with gnu99 until we discover that we strongly require a feature from newer C standard.
Quoted 2 lines
I tried building this with CC=clang just to see if it didn't like gnu99 for some reason.
Thank you for testing this...
Quoted 1 line
It does not,
Great!
Quoted 11 lines
but for different reasons to what I expected:
clang -DHAVE_CONFIG_H -I. -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub-core/lib/json/json.c\" -I. -I. -I. -I. -I./include -I./include -I./grub-core/lib/libgcrypt-grub/src/ -I./grub-core/lib/gnulib -I./grub-core/lib/gnulib -I./grub-core/lib/json -D_FILE_OFFSET_BITS=64 -std=gnu99 -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -Wcast-align -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -Werror -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter -Wno-redundant-decls -Wno-unreachable-code -Wno-conversion -MT
grub-core/lib/json/libgrubkern_a-json.o-MD -MP -MF grub-core/lib/json/.deps-util/libgrubkern_a-json.Tpo -c -ogrub-core/lib/json/libgrubkern_a-json.otest -f 'grub-core/lib/json/json.c' || echo './'grub-core/lib/json/json.cIn file included fromgrub-core/lib/json/json.c:24:./grub-core/lib/json/json.h:39:24: error: redefinition of typedef 'jsmntok_t' is a C11 feature [-Werror,-Wtypedef-redefinition]typedef struct jsmntok jsmntok_t; ^
./grub-core/lib/json/jsmn.h:77:3: note: previous definition is here }jsmntok_t;
^
1 error generated.
Patrick, could you take a look at this?
Quoted 10 lines
clang --version
clang version 9.0.0-2 (tags/RELEASE_900/final)
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir:/usr/binWithout this patch, clang-9 fails on the use of nested functions in commit
cb2f15c54489("normal/main: Search for specific config files for netboot") - I'll send a fix for that shortly. If I revert that as a temporary measure, clang will build.
Javier, could you take a look at this too?
Quoted 9 lines
I notice from ./configure that it already does some form of testing for restrict:
checking for C/C++ restrict keyword...
__restrictI'm not sure what brings that test in to configure (gnulib?), and accessing it is a little bit tricky because we use
AC_CONFIG_FILESforconfig.hrather thanAC_CONFIG_HEADER, but that could be a general purpose solution.
Yeah, I saw that too. However, I think we have to enforce C standard in one way or another. So, I would not bother much if we chose gnu99.
Daniel
Re: [PATCH v3 2/5] configure: Set gnu99 C language standard by default
Hello Daniel,
On 5/18/20 5:49 PM, Daniel Kiper wrote:
[snip]
Quoted 8 lines
Quoted 5 lines
Without this patch, clang-9 fails on the use of nested functions in commit
cb2f15c54489("normal/main: Search for specific config files for netboot") - I'll send a fix for that shortly. If I revert that as a temporary measure, clang will build.Javier, could you take a look at this too?
Sure, I'll take a look to this.
Best regards,
Signature · 3 lines
Javier Martinez Canillas Software Engineer - Desktop Hardware Enablement Red Hat
Re: [PATCH v3 2/5] configure: Set gnu99 C language standard by default
Quoted 13 lines · Javier Martinez Canillas
Hello Daniel,
On 5/18/20 5:49 PM, Daniel Kiper wrote:
[snip]
Quoted 7 lines
Quoted 5 lines
Without this patch, clang-9 fails on the use of nested functions in commit
cb2f15c54489("normal/main: Search for specific config files for netboot") - I'll send a fix for that shortly. If I revert that as a temporary measure, clang will build.Javier, could you take a look at this too?
Javier,
I think this is as simple as un-nesting the function, but you know the code base better than me, so I'll leave it to you unless you particularly want me to handle it.
Regards,
Daniel
Quoted 9 lines
Quoted 1 line
Sure, I'll take a look to this.
Best regards,
Signature · 3 lines
Javier Martinez Canillas Software Engineer - Desktop Hardware Enablement Red Hat
Re: [PATCH v3 2/5] configure: Set gnu99 C language standard by default
Hello Daniel,
Quoted 14 lines · Daniel Axtens
Quoted 12 lines · Javier Martinez Canillas
Hello Daniel,
On 5/18/20 5:49 PM, Daniel Kiper wrote:
[snip]
Quoted 6 lines
Quoted 5 lines
Without this patch, clang-9 fails on the use of nested functions in commit
cb2f15c54489("normal/main: Search for specific config files for netboot") - I'll send a fix for that shortly. If I revert that as a temporary measure, clang will build.
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Javier, could you take a look at this too?
Javier,
I think this is as simple as un-nesting the function, but you know the code base better than me, so I'll leave it to you unless you particularly want me to handle it.
Yes, that should be enough. I'll post a patch but I don't have a clang build environment so I would appreciate if you can test it.
Quoted 3 lines
Regards,
Daniel
Best regards,
Signature · 3 lines
Javier Martinez Canillas Software Engineer - Desktop Hardware Enablement Red Hat
Re: [PATCH v3 2/5] configure: Set gnu99 C language standard by default
Quoted 21 lines · Javier Martinez Canillas
Hello Daniel,
Quoted 18 lines · Daniel Axtens
Quoted 13 lines · Javier Martinez Canillas
Hello Daniel,
On 5/18/20 5:49 PM, Daniel Kiper wrote:
[snip]
Quoted 7 lines
Quoted 5 lines
Without this patch, clang-9 fails on the use of nested functions in commit
cb2f15c54489("normal/main: Search for specific config files for netboot") - I'll send a fix for that shortly. If I revert that as a temporary measure, clang will build.Javier, could you take a look at this too?
Javier,
Quoted 7 lines
Quoted 4 lines
I think this is as simple as un-nesting the function, but you know the code base better than me, so I'll leave it to you unless you particularly want me to handle it.
Yes, that should be enough. I'll post a patch but I don't have a clang build environment so I would appreciate if you can test it.
Will do.
Quoted 10 lines
Quoted 4 lines
Regards,
DanielBest regards,
Signature · 3 lines
Javier Martinez Canillas Software Engineer - Desktop Hardware Enablement Red Hat
PATCH 1/1 json: Remove invalid typedef redefinition
In reply to Daniel AxtensThe C standard does not allow for typedef redefinitions, even if they map to the same underlying type. In order to avoid including the "jsmn.h" in "json.h" and thus exposing jsmn's internals, we have exactly such a forward-declaring typedef in "json.h". If enforcing the GNU99 C standard, clang may generate a warning about this non-standard construct.
Fix the issue by using a simple struct jsmntok forward declaration instead of using a typedef.
---
Sorry for the late response, didn't notice at first that this directly impacts code I wrote. I don't have Clang available on my computer and GCC seems to lack the equivalent option for this, so I wasn't able to reproduce the warning. Below patch should fix the issue, though, as we simply avoid using a typedef for the forward declaration.
grub-core/lib/json/json.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
grub-core/lib/json/json.h +5 -4
@@ -36,13 +36,14 @@ enum grub_json_type };typedef enum grub_json_type grub_json_type_t ; -typedef struct jsmntok jsmntok_t ; +/* Forward-declaration to avoid including "jsmn.h" */ +struct jsmntok ;struct grub_json { -jsmntok_t *tokens; -char *string; -grub_size_t idx; +struct jsmntok *tokens; +char *string; +grub_size_t idx; };typedef struct grub_json grub_json_t ;
Signature · 1 line
2.26.2
Re: [PATCH] json: Remove invalid typedef redefinition
Quoted 11 lines · Patrick Steinhardt
The C standard does not allow for typedef redefinitions, even if they map to the same underlying type. In order to avoid including the "
jsmn.h" in "json.h" and thus exposing jsmn's internals, we have exactly such a forward-declaring typedef in "json.h". If enforcing the GNU99 C standard, clang may generate a warning about this non-standard construct.Fix the issue by using a simple
struct jsmntokforward declaration instead of using a typedef.Signed-off-by Patrick Steinhardt <[email protected]>
Daniel A., could you check this patch?
Quoted 7 lines
---
Sorry for the late response, didn't notice at first that this directly impacts code I wrote. I don't have Clang available on my computer and GCC seems to lack the equivalent option for this, so I wasn't able to reproduce the warning. Below patch should fix the issue, though, as we simply avoid using a typedef for the forward declaration.
Not a problem. Thanks a lot for fixing this issue...
Daniel
Re: [PATCH] json: Remove invalid typedef redefinition
In reply to Patrick SteinhardtHi Patrick,
Quoted 11 lines
The C standard does not allow for typedef redefinitions, even if they map to the same underlying type. In order to avoid including the "
jsmn.h" in "json.h" and thus exposing jsmn's internals, we have exactly such a forward-declaring typedef in "json.h". If enforcing the GNU99 C standard, clang may generate a warning about this non-standard construct.Fix the issue by using a simple
struct jsmntokforward declaration instead of using a typedef.Signed-off-by Patrick Steinhardt <[email protected]>
With this patch, clang can compile master again. Thanks Patrick!
Regards,
Daniel
Quoted 36 lines
---
Sorry for the late response, didn't notice at first that this directly impacts code I wrote. I don't have Clang available on my computer and GCC seems to lack the equivalent option for this, so I wasn't able to reproduce the warning. Below patch should fix the issue, though, as we simply avoid using a typedef for the forward declaration.
grub-core/lib/json/json.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)grub-core/lib/json/json.h +5
-4@@ -36,13 +36,14 @@ enum grub_json_type };typedef enum grub_json_type grub_json_type_t ; -typedef struct jsmntok jsmntok_t ; +/* Forward-declaration to avoid including "jsmn.h" */ +struct jsmntok ;struct grub_json { -jsmntok_t *tokens; -char *string; -grub_size_t idx; +struct jsmntok *tokens; +char *string; +grub_size_t idx; };typedef struct grub_json grub_json_t ;Signature · 1 line
2.26.2
PATCH v3 3/5 INSTALL/configure: Update install doc and configure comment
In reply to Daniel Kiper..to reflect the GRUB build reality in them.
Additionally, fix text formatting a bit.
---
v3 - suggestions/fixes:
- improve wording of changed text (suggested by Leif Lindholm),
- drop configure example change from this patch.
--- INSTALL | 27 +++++++++++++++++---------- configure.ac | 11 +++++++---- 2 files changed, 24 insertions(+), 14 deletions(-)
INSTALL +17 -10
@@ -182,20 +182,23 @@ corresponding platform are not needed for the platform in question. - For host 1. --host= to autoconf name of host. - 2. CC= for gcc able to compile for host - 3. HOST_CFLAGS= for C options for host. - 4. HOST_CPPFLAGS= for C preprocessor options for host. - 5. HOST_LDFLAGS= for linker options for host. - 6. PKG_CONFIG= for pkg-config for host (optional). - 7. Libdevmapper if any must be in standard linker folders (-ldevmapper) (optional). - 8. Libfuse if any must be in standard linker folders (-lfuse) (optional). - 9. Libzfs if any must be in standard linker folders (-lzfs) (optional). - 10. Liblzma if any must be in standard linker folders (-llzma) (optional). + 2. CC= for gcc able to compile for host. + 3. CFLAGS= for C options for host. + 4. HOST_CC= for gcc able to compile for host. + 5. HOST_CFLAGS= for C options for host. + 6. HOST_CPPFLAGS= for C preprocessor options for host. + 7. HOST_LDFLAGS= for linker options for host. + 8. PKG_CONFIG= for pkg-config for host (optional). + 9. Libdevmapper if any must be in standard linker folders (-ldevmapper) (optional). + 10. Libfuse if any must be in standard linker folders (-lfuse) (optional). + 11. Libzfs if any must be in standard linker folders (-lzfs) (optional). + 12. Liblzma if any must be in standard linker folders (-llzma) (optional). + Note: The HOST_* variables override not prefixed variables. - For target 1. --target= to autoconf cpu name of target. 2. --with-platform to choose firmware. - 3. TARGET_CC= for gcc able to compile for target + 3. TARGET_CC= for gcc able to compile for target. 4. TARGET_CFLAGS= for C options for target. 5. TARGET_CPPFLAGS= for C preprocessor options for target. 6. TARGET_CCASFLAGS= for assembler options for target.
@@ -204,6 +207,10 @@ corresponding platform are not needed for the platform in question. 9. TARGET_STRIP= for strip for target. 10. TARGET_NM= for nm for target. 11. TARGET_RANLIB= for ranlib for target. + Note: If the TARGET_* variables are not specified then they will default + to be the same as the host variables. If host variables are not + specified then the TARGET_* variables will default to be the same + as not prefixed variables. - Additionally for emu, for host and target. 1. SDL is looked for in standard linker directories (-lSDL) (optional)
configure.ac +7 -4
@@ -26,10 +26,13 @@ dnl This is necessary because the target type in autoconf does not dnl describe such a system very well. dnl dnl The current strategy is to use variables with no prefix (such as -dnl CC, CFLAGS, etc.) for the host type, variables with prefix "BUILD_" -dnl (such as BUILD_CC, BUILD_CFLAGS, etc.) for the build type and variables -dnl with the prefix "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are -dnl used for the target type. See INSTALL for full list of variables. +dnl CC, CFLAGS, etc.) for the host and target type, variables with +dnl prefix "BUILD_" (such as BUILD_CC, BUILD_CFLAGS, etc.) for the +dnl build type, variables with prefix "HOST_" (such as HOST_CC, +dnl HOST_CFLAGS, etc.) for the host type and variables with the prefix +dnl "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for +dnl the target type. See INSTALL for full list of variables and +dnl description of the relationships between them. AC_INIT([GRUB],[2.05],[[email protected]])
Signature · 1 line
2.11.0
PATCH v3 4/5 INSTALL: Update configure example
In reply to Daniel Kiper..to make it more relevant.
--- INSTALL | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
INSTALL +14 -6
@@ -160,12 +160,20 @@ For this example the configure line might look like (more details below) (some options are optional and included here for completeness but some rarely used options are omitted): -./configure BUILD_CC=gcc BUILD_PKG_CONFIG=pkg-config --host=amd64-linux-gnu -CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" PKG_CONFIG=amd64-linux-gnu-pkg-config ---target=arm --with-platform=uboot TARGET_CC=arm-elf-gcc -TARGET_CFLAGS="-Os -march=armv6" TARGET_CCASFLAGS="-march=armv6" -TARGET_OBJCOPY="arm-elf-objcopy" TARGET_STRIP="arm-elf-strip" -TARGET_NM=arm-elf-nm TARGET_RANLIB=arm-elf-ranlib LEX=gflex + ./configure --host=x86_64-linux-gnu --target=arm-linux-gnueabihf \ + --with-platform=efi BUILD_CC=gcc BUILD_PKG_CONFIG=pkg-config \ + HOST_CC=x86_64-linux-gnu-gcc HOST_CFLAGS='-g -O2' \ + PKG_CONFIG=x86_64-linux-gnu-pkg-config TARGET_CC=arm-linux-gnueabihf-gcc \ + TARGET_CFLAGS='-Os -march=armv8.3-a' TARGET_CCASFLAGS='-march=armv8.3-a' \ + TARGET_OBJCOPY=arm-linux-gnueabihf-objcopy \ + TARGET_STRIP=arm-linux-gnueabihf-strip TARGET_NM=arm-linux-gnueabihf-nm \ + TARGET_RANLIB=arm-linux-gnueabihf-ranlib LEX=flex + +Normally, for building a GRUB on amd64 with tools to run on amd64 to +generate images to run on ARM, using your Linux distribution's +packaged cross compiler, the following would suffice: + + ./configure --target=arm-linux-gnueabihf --with-platform=efi You need to use following options to specify tools and platforms. For minimum version look at prerequisites. All tools not mentioned in this section under
Signature · 1 line
2.11.0
PATCH v3 5/5 autogen: Replace -iname with -ipath in find command
In reply to Daniel Kiper..because -iname cannot be used to match paths.
--- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
autogen.sh +1 -1
@@ -13,7 +13,7 @@ fi export LC_COLLATE=C unset LC_ALL -find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' ! -ipath './gnulib/*' ! -iname './grub-core/lib/gnulib/*' |sort > po/POTFILES.in +find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' ! -ipath './gnulib/*' ! -ipath './grub-core/lib/gnulib/*' |sort > po/POTFILES.in find util -iname '*.in' ! -name Makefile.in |sort > po/POTFILES-shell.in echo "Importing unicode..."
Signature · 1 line
2.11.0
Re: [PATCH v3 5/5] autogen: Replace -iname with -ipath in find command
Quoted 13 lines · Daniel Kiper
..because -iname cannot be used to match paths.
Signed-off-by Daniel Kiper <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>--- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)autogen.sh +0
-0
autogen.sh fi · line 17
Quoted 6 lines
autogen.sh +1
-1@@ -13,7 +13,7 @@ fi export LC_COLLATE=C unset LC_ALL -find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' ! -ipath './gnulib/*' ! -iname './grub-core/lib/gnulib/*' |sort > po/POTFILES.in +find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c' ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' ! -ipath './gnulib/*' ! -ipath './grub-core/lib/gnulib/*' |sort > po/POTFILES.in find util -iname '*.in' ! -name Makefile.in |sort > po/POTFILES-shell.in
Fantastic, that had been bugging me every time I saw it.
Regards,
Daniel
Quoted 10 lines
autogen.sh +0
-0echo "Importing unicode..."Signature · 7 lines
2.11.0 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 3 lines · Daniel Kiper
Hey,
As in subject... Please review...
Hi Daniel,
This looks good to me.
For the series:
Quoted 14 lines
Daniel
INSTALL | 47 +++++++++++++++++++++++++++++++---------------- autogen.sh | 2 +- configure.ac | 19 ++++++++++++++----- 3 files changed, 46 insertions(+), 22 deletions(-)Daniel Kiper (5):
configure: Drop unneededTARGET_CFLAGSexpansion
configure: Set gnu99 C language standard by default INSTALL/configure: Update install doc and configure comment
INSTALL: Update configure example
autogen: Replace -iname with -ipath in find command
Quoted 8 lines · Leif Lindholm
Quoted 3 lines · Daniel Kiper
Hey,
As in subject... Please review...
Hi Daniel,
This looks good to me.
Great!
Quoted 2 lines
For the series:
Reviewed-by Leif Lindholm <[email protected]>
Thanks for review. It looks that patch #2 breaks builds with clang. So, I will do not push it this time. I will wait for a fix.
Daniel