* [PATCH 1/2] fix handling of CPPFLAGS
@ 2012-08-12 19:24 Mike Frysinger
2012-08-12 19:24 ` [PATCH 2/2] mdassemble: split dietlibc logic into dedicated target Mike Frysinger
2012-08-12 22:13 ` [PATCH 1/2] fix handling of CPPFLAGS NeilBrown
0 siblings, 2 replies; 4+ messages in thread
From: Mike Frysinger @ 2012-08-12 19:24 UTC (permalink / raw)
To: NeilBrown; +Cc: linux-raid
The current Makefile ends up ignoring the system CPPFLAGS settings,
so make sure we append the variable. Also, the old metadata logic
has a typo with the flag name.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
Makefile | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 315455b..704b374 100644
--- a/Makefile
+++ b/Makefile
@@ -48,12 +48,10 @@ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
endif
ifdef DEBIAN
-CPPFLAGS := -DDEBIAN
-else
-CPPFLAGS :=
+CPPFLAGS += -DDEBIAN
endif
ifdef DEFAULT_OLD_METADATA
- CPPFLAG += -DDEFAULT_OLD_METADATA
+ CPPFLAGS += -DDEFAULT_OLD_METADATA
DEFAULT_METADATA=0.90
else
DEFAULT_METADATA=1.2
--
1.7.9.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] mdassemble: split dietlibc logic into dedicated target
2012-08-12 19:24 [PATCH 1/2] fix handling of CPPFLAGS Mike Frysinger
@ 2012-08-12 19:24 ` Mike Frysinger
2012-08-12 22:13 ` NeilBrown
2012-08-12 22:13 ` [PATCH 1/2] fix handling of CPPFLAGS NeilBrown
1 sibling, 1 reply; 4+ messages in thread
From: Mike Frysinger @ 2012-08-12 19:24 UTC (permalink / raw)
To: NeilBrown; +Cc: linux-raid
This lets people run `make mdassemble` and get a sane build by default.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
.gitignore | 1 +
Makefile | 3 +++
2 files changed, 4 insertions(+)
diff --git a/.gitignore b/.gitignore
index 7200741..fcbe069 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
/mdadm
/mdadm.8
/mdadm.udeb
+/mdassemble
/mdmon
/swap_super
/test_stripe
diff --git a/Makefile b/Makefile
index 704b374..72f609e 100644
--- a/Makefile
+++ b/Makefile
@@ -180,6 +180,9 @@ raid6check : raid6check.o mdadm.h $(CHECK_OBJS)
$(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS)
mdassemble : $(ASSEMBLE_SRCS) $(INCL)
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC)
+
+mdassemble.diet : $(ASSEMBLE_SRCS) $(INCL)
rm -f $(OBJS)
$(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC)
--
1.7.9.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] mdassemble: split dietlibc logic into dedicated target
2012-08-12 19:24 ` [PATCH 2/2] mdassemble: split dietlibc logic into dedicated target Mike Frysinger
@ 2012-08-12 22:13 ` NeilBrown
0 siblings, 0 replies; 4+ messages in thread
From: NeilBrown @ 2012-08-12 22:13 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-raid
[-- Attachment #1: Type: text/plain, Size: 1135 bytes --]
On Sun, 12 Aug 2012 15:24:16 -0400 Mike Frysinger <vapier@gentoo.org> wrote:
> This lets people run `make mdassemble` and get a sane build by default.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> .gitignore | 1 +
> Makefile | 3 +++
> 2 files changed, 4 insertions(+)
>
> diff --git a/.gitignore b/.gitignore
> index 7200741..fcbe069 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -4,6 +4,7 @@
> /mdadm
> /mdadm.8
> /mdadm.udeb
> +/mdassemble
> /mdmon
> /swap_super
> /test_stripe
> diff --git a/Makefile b/Makefile
> index 704b374..72f609e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -180,6 +180,9 @@ raid6check : raid6check.o mdadm.h $(CHECK_OBJS)
> $(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS)
>
> mdassemble : $(ASSEMBLE_SRCS) $(INCL)
> + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC)
> +
> +mdassemble.diet : $(ASSEMBLE_SRCS) $(INCL)
> rm -f $(OBJS)
> $(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC)
>
Applied, thanks.
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] fix handling of CPPFLAGS
2012-08-12 19:24 [PATCH 1/2] fix handling of CPPFLAGS Mike Frysinger
2012-08-12 19:24 ` [PATCH 2/2] mdassemble: split dietlibc logic into dedicated target Mike Frysinger
@ 2012-08-12 22:13 ` NeilBrown
1 sibling, 0 replies; 4+ messages in thread
From: NeilBrown @ 2012-08-12 22:13 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-raid
[-- Attachment #1: Type: text/plain, Size: 891 bytes --]
On Sun, 12 Aug 2012 15:24:15 -0400 Mike Frysinger <vapier@gentoo.org> wrote:
> The current Makefile ends up ignoring the system CPPFLAGS settings,
> so make sure we append the variable. Also, the old metadata logic
> has a typo with the flag name.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> Makefile | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 315455b..704b374 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -48,12 +48,10 @@ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
> endif
>
> ifdef DEBIAN
> -CPPFLAGS := -DDEBIAN
> -else
> -CPPFLAGS :=
> +CPPFLAGS += -DDEBIAN
> endif
> ifdef DEFAULT_OLD_METADATA
> - CPPFLAG += -DDEFAULT_OLD_METADATA
> + CPPFLAGS += -DDEFAULT_OLD_METADATA
> DEFAULT_METADATA=0.90
> else
> DEFAULT_METADATA=1.2
Applied,
thanks,
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-12 22:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-12 19:24 [PATCH 1/2] fix handling of CPPFLAGS Mike Frysinger
2012-08-12 19:24 ` [PATCH 2/2] mdassemble: split dietlibc logic into dedicated target Mike Frysinger
2012-08-12 22:13 ` NeilBrown
2012-08-12 22:13 ` [PATCH 1/2] fix handling of CPPFLAGS NeilBrown
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).