* [PATCH v3 0/2] fsverity-utils Makefile fixes
@ 2020-05-20 21:25 Jes Sorensen
2020-05-20 21:25 ` [PATCH 1/2] Fix Makefile to delete objects from the library on make clean Jes Sorensen
2020-05-20 21:25 ` [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS Jes Sorensen
0 siblings, 2 replies; 9+ messages in thread
From: Jes Sorensen @ 2020-05-20 21:25 UTC (permalink / raw)
To: ebiggers; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
From: Jes Sorensen <jsorensen@fb.com>
Hi,
This addresses the last comments, leaving the CPPFLAGS as override. I
checked that it doesn't break the rpm build as well.
Cheers,
Jes
Jes Sorensen (2):
Fix Makefile to delete objects from the library on make clean
Let package manager override CFLAGS and CPPFLAGS
Makefile | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] Fix Makefile to delete objects from the library on make clean
2020-05-20 21:25 [PATCH v3 0/2] fsverity-utils Makefile fixes Jes Sorensen
@ 2020-05-20 21:25 ` Jes Sorensen
2020-05-20 21:25 ` [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS Jes Sorensen
1 sibling, 0 replies; 9+ messages in thread
From: Jes Sorensen @ 2020-05-20 21:25 UTC (permalink / raw)
To: ebiggers; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
From: Jes Sorensen <jsorensen@fb.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 1a7be53..e7fb5cf 100644
--- a/Makefile
+++ b/Makefile
@@ -180,8 +180,8 @@ help:
done
clean:
- rm -f $(DEFAULT_TARGETS) $(TEST_PROGRAMS) $(LIB_OBJS) $(ALL_PROG_OBJ) \
- .build-config
+ rm -f $(DEFAULT_TARGETS) $(TEST_PROGRAMS) \
+ lib/*.o programs/*.o .build-config
FORCE:
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS
2020-05-20 21:25 [PATCH v3 0/2] fsverity-utils Makefile fixes Jes Sorensen
2020-05-20 21:25 ` [PATCH 1/2] Fix Makefile to delete objects from the library on make clean Jes Sorensen
@ 2020-05-20 21:25 ` Jes Sorensen
1 sibling, 0 replies; 9+ messages in thread
From: Jes Sorensen @ 2020-05-20 21:25 UTC (permalink / raw)
To: ebiggers; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
From: Jes Sorensen <jsorensen@fb.com>
Package managers such as RPM wants to build everything with their
preferred flags, and we shouldn't hard override flags.
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---
Makefile | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index e7fb5cf..18f08c3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,16 +29,12 @@
cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null &>/dev/null; \
then echo $(1); fi)
-#### Common compiler flags. You can add additional flags by defining CFLAGS
-#### and/or CPPFLAGS in the environment or on the 'make' command line.
-
-override CFLAGS := -O2 -Wall -Wundef \
+CFLAGS := -O2 -Wall -Wundef \
$(call cc-option,-Wdeclaration-after-statement) \
$(call cc-option,-Wmissing-prototypes) \
$(call cc-option,-Wstrict-prototypes) \
$(call cc-option,-Wvla) \
- $(call cc-option,-Wimplicit-fallthrough) \
- $(CFLAGS)
+ $(call cc-option,-Wimplicit-fallthrough)
override CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v2 0/2] fsverity-utils Makefile fixes
@ 2020-05-20 20:08 Jes Sorensen
2020-05-20 20:08 ` [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS Jes Sorensen
0 siblings, 1 reply; 9+ messages in thread
From: Jes Sorensen @ 2020-05-20 20:08 UTC (permalink / raw)
To: ebiggers; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
From: Jes Sorensen <jsorensen@fb.com>
Hi
This addresses the comments to the previous version of these Makefile
changes.
Let me know if you have any additional issues with it?
I'd really love to see an official release soon that includes these
changes, which I can point to when submitting the RPM patches. Any
chance of doing 1.1 or something like that?
Cheers,
Jes
Jes Sorensen (2):
Fix Makefile to delete objects from the library on make clean
Let package manager override CFLAGS and CPPFLAGS
Makefile | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS
2020-05-20 20:08 [PATCH v2 0/2] fsverity-utils Makefile fixes Jes Sorensen
@ 2020-05-20 20:08 ` Jes Sorensen
2020-05-20 21:06 ` Eric Biggers
0 siblings, 1 reply; 9+ messages in thread
From: Jes Sorensen @ 2020-05-20 20:08 UTC (permalink / raw)
To: ebiggers; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
From: Jes Sorensen <jsorensen@fb.com>
Package managers such as RPM wants to build everything with their
preferred flags, and we shouldn't hard override flags.
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---
Makefile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index e7fb5cf..7bcd5e4 100644
--- a/Makefile
+++ b/Makefile
@@ -32,15 +32,14 @@ cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null &>/dev/null; \
#### Common compiler flags. You can add additional flags by defining CFLAGS
#### and/or CPPFLAGS in the environment or on the 'make' command line.
-override CFLAGS := -O2 -Wall -Wundef \
+CFLAGS := -O2 -Wall -Wundef \
$(call cc-option,-Wdeclaration-after-statement) \
$(call cc-option,-Wmissing-prototypes) \
$(call cc-option,-Wstrict-prototypes) \
$(call cc-option,-Wvla) \
- $(call cc-option,-Wimplicit-fallthrough) \
- $(CFLAGS)
+ $(call cc-option,-Wimplicit-fallthrough)
-override CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
+CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
#### Other user settings
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS
2020-05-20 20:08 ` [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS Jes Sorensen
@ 2020-05-20 21:06 ` Eric Biggers
2020-05-20 21:20 ` Jes Sorensen
0 siblings, 1 reply; 9+ messages in thread
From: Eric Biggers @ 2020-05-20 21:06 UTC (permalink / raw)
To: Jes Sorensen; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
On Wed, May 20, 2020 at 04:08:11PM -0400, Jes Sorensen wrote:
> From: Jes Sorensen <jsorensen@fb.com>
>
> Package managers such as RPM wants to build everything with their
> preferred flags, and we shouldn't hard override flags.
>
> Signed-off-by: Jes Sorensen <jsorensen@fb.com>
> ---
> Makefile | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index e7fb5cf..7bcd5e4 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -32,15 +32,14 @@ cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null &>/dev/null; \
> #### Common compiler flags. You can add additional flags by defining CFLAGS
> #### and/or CPPFLAGS in the environment or on the 'make' command line.
The above comment is still being made outdated. IMO, just remove it.
>
> -override CFLAGS := -O2 -Wall -Wundef \
> +CFLAGS := -O2 -Wall -Wundef \
> $(call cc-option,-Wdeclaration-after-statement) \
> $(call cc-option,-Wmissing-prototypes) \
> $(call cc-option,-Wstrict-prototypes) \
> $(call cc-option,-Wvla) \
> - $(call cc-option,-Wimplicit-fallthrough) \
> - $(CFLAGS)
> + $(call cc-option,-Wimplicit-fallthrough)
>
> -override CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
> +CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
On the other thread you ageed that CPPFLAGS should be left as-is, but here you
removed 'override'. I think always using -D_FILE_OFFSET_BITS=64 is what we
want, since it avoids incorrect builds on 32-bit platforms. Right?
- Eric
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS
2020-05-20 21:06 ` Eric Biggers
@ 2020-05-20 21:20 ` Jes Sorensen
0 siblings, 0 replies; 9+ messages in thread
From: Jes Sorensen @ 2020-05-20 21:20 UTC (permalink / raw)
To: Eric Biggers; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
On 5/20/20 5:06 PM, Eric Biggers wrote:
> On Wed, May 20, 2020 at 04:08:11PM -0400, Jes Sorensen wrote:
>> From: Jes Sorensen <jsorensen@fb.com>
>>
>> Package managers such as RPM wants to build everything with their
>> preferred flags, and we shouldn't hard override flags.
>>
>> Signed-off-by: Jes Sorensen <jsorensen@fb.com>
>> ---
>> Makefile | 7 +++----
>> 1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index e7fb5cf..7bcd5e4 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -32,15 +32,14 @@ cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null &>/dev/null; \
>> #### Common compiler flags. You can add additional flags by defining CFLAGS
>> #### and/or CPPFLAGS in the environment or on the 'make' command line.
>
> The above comment is still being made outdated. IMO, just remove it.
Good point, I'll send out a v3.
>>
>> -override CFLAGS := -O2 -Wall -Wundef \
>> +CFLAGS := -O2 -Wall -Wundef \
>> $(call cc-option,-Wdeclaration-after-statement) \
>> $(call cc-option,-Wmissing-prototypes) \
>> $(call cc-option,-Wstrict-prototypes) \
>> $(call cc-option,-Wvla) \
>> - $(call cc-option,-Wimplicit-fallthrough) \
>> - $(CFLAGS)
>> + $(call cc-option,-Wimplicit-fallthrough)
>>
>> -override CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
>> +CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
>
> On the other thread you ageed that CPPFLAGS should be left as-is, but here you
> removed 'override'. I think always using -D_FILE_OFFSET_BITS=64 is what we
> want, since it avoids incorrect builds on 32-bit platforms. Right?
That should work I think, I read your response as agreeing with me,
hence leaving the change in place.
Cheers,
Jes
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/2] fsverity-utils Makefile fixes
@ 2020-05-15 20:56 Jes Sorensen
2020-05-15 20:56 ` [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS Jes Sorensen
0 siblings, 1 reply; 9+ messages in thread
From: Jes Sorensen @ 2020-05-15 20:56 UTC (permalink / raw)
To: ebiggers; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
From: Jes Sorensen <jsorensen@fb.com>
Hi,
This set goes on top of the libfsverity changes from Eric.
One deals with the Makefile not cleaning up the library when running
'make clean'.
The second removes the forced override of CFLAGS and CPPFLAGS. This
really shouldn't be forced like it was, since package managers and
builders should be able to specify their preferred flags.
With these applied, I am able to build an rpm of fsverity-utils which
provides fsverity-utils and fsverity-utils-devel.
Should we bump the version to 1.1 or 1.0.1 or something too?
Once this is pushed to the official branch, I'll do an updated package
for Fedora Rawhide and do another pull-request for the RPM code.
Cheers,
Jes
Jes Sorensen (2):
Fix Makefile to delete objects from the library on make clean
Let package manager override CFLAGS and CPPFLAGS
Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS
2020-05-15 20:56 [PATCH 0/2] fsverity-utils Makefile fixes Jes Sorensen
@ 2020-05-15 20:56 ` Jes Sorensen
2020-05-20 2:54 ` Eric Biggers
0 siblings, 1 reply; 9+ messages in thread
From: Jes Sorensen @ 2020-05-15 20:56 UTC (permalink / raw)
To: ebiggers; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
From: Jes Sorensen <jsorensen@fb.com>
Package managers such as RPM wants to build everything with their
preferred flags, and we shouldn't hard override flags.
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index c5f46f4..0c2a621 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null &>/dev/null; \
#### Common compiler flags. You can add additional flags by defining CFLAGS
#### and/or CPPFLAGS in the environment or on the 'make' command line.
-override CFLAGS := -O2 -Wall -Wundef \
+CFLAGS := -O2 -Wall -Wundef \
$(call cc-option,-Wdeclaration-after-statement) \
$(call cc-option,-Wmissing-prototypes) \
$(call cc-option,-Wstrict-prototypes) \
@@ -40,7 +40,7 @@ override CFLAGS := -O2 -Wall -Wundef \
$(call cc-option,-Wimplicit-fallthrough) \
$(CFLAGS)
-override CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
+CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
#### Other user settings
--
2.26.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS
2020-05-15 20:56 ` [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS Jes Sorensen
@ 2020-05-20 2:54 ` Eric Biggers
2020-05-20 20:00 ` Jes Sorensen
0 siblings, 1 reply; 9+ messages in thread
From: Eric Biggers @ 2020-05-20 2:54 UTC (permalink / raw)
To: Jes Sorensen; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
On Fri, May 15, 2020 at 04:56:49PM -0400, Jes Sorensen wrote:
> From: Jes Sorensen <jsorensen@fb.com>
>
> Package managers such as RPM wants to build everything with their
> preferred flags, and we shouldn't hard override flags.
>
> Signed-off-by: Jes Sorensen <jsorensen@fb.com>
> ---
> Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index c5f46f4..0c2a621 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -32,7 +32,7 @@ cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null &>/dev/null; \
> #### Common compiler flags. You can add additional flags by defining CFLAGS
> #### and/or CPPFLAGS in the environment or on the 'make' command line.
The above comment needs to be updated.
>
> -override CFLAGS := -O2 -Wall -Wundef \
> +CFLAGS := -O2 -Wall -Wundef \
> $(call cc-option,-Wdeclaration-after-statement) \
> $(call cc-option,-Wmissing-prototypes) \
> $(call cc-option,-Wstrict-prototypes) \
> @@ -40,7 +40,7 @@ override CFLAGS := -O2 -Wall -Wundef \
> $(call cc-option,-Wimplicit-fallthrough) \
> $(CFLAGS)
The user's $(CFLAGS) is already added at the end, so the -O2 can already be
overridden, e.g. with -O0. Is your concern just that this is bad practice?
Also, did you intentionally leave $(CFLAGS) at the end, rather than remove it as
might be expected?
> -override CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
> +CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
-D_FILE_OFFSET_BITS=64 is required for correctness.
So I think this part is good as-is.
- Eric
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS
2020-05-20 2:54 ` Eric Biggers
@ 2020-05-20 20:00 ` Jes Sorensen
0 siblings, 0 replies; 9+ messages in thread
From: Jes Sorensen @ 2020-05-20 20:00 UTC (permalink / raw)
To: Eric Biggers, Jes Sorensen; +Cc: linux-fscrypt, kernel-team, Jes Sorensen
On 5/19/20 10:54 PM, Eric Biggers wrote:
> On Fri, May 15, 2020 at 04:56:49PM -0400, Jes Sorensen wrote:
>> From: Jes Sorensen <jsorensen@fb.com>
>>
>> Package managers such as RPM wants to build everything with their
>> preferred flags, and we shouldn't hard override flags.
>>
>> Signed-off-by: Jes Sorensen <jsorensen@fb.com>
>> ---
>> Makefile | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index c5f46f4..0c2a621 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -32,7 +32,7 @@ cc-option = $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null &>/dev/null; \
>> #### Common compiler flags. You can add additional flags by defining CFLAGS
>> #### and/or CPPFLAGS in the environment or on the 'make' command line.
>
> The above comment needs to be updated.
I'll fix that
>> -override CFLAGS := -O2 -Wall -Wundef \
>> +CFLAGS := -O2 -Wall -Wundef \
>> $(call cc-option,-Wdeclaration-after-statement) \
>> $(call cc-option,-Wmissing-prototypes) \
>> $(call cc-option,-Wstrict-prototypes) \
>> @@ -40,7 +40,7 @@ override CFLAGS := -O2 -Wall -Wundef \
>> $(call cc-option,-Wimplicit-fallthrough) \
>> $(CFLAGS)
>
> The user's $(CFLAGS) is already added at the end, so the -O2 can already be
> overridden, e.g. with -O0. Is your concern just that this is bad practice?
I do think it's bad practice to hard add them, we should make
recommendations, but not policy. However, more importantly rpm fails the
build. It uses specific CFLAGS to do debug builds, and if the binary
ends up with build flags that do not match, it fails.
> Also, did you intentionally leave $(CFLAGS) at the end, rather than remove it as
> might be expected?
That was an oversight, I'll fix that.
>> -override CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
>> +CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
>
> -D_FILE_OFFSET_BITS=64 is required for correctness.
> So I think this part is good as-is.
Sounds good!
I'll send out an updated patchset shortly.
Cheers,
Jes
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-05-20 21:25 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-20 21:25 [PATCH v3 0/2] fsverity-utils Makefile fixes Jes Sorensen
2020-05-20 21:25 ` [PATCH 1/2] Fix Makefile to delete objects from the library on make clean Jes Sorensen
2020-05-20 21:25 ` [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS Jes Sorensen
-- strict thread matches above, loose matches on Subject: below --
2020-05-20 20:08 [PATCH v2 0/2] fsverity-utils Makefile fixes Jes Sorensen
2020-05-20 20:08 ` [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS Jes Sorensen
2020-05-20 21:06 ` Eric Biggers
2020-05-20 21:20 ` Jes Sorensen
2020-05-15 20:56 [PATCH 0/2] fsverity-utils Makefile fixes Jes Sorensen
2020-05-15 20:56 ` [PATCH 2/2] Let package manager override CFLAGS and CPPFLAGS Jes Sorensen
2020-05-20 2:54 ` Eric Biggers
2020-05-20 20:00 ` Jes Sorensen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).