mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig
@ 2012-03-13 21:32 Remy Bohmer
  2012-03-13 21:32 ` [ptxdist] [PATCH 2/5 v2] [x86_64] Add some support for multilib detection in the toolchain Remy Bohmer
                   ` (4 more replies)
  0 siblings, 5 replies; 10+ messages in thread
From: Remy Bohmer @ 2012-03-13 21:32 UTC (permalink / raw)
  To: ptxdist

The platformconfig can specify some valuable global flags for each
package in the configuration to build, for example:
* CPU optimisations (-march= and friends)
* multilib toolchain selection between x86_64 and ia32 such as used for
 the Sourcery Codebench compiler toolchains as specified here:
 https://sourcery.mentor.com/sgpp/lite/ia32/portal/doc12648/getting-started.pdf
 (chapter 3.2 Library configurations)

Signed-off-by: Remy Bohmer <linux@bohmer.net>
---
 v2: Reworked review comments from Michael Olbrich

 patches/rt-tests-0.73/add-extra-cflags.patch |   32 ++++++++++++++++++++++++++
 patches/rt-tests-0.73/series                 |    1 +
 rules/rt-tests.make                          |    1 +
 3 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100644 patches/rt-tests-0.73/add-extra-cflags.patch

diff --git a/patches/rt-tests-0.73/add-extra-cflags.patch b/patches/rt-tests-0.73/add-extra-cflags.patch
new file mode 100644
index 0000000..fc869c6
--- /dev/null
+++ b/patches/rt-tests-0.73/add-extra-cflags.patch
@@ -0,0 +1,32 @@
+CFLAGS are specified in environment as well
+
+If the environment already has specified CFLAGS we shall
+not overwrite them
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+---
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: rt-tests-0.73/Makefile
+===================================================================
+--- rt-tests-0.73.orig/Makefile
++++ rt-tests-0.73/Makefile
+@@ -6,7 +6,7 @@ sources = cyclictest.c signaltest.c pi_s
+ 
+ TARGETS = $(sources:.c=)
+ 
+-LIBS 	= -lrt -lpthread
++LIBS	= $(LDFLAGS) -lrt -lpthread
+ EXTRA_LIBS ?= -ldl	# for get_cpu
+ DESTDIR	?=
+ prefix  ?= /usr/local
+@@ -14,7 +14,7 @@ bindir  ?= $(prefix)/bin
+ mandir	?= $(prefix)/share/man
+ srcdir	?= $(prefix)/src
+ 
+-CFLAGS = -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
++CFLAGS := $(CPPFLAGS) -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include $(CFLAGS)
+ 
+ PYLIB  := $(shell python -c 'import distutils.sysconfig;  print distutils.sysconfig.get_python_lib()')
+ 
diff --git a/patches/rt-tests-0.73/series b/patches/rt-tests-0.73/series
index 74fbce0..caf1a74 100644
--- a/patches/rt-tests-0.73/series
+++ b/patches/rt-tests-0.73/series
@@ -1 +1,2 @@
 fix_3_0_issue.diff
+add-extra-cflags.patch
diff --git a/rules/rt-tests.make b/rules/rt-tests.make
index 3bc6568..1880beb 100644
--- a/rules/rt-tests.make
+++ b/rules/rt-tests.make
@@ -34,6 +34,7 @@ RT_TESTS_DIR		:= $(BUILDDIR)/$(RT_TESTS)
 
 RT_TESTS_CONF_TOOL	:= NO
 RT_TESTS_MAKE_OPT	:= $(CROSS_ENV_CC) prefix=/usr
+RT_TESTS_MAKE_ENV	:= $(CROSS_ENV_FLAGS)
 RT_TESTS_INSTALL_OPT	:= $(RT_TESTS_MAKE_OPT) install
 
 # ----------------------------------------------------------------------------
