| Message ID | ecddb51d-7666-b18b-f295-58fc0397b4c7@suse.cz (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | christophe varoqui |
| Headers | show |
| Series | [V2] Fix possibility to redefine -D_FORTIFY_SOURCE macro. | expand |
On 4/12/22 22:24, Martin Wilck wrote: > On Tue, 2022-04-12 at 13:19 +0200, Martin Liška wrote: >> As explained here: >> https://github.com/opensvc/multipath-tools/issues/29 >> >> using -Wp,-D_FORTIFY_SOURCE cannot be redefined with >> -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3. >> >> Signed-off-by: Martin Liska <mliska@suse.cz> > > Reviewed-by: Martin Wilck <mwilck@suse.com> > > Hi. May I please ping this? Thanks, Martin -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
Hi Martin L, On Thu, 2022-04-28 at 08:54 +0200, Martin Liška wrote: > On 4/12/22 22:24, Martin Wilck wrote: > > On Tue, 2022-04-12 at 13:19 +0200, Martin Liška wrote: > > > As explained here: > > > https://github.com/opensvc/multipath-tools/issues/29 > > > > > > using -Wp,-D_FORTIFY_SOURCE cannot be redefined with > > > -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3. > > > > > > Signed-off-by: Martin Liska <mliska@suse.cz> > > > > Reviewed-by: Martin Wilck <mwilck@suse.com> > > > > > > Hi. > > May I please ping this? > I told you this is in the "queue" branch in openSUSE/multipath-tools, which means it's going to be merged in the next official release. The main repository at opensvc [2] is only updated in batches, when a new "release" is made. We haven't decided on the timing for the next batch. There isn't much blocking it, so it should be possible to do it relatively soon, as time allows. Maybe next week (no promises). In the meantime, use my "queue" branch, which represents the "rolling release" of multipath tools and will most probably just be merged into the main repo as-is, or simply apply your patch before building. [1] https://github.com/openSUSE/multipath-tools/tree/queue [2] https://github.com/opensvc/multipath-tools Regards, Martin -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
On 4/28/22 10:07, Martin Wilck wrote: > Hi Martin L, > > On Thu, 2022-04-28 at 08:54 +0200, Martin Liška wrote: >> On 4/12/22 22:24, Martin Wilck wrote: >>> On Tue, 2022-04-12 at 13:19 +0200, Martin Liška wrote: >>>> As explained here: >>>> https://github.com/opensvc/multipath-tools/issues/29 >>>> >>>> using -Wp,-D_FORTIFY_SOURCE cannot be redefined with >>>> -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3. >>>> >>>> Signed-off-by: Martin Liska <mliska@suse.cz> >>> >>> Reviewed-by: Martin Wilck <mwilck@suse.com> >>> >>> >> >> Hi. >> >> May I please ping this? >> > > I told you this is in the "queue" branch in openSUSE/multipath-tools, > which means it's going to be merged in the next official release. The > main repository at opensvc [2] is only updated in batches, when a new Hi. Oh, sorry, I must have forget about it ;) Anyway, the timing is fine to me! Cheers, Martin > "release" is made. We haven't decided on the timing for the next batch. > There isn't much blocking it, so it should be possible to do it > relatively soon, as time allows. Maybe next week (no promises). > > In the meantime, use my "queue" branch, which represents the "rolling > release" of multipath tools and will most probably just be merged into > the main repo as-is, or simply apply your patch before building. > > > [1] https://github.com/openSUSE/multipath-tools/tree/queue > [2] https://github.com/opensvc/multipath-tools > > Regards, > Martin > -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
diff --git a/Makefile.inc b/Makefile.inc index d24da43e..cc170a2e 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -123,7 +123,7 @@ OPTFLAGS := -O2 -g $(STACKPROT) --param=ssp-buffer-size=4 WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ -Werror=implicit-function-declaration -Werror=format-security \ $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) -CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 +CPPFLAGS := -D_FORTIFY_SOURCE=2 CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ -MMD -MP
As explained here: https://github.com/opensvc/multipath-tools/issues/29 using -Wp,-D_FORTIFY_SOURCE cannot be redefined with -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3. Signed-off-by: Martin Liska <mliska@suse.cz> --- Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)