diff options
| author |   Mingli Yu <Mingli.Yu@windriver.com> | 2017-02-06 11:41:00 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-13 18:43:30 +0100 |
| commit | 3527257c137d12fd10d7e56270d97834de75bb08 (patch) | |
| tree | 5814d5bd1386df538bd39ffacae955afeca89441 /meta-oe/recipes-support/libatasmart | |
| parent | 2ede2eb6e73ef2118f138b75663e61689b57de3e (diff) | |
| download | meta-openembedded-contrib-3527257c137d12fd10d7e56270d97834de75bb08.tar.gz | |
libatasmart: unify the complier and CFLAGS for host build
* When build libatasmart, we need first build strpool in host
env. To build strpool, the compiler is host compiler, but
the CFLAGS and LDFLAGS are for cross-compiler, so unify them
to fix below error.
| make -C strpool strpool
| make[1]: Entering directory '../libatasmart/0.19-r0/build/strpool'
| gcc -DHAVE_CONFIG_H -I. -I../../git/strpool -I.. -isystem../build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -O2 -pipe -g -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -c -o strpool.o `test -f '../strpool.c' || echo '../../git/strpool/'`../strpool.c
| gcc: error: unrecognized command line option ‘-fstack-protector-strong’
| make[1]: *** [Makefile:404: strpool.o] Error 1
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/libatasmart')
| -rw-r--r-- | meta-oe/recipes-support/libatasmart/files/0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch | 41 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb | 4 |
2 files changed, 44 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/libatasmart/files/0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch b/meta-oe/recipes-support/libatasmart/files/0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch new file mode 100644 index 0000000000..8c867accaa --- /dev/null +++ b/meta-oe/recipes-support/libatasmart/files/0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch @@ -0,0 +1,41 @@ +From 75c1d3b8667328d874590a5321eb244256b7d932 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <Mingli.Yu@windriver.com> +Date: Wed, 18 Jan 2017 07:35:58 +0000 +Subject: [PATCH] Makefile.am: add CFLAGS and LDFLAGS definiton +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* When build libatasmart, we need first build strpool in host + env. To build strpool, the compiler is host compiler, but + the CFLAGS and LDFLAGS are for cross-compiler, so unify them + to fix below error. + | make -C strpool strpool + | make[1]: Entering directory '../libatasmart/0.19-r0/build/strpool' + | gcc -DHAVE_CONFIG_H -I. -I../../git/strpool -I.. -isystem../build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -O2 -pipe -g -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -c -o strpool.o `test -f '../strpool.c' || echo '../../git/strpool/'`../strpool.c + | gcc: error: unrecognized command line option ‘-fstack-protector-strong’ + | make[1]: *** [Makefile:404: strpool.o] Error 1 + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + strpool/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/strpool/Makefile.am b/strpool/Makefile.am +index b041cea..013fcd3 100644 +--- a/strpool/Makefile.am ++++ b/strpool/Makefile.am +@@ -17,6 +17,8 @@ + # <http://www.gnu.org/licenses/>. + + CC = @CC_FOR_BUILD@ ++CFLAGS = @BUILD_CFLAGS@ ++LDFLAGS = @BUILD_LDFLAGS@ + AM_CFLAGS = @BUILD_CFLAGS@ + AM_LDFLAGS = @BUILD_LDFLAGS@ + +-- +2.11.0 + diff --git a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb index 16657b4b13..4cfb732932 100644 --- a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "udev" SRCREV = "de6258940960443038b4c1651dfda3620075e870" -SRC_URI = "git://git.0pointer.de/libatasmart.git" +SRC_URI = "git://git.0pointer.de/libatasmart.git \ + file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \ +" S = "${WORKDIR}/git" |