-- 
1.7.5.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [ptxdist] [PATCH 2/5 v2] [x86_64] Add some support for multilib detection in the toolchain
  2012-03-13 21:32 [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig Remy Bohmer
@ 2012-03-13 21:32 ` Remy Bohmer
  2012-03-13 21:32 ` [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make Remy Bohmer
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 10+ messages in thread
From: Remy Bohmer @ 2012-03-13 21:32 UTC (permalink / raw)
  To: ptxdist

For Sourcery Codebench toolchains the 'gcc -print-file-name' only returns
the proper sysroot directory when the proper architecture flags are
provided via '-m64 -march=' flags. These flags are provided via the
ptxdist platformconfig PTXCONF_TARGET_EXTRA_CFLAGS setting.
These flags therefore also need to be passed to GCC here.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
---
 v2: Reworked review comments from Michael Olbrich

 scripts/install_copy_toolchain.sh |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/install_copy_toolchain.sh b/scripts/install_copy_toolchain.sh
index 8a67698..726cc61 100755
--- a/scripts/install_copy_toolchain.sh
+++ b/scripts/install_copy_toolchain.sh
@@ -50,12 +50,14 @@ ptxd_abs2rel() {
 # out: $lib_path
 #
 ptxd_get_lib_path() {
-    local lib lib_dir lib_path
+    local lib lib_dir lib_path extra_cflags
 
     lib="${1}"
+    extra_cppflags="$(ptxd_get_ptxconf PTXCONF_TARGET_EXTRA_CPPFLAGS)"
+    extra_cflags="$(ptxd_get_ptxconf PTXCONF_TARGET_EXTRA_CFLAGS)"
 
     # ask the compiler for the lib
-    lib_path="$(${CC} -print-file-name=${lib})"
+    lib_path="$(${CC} ${extra_cppflags} ${extra_cflags} -print-file-name=${lib})"
     if test "${lib_path}" = "${lib}"; then
 	echo "install_copy_toolchain_lib: ${lib} not found" >&2
 	return 1
@@ -77,9 +79,11 @@ ptxd_get_lib_path() {
 #
 ptxd_get_dl() {
     local dl
+    extra_cppflags="$(ptxd_get_ptxconf PTXCONF_TARGET_EXTRA_CPPFLAGS)"
+    extra_cflags="$(ptxd_get_ptxconf PTXCONF_TARGET_EXTRA_CFLAGS)"
 
     dl="$(echo 'int main(void){return 0;}' | \
-    	${CC} -x c -o /dev/null -v - 2>&1 | \
+	${CC} ${extra_cppflags} ${extra_cflags} -x c -o /dev/null -v - 2>&1 | \
 	sed -n -e 's/.* -dynamic-linker \([^ ]*\).*/\1/p')"
 
     echo "${dl##*/}"
-- 
1.7.5.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make
  2012-03-13 21:32 [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig Remy Bohmer
  2012-03-13 21:32 ` [ptxdist] [PATCH 2/5 v2] [x86_64] Add some support for multilib detection in the toolchain Remy Bohmer
@ 2012-03-13 21:32 ` Remy Bohmer
  2012-03-14 10:42   ` Michael Olbrich
  2012-03-13 21:32 ` [ptxdist] [PATCH 4/5 v2] [x86_64, glibc] on multilib do not put all dynamic linkers in /lib Remy Bohmer
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 10+ messages in thread
From: Remy Bohmer @ 2012-03-13 21:32 UTC (permalink / raw)
  To: ptxdist

Busybox make is not properly called in case:
* compiler name tuple does not match target tuple (as used in multilib
 compilers, for example: i686-pc-linux-gnu-gcc can compile for
 x86_64-unknown-linux-gnu targets. To solve this the 'SUBARCH' need to be
 set)
* CONFIG_EXTRA_CFLAGS need to e set to select the proper sysroot to
 compile against in busybox
* LDFLAGS to link against the proper sysroot.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
---
 v2: Reworked review comments from Michael Olbrich

 rules/busybox.make |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/rules/busybox.make b/rules/busybox.make
index 536aa80..45fd20f 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -48,15 +48,18 @@ $(STATEDIR)/busybox.prepare:
 	@$(call touch)
 
 BUSYBOX_MAKE_OPT := \
-	ARCH=$(PTXCONF_ARCH_STRING) \
-	CROSS_COMPILE=$(COMPILER_PREFIX) \
-	CONFIG_EXTRA_CFLAGS="$(CROSS_CFLAGS)" \
-	HOSTCC=$(HOSTCC) \
-	SKIP_STRIP=y
-
-ifdef PTXCONF_BUSYBOX_RFKILL
-BUSYBOX_MAKE_OPT += CFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR)"
-endif
+       ARCH=$(PTXCONF_ARCH_STRING) \
+       SUBARCH=$(PTXCONF_ARCH_STRING) \
+       CROSS_COMPILE=$(COMPILER_PREFIX) \
+       HOSTCC=$(HOSTCC)
+
+BUSYBOX_MAKE_ENV := \
+       $(CROSS_ENV) \
+       CFLAGS="$(CROSS_CFLAGS) -I$(KERNEL_HEADERS_INCLUDE_DIR)"
+       SKIP_STRIP=y
+
+BUSYBOX_INSTAL_ENV := \
+       $(BUSYBOX_MAKE_ENV)
 
 BUSYBOX_INSTALL_OPT := \
 	$(BUSYBOX_MAKE_OPT) \
-- 
1.7.5.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [ptxdist] [PATCH 4/5 v2] [x86_64, glibc] on multilib do not put all dynamic linkers in /lib
  2012-03-13 21:32 [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig Remy Bohmer
  2012-03-13 21:32 ` [ptxdist] [PATCH 2/5 v2] [x86_64] Add some support for multilib detection in the toolchain Remy Bohmer
  2012-03-13 21:32 ` [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make Remy Bohmer
@ 2012-03-13 21:32 ` Remy Bohmer
  2012-03-13 21:32 ` [ptxdist] [PATCH 5/5 v2] [x86_64, glibc] Link /usr/lib/libdl.so is not needed and wrong on x86_64 Remy Bohmer
  2012-03-15 10:31 ` [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig Michael Olbrich
  4 siblings, 0 replies; 10+ messages in thread
From: Remy Bohmer @ 2012-03-13 21:32 UTC (permalink / raw)
  To: ptxdist

It is assumed by the makefiles that all dynamic linkers must be put in
/lib. This is however not true. Especially on multilib configurations this
information cannot be guessed. By looking in the sysroot of the compiler
toolchain the right paths can be found. Default the scripts already look
there, so remove the unneeded options.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
---
 v2: repost to keep the series together

 rules/glibc.make        |    2 +-
 rules/post/install.make |    9 +++------
 rules/uclibc.make       |    2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/rules/glibc.make b/rules/glibc.make
index c4e6724..3ddf249 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -36,7 +36,7 @@ $(STATEDIR)/glibc.targetinstall:
 	@$(call install_fixup, glibc,DESCRIPTION,missing)
 
 ifdef PTXCONF_GLIBC_LD
-	@$(call install_copy_toolchain_dl, glibc, /lib)
+	@$(call install_copy_toolchain_dl, glibc)
 endif
 
 ifdef PTXCONF_GLIBC_C
diff --git a/rules/post/install.make b/rules/post/install.make
index 4ad7f87..190ec28 100644
--- a/rules/post/install.make
+++ b/rules/post/install.make
@@ -317,17 +317,14 @@ install_copy_toolchain_lib =									\
 # install_copy_toolchain_dl
 #
 # $1: xpkg label
-# $2: destination
-# $3: strip (y|n)	default is to strip
+# $2: strip (y|n)	default is to strip
 #
 install_copy_toolchain_dl =									\
 	XPKG=$(subst _,-,$(strip $(1)));							\
-	DST="$(strip $2)";									\
-	STRIP="$(strip $3)";									\
-	test "$${DST}" != "" && DST="-d $${DST}";						\
+	STRIP="$(strip $2)";									\
 	$(call install_check, install_copy_toolchain_dl);					\
 	${CROSS_ENV_CC} $(CROSS_ENV_STRIP) PKGDIR="$(PKGDIR)"					\
-		$(SCRIPTSDIR)/install_copy_toolchain.sh -p "$${XPKG}" -l LINKER $${DST} -s "$${STRIP}"
+		$(SCRIPTSDIR)/install_copy_toolchain.sh -p "$${XPKG}" -l LINKER -s "$${STRIP}"
 
 #
 # install_copy_toolchain_other
diff --git a/rules/uclibc.make b/rules/uclibc.make
index 22583fd..c6cc86f 100644
--- a/rules/uclibc.make
+++ b/rules/uclibc.make
@@ -30,7 +30,7 @@ $(STATEDIR)/uclibc.targetinstall:
 	@$(call install_fixup, uclibc,DESCRIPTION,missing)
 
 ifdef PTXCONF_UCLIBC
-	@$(call install_copy_toolchain_dl, uclibc, /lib)
+	@$(call install_copy_toolchain_dl, uclibc)
 endif
 
 ifdef PTXCONF_UCLIBC_C
-- 
1.7.5.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [ptxdist] [PATCH 5/5 v2] [x86_64, glibc] Link /usr/lib/libdl.so is not needed and wrong on x86_64
  2012-03-13 21:32 [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig Remy Bohmer
                   ` (2 preceding siblings ...)
  2012-03-13 21:32 ` [ptxdist] [PATCH 4/5 v2] [x86_64, glibc] on multilib do not put all dynamic linkers in /lib Remy Bohmer
@ 2012-03-13 21:32 ` Remy Bohmer
  2012-03-15 10:31 ` [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig Michael Olbrich
  4 siblings, 0 replies; 10+ messages in thread
From: Remy Bohmer @ 2012-03-13 21:32 UTC (permalink / raw)
  To: ptxdist

This link is always being generated and it is assumed that it must
always point to /lib/libdl.so.2.
But this script is not needed and points to the wrong location when a
multilib toolchain is being used where the dynamic linker must be in
/lib64

Signed-off-by: Remy Bohmer <linux@bohmer.net>
---
 v2: Repost to keep the series together

 rules/glibc.make |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/rules/glibc.make b/rules/glibc.make
index 3ddf249..2de7a13 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -57,7 +57,6 @@ endif
 
 ifdef PTXCONF_GLIBC_DL
 	@$(call install_copy_toolchain_lib, glibc, libdl.so.2)
-	@$(call install_link, glibc, ../../lib/libdl.so.2, /usr/lib/libdl.so)
 endif
 
 ifdef PTXCONF_GLIBC_CRYPT
-- 
1.7.5.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make
  2012-03-13 21:32 ` [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make Remy Bohmer
@ 2012-03-14 10:42   ` Michael Olbrich
  2012-03-14 10:45     ` Michael Olbrich
  0 siblings, 1 reply; 10+ messages in thread
From: Michael Olbrich @ 2012-03-14 10:42 UTC (permalink / raw)
  To: ptxdist

On Tue, Mar 13, 2012 at 10:32:16PM +0100, Remy Bohmer wrote:
> Busybox make is not properly called in case:
> * compiler name tuple does not match target tuple (as used in multilib
>  compilers, for example: i686-pc-linux-gnu-gcc can compile for
>  x86_64-unknown-linux-gnu targets. To solve this the 'SUBARCH' need to be
>  set)
> * CONFIG_EXTRA_CFLAGS need to e set to select the proper sysroot to
>  compile against in busybox
> * LDFLAGS to link against the proper sysroot.
> 
> Signed-off-by: Remy Bohmer <linux@bohmer.net>
> ---
>  v2: Reworked review comments from Michael Olbrich
> 
>  rules/busybox.make |   21 ++++++++++++---------
>  1 files changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/rules/busybox.make b/rules/busybox.make
> index 536aa80..45fd20f 100644
> --- a/rules/busybox.make
> +++ b/rules/busybox.make
> @@ -48,15 +48,18 @@ $(STATEDIR)/busybox.prepare:
>  	@$(call touch)
>  
>  BUSYBOX_MAKE_OPT := \
> -	ARCH=$(PTXCONF_ARCH_STRING) \
> -	CROSS_COMPILE=$(COMPILER_PREFIX) \
> -	CONFIG_EXTRA_CFLAGS="$(CROSS_CFLAGS)" \
> -	HOSTCC=$(HOSTCC) \
> -	SKIP_STRIP=y
> -
> -ifdef PTXCONF_BUSYBOX_RFKILL
> -BUSYBOX_MAKE_OPT += CFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR)"
> -endif
> +       ARCH=$(PTXCONF_ARCH_STRING) \
> +       SUBARCH=$(PTXCONF_ARCH_STRING) \
> +       CROSS_COMPILE=$(COMPILER_PREFIX) \
> +       HOSTCC=$(HOSTCC)

Indent with on <tab> everywhere.

> +
> +BUSYBOX_MAKE_ENV := \
> +       $(CROSS_ENV) \
> +       CFLAGS="$(CROSS_CFLAGS) -I$(KERNEL_HEADERS_INCLUDE_DIR)"
> +       SKIP_STRIP=y

Looks like SKIP_STRIP=y must be in BUSYBOX_MAKE_OPT, or it's not used.

> +
> +BUSYBOX_INSTAL_ENV := \

install with 2 'L'

Michael

> +       $(BUSYBOX_MAKE_ENV)
>  
>  BUSYBOX_INSTALL_OPT := \
>  	$(BUSYBOX_MAKE_OPT) \
> -- 
> 1.7.5.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make
  2012-03-14 10:42   ` Michael Olbrich
@ 2012-03-14 10:45     ` Michael Olbrich
  2012-03-14 11:38       ` Remy Bohmer
  0 siblings, 1 reply; 10+ messages in thread
From: Michael Olbrich @ 2012-03-14 10:45 UTC (permalink / raw)
  To: ptxdist

On Wed, Mar 14, 2012 at 11:42:51AM +0100, Michael Olbrich wrote:
> On Tue, Mar 13, 2012 at 10:32:16PM +0100, Remy Bohmer wrote:
> > Busybox make is not properly called in case:
> > * compiler name tuple does not match target tuple (as used in multilib
> >  compilers, for example: i686-pc-linux-gnu-gcc can compile for
> >  x86_64-unknown-linux-gnu targets. To solve this the 'SUBARCH' need to be
> >  set)
> > * CONFIG_EXTRA_CFLAGS need to e set to select the proper sysroot to
> >  compile against in busybox
> > * LDFLAGS to link against the proper sysroot.
> > 
> > Signed-off-by: Remy Bohmer <linux@bohmer.net>
> > ---
> >  v2: Reworked review comments from Michael Olbrich
> > 
> >  rules/busybox.make |   21 ++++++++++++---------
> >  1 files changed, 12 insertions(+), 9 deletions(-)
> > 
> > diff --git a/rules/busybox.make b/rules/busybox.make
> > index 536aa80..45fd20f 100644
> > --- a/rules/busybox.make
> > +++ b/rules/busybox.make
> > @@ -48,15 +48,18 @@ $(STATEDIR)/busybox.prepare:
> >  	@$(call touch)
> >  
> >  BUSYBOX_MAKE_OPT := \
> > -	ARCH=$(PTXCONF_ARCH_STRING) \
> > -	CROSS_COMPILE=$(COMPILER_PREFIX) \
> > -	CONFIG_EXTRA_CFLAGS="$(CROSS_CFLAGS)" \
> > -	HOSTCC=$(HOSTCC) \
> > -	SKIP_STRIP=y
> > -
> > -ifdef PTXCONF_BUSYBOX_RFKILL
> > -BUSYBOX_MAKE_OPT += CFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR)"
> > -endif
> > +       ARCH=$(PTXCONF_ARCH_STRING) \
> > +       SUBARCH=$(PTXCONF_ARCH_STRING) \
> > +       CROSS_COMPILE=$(COMPILER_PREFIX) \
> > +       HOSTCC=$(HOSTCC)
> 
> Indent with on <tab> everywhere.
> 
> > +
> > +BUSYBOX_MAKE_ENV := \
> > +       $(CROSS_ENV) \
> > +       CFLAGS="$(CROSS_CFLAGS) -I$(KERNEL_HEADERS_INCLUDE_DIR)"
> > +       SKIP_STRIP=y
> 
> Looks like SKIP_STRIP=y must be in BUSYBOX_MAKE_OPT, or it's not used.

No wait, you're just missing '\' at the end of the previous line.

Michael

> > +
> > +BUSYBOX_INSTAL_ENV := \
> 
> install with 2 'L'
> 
> Michael
> 
> > +       $(BUSYBOX_MAKE_ENV)
> >  
> >  BUSYBOX_INSTALL_OPT := \
> >  	$(BUSYBOX_MAKE_OPT) \
> > -- 
> > 1.7.5.4

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make
  2012-03-14 10:45     ` Michael Olbrich
@ 2012-03-14 11:38       ` Remy Bohmer
  0 siblings, 0 replies; 10+ messages in thread
From: Remy Bohmer @ 2012-03-14 11:38 UTC (permalink / raw)
  To: ptxdist

Hi,

2012/3/14 Michael Olbrich <m.olbrich@pengutronix.de>:
>>
>> Indent with on <tab> everywhere.

OK

>> > +
>> > +BUSYBOX_MAKE_ENV := \
>> > +       $(CROSS_ENV) \
>> > +       CFLAGS="$(CROSS_CFLAGS) -I$(KERNEL_HEADERS_INCLUDE_DIR)"
>> > +       SKIP_STRIP=y
>>
>> Looks like SKIP_STRIP=y must be in BUSYBOX_MAKE_OPT, or it's not used.
>
> No wait, you're just missing '\' at the end of the previous line.

Fun :-)
I just copied your proposal and tested if it did what it needed to do...

I will fix it and repost a new patch version.

Thanks.

Kind regards,

Remy

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig
  2012-03-13 21:32 [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig Remy Bohmer
                   ` (3 preceding siblings ...)
  2012-03-13 21:32 ` [ptxdist] [PATCH 5/5 v2] [x86_64, glibc] Link /usr/lib/libdl.so is not needed and wrong on x86_64 Remy Bohmer
@ 2012-03-15 10:31 ` Michael Olbrich
  2012-03-15 11:52   ` Remy Bohmer
  4 siblings, 1 reply; 10+ messages in thread
From: Michael Olbrich @ 2012-03-15 10:31 UTC (permalink / raw)
  To: ptxdist

On Tue, Mar 13, 2012 at 10:32:14PM +0100, Remy Bohmer wrote:
> The platformconfig can specify some valuable global flags for each
> package in the configuration to build, for example:
> * CPU optimisations (-march= and friends)
> * multilib toolchain selection between x86_64 and ia32 such as used for
>  the Sourcery Codebench compiler toolchains as specified here:
>  https://sourcery.mentor.com/sgpp/lite/ia32/portal/doc12648/getting-started.pdf
>  (chapter 3.2 Library configurations)
> 
> Signed-off-by: Remy Bohmer <linux@bohmer.net>
> ---
>  v2: Reworked review comments from Michael Olbrich

I think the whole series is now applied. Please verify that I didn't miss
anything.

Michael

>  patches/rt-tests-0.73/add-extra-cflags.patch |   32 ++++++++++++++++++++++++++
>  patches/rt-tests-0.73/series                 |    1 +
>  rules/rt-tests.make                          |    1 +
>  3 files changed, 34 insertions(+), 0 deletions(-)
>  create mode 100644 patches/rt-tests-0.73/add-extra-cflags.patch
> 
> diff --git a/patches/rt-tests-0.73/add-extra-cflags.patch b/patches/rt-tests-0.73/add-extra-cflags.patch
> new file mode 100644
> index 0000000..fc869c6
> --- /dev/null
> +++ b/patches/rt-tests-0.73/add-extra-cflags.patch
> @@ -0,0 +1,32 @@
> +CFLAGS are specified in environment as well
> +
> +If the environment already has specified CFLAGS we shall
> +not overwrite them
> +
> +Signed-off-by: Remy Bohmer <linux@bohmer.net>
> +---
> + Makefile |    4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +Index: rt-tests-0.73/Makefile
> +===================================================================
> +--- rt-tests-0.73.orig/Makefile
> ++++ rt-tests-0.73/Makefile
> +@@ -6,7 +6,7 @@ sources = cyclictest.c signaltest.c pi_s
> + 
> + TARGETS = $(sources:.c=)
> + 
> +-LIBS 	= -lrt -lpthread
> ++LIBS	= $(LDFLAGS) -lrt -lpthread
> + EXTRA_LIBS ?= -ldl	# for get_cpu
> + DESTDIR	?=
> + prefix  ?= /usr/local
> +@@ -14,7 +14,7 @@ bindir  ?= $(prefix)/bin
> + mandir	?= $(prefix)/share/man
> + srcdir	?= $(prefix)/src
> + 
> +-CFLAGS = -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
> ++CFLAGS := $(CPPFLAGS) -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include $(CFLAGS)
> + 
> + PYLIB  := $(shell python -c 'import distutils.sysconfig;  print distutils.sysconfig.get_python_lib()')
> + 
> diff --git a/patches/rt-tests-0.73/series b/patches/rt-tests-0.73/series
> index 74fbce0..caf1a74 100644
> --- a/patches/rt-tests-0.73/series
> +++ b/patches/rt-tests-0.73/series
> @@ -1 +1,2 @@
>  fix_3_0_issue.diff
> +add-extra-cflags.patch
> diff --git a/rules/rt-tests.make b/rules/rt-tests.make
> index 3bc6568..1880beb 100644
> --- a/rules/rt-tests.make
> +++ b/rules/rt-tests.make
> @@ -34,6 +34,7 @@ RT_TESTS_DIR		:= $(BUILDDIR)/$(RT_TESTS)
>  
>  RT_TESTS_CONF_TOOL	:= NO
>  RT_TESTS_MAKE_OPT	:= $(CROSS_ENV_CC) prefix=/usr
> +RT_TESTS_MAKE_ENV	:= $(CROSS_ENV_FLAGS)
>  RT_TESTS_INSTALL_OPT	:= $(RT_TESTS_MAKE_OPT) install
>  
>  # ----------------------------------------------------------------------------
> -- 
> 1.7.5.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig
  2012-03-15 10:31 ` [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig Michael Olbrich
@ 2012-03-15 11:52   ` Remy Bohmer
  0 siblings, 0 replies; 10+ messages in thread
From: Remy Bohmer @ 2012-03-15 11:52 UTC (permalink / raw)
  To: ptxdist

Hi,

2012/3/15 Michael Olbrich <m.olbrich@pengutronix.de>:
> On Tue, Mar 13, 2012 at 10:32:14PM +0100, Remy Bohmer wrote:
>> The platformconfig can specify some valuable global flags for each
>> package in the configuration to build, for example:
>> * CPU optimisations (-march= and friends)
>> * multilib toolchain selection between x86_64 and ia32 such as used for
>>  the Sourcery Codebench compiler toolchains as specified here:
>>  https://sourcery.mentor.com/sgpp/lite/ia32/portal/doc12648/getting-started.pdf
>>  (chapter 3.2 Library configurations)
>>
>> Signed-off-by: Remy Bohmer <linux@bohmer.net>
>> ---
>>  v2: Reworked review comments from Michael Olbrich
>
> I think the whole series is now applied. Please verify that I didn't miss
> anything.

I have seen the entire series in the git tree already.
Looks good. Thanks.

Kind regards,

Remy

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2012-03-15 11:52 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-13 21:32 [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig Remy Bohmer
2012-03-13 21:32 ` [ptxdist] [PATCH 2/5 v2] [x86_64] Add some support for multilib detection in the toolchain Remy Bohmer
2012-03-13 21:32 ` [ptxdist] [PATCH 3/5 v2] [busybox] Pass extra platform CFLAGS to busybox make Remy Bohmer
2012-03-14 10:42   ` Michael Olbrich
2012-03-14 10:45     ` Michael Olbrich
2012-03-14 11:38       ` Remy Bohmer
2012-03-13 21:32 ` [ptxdist] [PATCH 4/5 v2] [x86_64, glibc] on multilib do not put all dynamic linkers in /lib Remy Bohmer
2012-03-13 21:32 ` [ptxdist] [PATCH 5/5 v2] [x86_64, glibc] Link /usr/lib/libdl.so is not needed and wrong on x86_64 Remy Bohmer
2012-03-15 10:31 ` [ptxdist] [PATCH 1/5 v2] [rt-tests] Use CFLAGS specified by ptxdist platformconfig Michael Olbrich
2012-03-15 11:52   ` Remy Bohmer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox