Merge pull request #42 from drewmoseley/sync-from-2014.05

Sync from 2014.05

conf/distro/include/tcmode-external-sourcery.inc

@@ -94,7 +94,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
@@ -108,7 +108,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()

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)

core/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bbappend

@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+SRC_URI += "file://ldflags.patch"

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)

fsl-ppc/recipes-extended/testfloat/testfloat_2a.bbappend

@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+SRC_URI_append_fslmachine = " file://ldflags.patch"

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

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}'"