From 77186ca4b7ffd1662387e65c79fc97f2d7ed141f Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 23 Jun 2014 09:53:12 -0700 Subject: [PATCH 1/4] boot-format: obey LDFLAGS Quiets a GNU_HASH warning. JIRA: SB-3120 Signed-off-by: Christopher Larson --- .../boot-format/boot-format/flags.patch | 21 +++++++++++++++++++ .../boot-format/boot-format_git.bbappend | 3 +++ 2 files changed, 24 insertions(+) create mode 100644 fsl-ppc/recipes-tools/boot-format/boot-format/flags.patch create mode 100644 fsl-ppc/recipes-tools/boot-format/boot-format_git.bbappend diff --git a/fsl-ppc/recipes-tools/boot-format/boot-format/flags.patch b/fsl-ppc/recipes-tools/boot-format/boot-format/flags.patch new file mode 100644 index 0000000..cddb34c --- /dev/null +++ b/fsl-ppc/recipes-tools/boot-format/boot-format/flags.patch @@ -0,0 +1,21 @@ +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -3,14 +3,14 @@ + INSTALL=install + PREFIX=/usr + +-CFLAGS=-Wall ++override CFLAGS+=-Wall + + all: boot_format + + boot_format.o: boot_format.c boot_format.h + + boot_format: boot_format.o +- $(CC) $< -o $@ ++ $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + + install: boot_format + $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin diff --git a/fsl-ppc/recipes-tools/boot-format/boot-format_git.bbappend b/fsl-ppc/recipes-tools/boot-format/boot-format_git.bbappend new file mode 100644 index 0000000..63fc5d0 --- /dev/null +++ b/fsl-ppc/recipes-tools/boot-format/boot-format_git.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/boot-format:" +SRC_URI += "file://flags.patch" +EXTRA_OEMAKE += "'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}'" From b54e2f2e0dd8bdb5d92356911f6e4be865900957 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 23 Jun 2014 10:32:02 -0700 Subject: [PATCH 2/4] ossp-uuid: obey LDFLAGS Quiets a GNU_HASH warning. JIRA: SB-3120 Signed-off-by: Christopher Larson --- .../ossp-uuid/ossp-uuid/ldflags.patch | 23 +++++++++++++++++++ .../ossp-uuid/ossp-uuid_1.6.2.bbappend | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 core/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch create mode 100644 core/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bbappend diff --git a/core/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch b/core/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch new file mode 100644 index 0000000..a4cb455 --- /dev/null +++ b/core/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch @@ -0,0 +1,23 @@ +Index: uuid-1.6.2/Makefile.in +=================================================================== +--- uuid-1.6.2.orig/Makefile.in ++++ uuid-1.6.2/Makefile.in +@@ -113,15 +113,15 @@ all: $(TARGETS) + @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< + + $(LIB_NAME): $(LIB_OBJS) +- @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ ++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ + -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(DCE_NAME): $(DCE_OBJS) +- @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ ++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ + -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(CXX_NAME): $(CXX_OBJS) +- @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ ++ @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ + -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME) diff --git a/core/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bbappend b/core/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bbappend new file mode 100644 index 0000000..0c77414 --- /dev/null +++ b/core/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +SRC_URI += "file://ldflags.patch" From 54aa4e259d24647a3e7bc309c9c01aeca23f42e4 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 23 Jun 2014 10:41:06 -0700 Subject: [PATCH 3/4] testfloat: obey LDFLAGS Quiets a GNU_HASH warning. JIRA: SB-3120 Signed-off-by: Christopher Larson --- .../testfloat/testfloat/ldflags.patch | 11 +++++++++++ .../recipes-extended/testfloat/testfloat_2a.bbappend | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 fsl-ppc/recipes-extended/testfloat/testfloat/ldflags.patch create mode 100644 fsl-ppc/recipes-extended/testfloat/testfloat_2a.bbappend diff --git a/fsl-ppc/recipes-extended/testfloat/testfloat/ldflags.patch b/fsl-ppc/recipes-extended/testfloat/testfloat/ldflags.patch new file mode 100644 index 0000000..0994610 --- /dev/null +++ b/fsl-ppc/recipes-extended/testfloat/testfloat/ldflags.patch @@ -0,0 +1,11 @@ +--- TestFloat-2a/testfloat/powerpc-linux-gcc/Makefile ++++ TestFloat-2a/testfloat/powerpc-linux-gcc/Makefile +@@ -14,7 +14,7 @@ COMPILE_C_HARD = $(CC) -c -o $@ $(INCLUD + + COMPILE_SLOWFLOAT_C = $(CC) -c -o $@ $(INCLUDES) -I- -O + +-LINK = $(CC) -lm -o $@ ++LINK = $(CC) -lm -o $@ $(LDFLAGS) + + SOFTFLOAT_H = $(SOFTFLOAT_DIR)/softfloat.h + SOFTFLOAT_OBJ = $(SOFTFLOAT_DIR)/softfloat$(OBJ) diff --git a/fsl-ppc/recipes-extended/testfloat/testfloat_2a.bbappend b/fsl-ppc/recipes-extended/testfloat/testfloat_2a.bbappend new file mode 100644 index 0000000..c213fda --- /dev/null +++ b/fsl-ppc/recipes-extended/testfloat/testfloat_2a.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +SRC_URI_append_fslmachine = " file://ldflags.patch" From c9829b9baa40bc3cd41e532cbdc556f238a07299 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 24 Jun 2014 14:58:07 -0700 Subject: [PATCH 4/4] tcmode: obey MGLS_LICENSE_FILE, not MGLS JIRA: SB-3112 Signed-off-by: Christopher Larson --- conf/distro/include/tcmode-external-sourcery.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index 1611c42..9f51654 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -97,7 +97,7 @@ LDEMULATION_mips64 = "elf${LDEMULATION_BITS}${LDEMULATION_ENDIAN}smip${@bb.utils TUNE_LDARGS += "${@'-m ${LDEMULATION}' if LDEMULATION else ''}" # Ensure that the licensing variables are available to the toolchain. -export MGLS +export MGLS_LICENSE_FILE export LM_LICENSE_FILE # Unfortunately, the CSL ia32 toolchain has non-prefixed binaries in its @@ -111,7 +111,7 @@ python toolchain_metadata_setup () { d = e.data # Ensure that changes to toolchain licensing don't affect checksums - d.appendVar('BB_HASHBASE_WHITELIST', ' MGLS LM_LICENSE_FILE') + d.appendVar('BB_HASHBASE_WHITELIST', ' MGLS_LICENSE_FILE LM_LICENSE_FILE') l = d.createCopy() l.finalize()