Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-arm: fix build errors in nvram and ubootenv 

Yocto 1.8 is more strict in the syntax when you append more flags to the
CFLAGS variable, because with previous yocto versions these packages
used to build fine and now fail with:

run.sstate_create_package: Syntax error: "(" unexpected

Use a different EXTRA_CFLAGS variable for our custom flags instead of
the standard CFLAGS.

https://jira.digi.com/browse/DEL-1558

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2015-03-12 14:45:31 +01:00
parent c451c96dd6
commit 1ddee2d028
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meta-digi-arm/recipes-bsp/nvram/nvram.bb
View File

@ -18,10 +18,10 @@ SRC_URI += " \
S = "${WORKDIR}"
CMD_GIT_SHA1 = "$(cd ${THISDIR} && git rev-parse --short HEAD)"
LIB_GIT_SHA1 = "$(cd ${WORKDIR}/git && git rev-parse --short HEAD)"
CMD_GIT_SHA1 = "$(cd ${THISDIR} && git rev-parse --short=7 HEAD)"
LIB_GIT_SHA1 = "$(cd ${WORKDIR}/git && git rev-parse --short=7 HEAD)"
CFLAGS += "-Wall -DLINUX -DCMD_GIT_SHA1=\"${CMD_GIT_SHA1}\" -DLIB_GIT_SHA1=\"${LIB_GIT_SHA1}\" -Ilib/include -I${STAGING_INCDIR}/libdigi"
EXTRA_CFLAGS = "-Wall -DLINUX -DCMD_GIT_SHA1=\"${CMD_GIT_SHA1}\" -DLIB_GIT_SHA1=\"${LIB_GIT_SHA1}\" -Ilib/include -I${STAGING_INCDIR}/libdigi"
do_configure() {
rm -f lib && ln -s ${UBOOT_NVRAM_LIBPATH}
@ -29,12 +29,13 @@ do_configure() {
do_compile() {
# 'libnvram.a' static library
${CC} ${CFLAGS} -c -o nvram.o lib/src/nvram.c
${CC} ${CFLAGS} -c -o nvram_cmdline.o lib/src/nvram_cmdline.c
${CC} ${CFLAGS} -c -o nvram_priv_linux.o nvram_priv_linux.c
${CC} ${CFLAGS} ${EXTRA_CFLAGS} -c -o nvram.o lib/src/nvram.c
${CC} ${CFLAGS} ${EXTRA_CFLAGS} -c -o nvram_cmdline.o lib/src/nvram_cmdline.c
${CC} ${CFLAGS} ${EXTRA_CFLAGS} -c -o nvram_priv_linux.o nvram_priv_linux.c
${AR} -rcs libnvram.a nvram.o nvram_cmdline.o nvram_priv_linux.o
# 'nvram' command-line tool
${CC} ${CFLAGS} -o nvram main.c libnvram.a -ldigi
${CC} ${CFLAGS} ${EXTRA_CFLAGS} -c -o main.o main.c
${CC} ${LDFLAGS} -o nvram main.o libnvram.a -ldigi
}
do_install() {

8
meta-digi-arm/recipes-bsp/ubootenv/ubootenv.bb
View File

@ -18,12 +18,14 @@ SRC_URI = " \
S = "${WORKDIR}"
GIT_SHA1 = "$(cd ${THISDIR} && git rev-parse --short HEAD)"
GIT_SHA1 = "$(cd ${THISDIR} && git rev-parse --short=7 HEAD)"
CFLAGS += "-Wall -DLINUX -DGIT_SHA1=\"${GIT_SHA1}\" -I${STAGING_INCDIR}/libdigi"
EXTRA_CFLAGS = "-Wall -DLINUX -DGIT_SHA1=\"${GIT_SHA1}\" -I${STAGING_INCDIR}/libdigi"
do_compile() {
${CC} ${CFLAGS} -o ubootenv main_env.c env_funcs.c -lnvram -ldigi
${CC} ${CFLAGS} ${EXTRA_CFLAGS} -c -o main_env.o main_env.c
${CC} ${CFLAGS} ${EXTRA_CFLAGS} -c -o env_funcs.o env_funcs.c
${CC} ${LDFLAGS} -o ubootenv main_env.o env_funcs.o -lnvram -ldigi
}
do_install() {