libmcc: bump to version 1.04

This version was released to integrate the cflags and symlink
patches. Drop the merged patches.

Change-Id: If83033bc8f51ae2478e20754e8c8a3da58e002c4
Signed-off-by: Andy Voltz <andy.voltz@timesys.com>
Signed-off-by: Anthony Felice <tony.felice@timesys.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/recipes-bsp/libmcc/libmcc/libmcc-cflags.patch b/meta-fsl-arm/recipes-bsp/libmcc/libmcc/libmcc-cflags.patch
deleted file mode 100644 (file)
index 01f4c41..0000000
--- a/meta-fsl-arm/recipes-bsp/libmcc/libmcc/libmcc-cflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This patch is required with the Yocto toolchain.
-
-Upstream-status: Pending
-
-diff -Nuar libmcc-1.03-orig/Makefile libmcc-1.03/Makefile
---- libmcc-1.03-orig/Makefile  2013-08-12 14:43:50.063656300 -0400
-+++ libmcc-1.03/Makefile       2013-08-12 14:44:10.007427139 -0400
-@@ -1,9 +1,8 @@
--CFLAGS+=-Iinclude/
- all: build/libmcc.a build/libmcc.so
- 
- build/libmcc.o: src/libmcc.c
-       mkdir -p build/
--      $(CC) -c -fPIC $< -o $@ $(CFLAGS)
-+      $(CC) -c -fPIC $< -o $@ -Iinclude/ $(CFLAGS)
- 
- build/libmcc.a: build/libmcc.o
-       $(AR) rcs $@ $<

diff --git a/meta-fsl-arm/recipes-bsp/libmcc/libmcc/libmcc-symlink.patch b/meta-fsl-arm/recipes-bsp/libmcc/libmcc/libmcc-symlink.patch
deleted file mode 100644 (file)
index f21a93e..0000000
--- a/meta-fsl-arm/recipes-bsp/libmcc/libmcc/libmcc-symlink.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This patch adds the proper version suffix to the libmcc shared libs.
-
-Upstream-status: Pending
-
-diff -Nuar libmcc-1.03-orig/Makefile libmcc-1.03/Makefile
---- libmcc-1.03-orig/Makefile  2013-08-13 10:05:46.187200835 -0400
-+++ libmcc-1.03/Makefile       2013-08-13 12:23:45.167119943 -0400
-@@ -1,4 +1,4 @@
--all: build/libmcc.a build/libmcc.so
-+all: build/libmcc.a build/libmcc.so.1.0
- 
- build/libmcc.o: src/libmcc.c
-       mkdir -p build/
-@@ -7,13 +7,16 @@
- build/libmcc.a: build/libmcc.o
-       $(AR) rcs $@ $<
- 
--build/libmcc.so: build/libmcc.o
-+build/libmcc.so.1.0: build/libmcc.o
-       $(CC) -shared -o $@  $<
- 
- install:
-       mkdir -p $(DESTDIR)/usr/{lib,include}
--      cp -f build/libmcc.{so,a} $(DESTDIR)/usr/lib
-+      cp -f build/libmcc.{so.*,a} $(DESTDIR)/usr/lib
-       cp -f include/*.h $(DESTDIR)/usr/include
-+      cd $(DESTDIR)/usr/lib/
-+      ln -sf libmcc.so.1.0 libmcc.so.1
-+      ln -sf libmcc.so.1 libmcc.so
- 
- clean:
-       rm -rf build

diff --git a/meta-fsl-arm/recipes-bsp/libmcc/libmcc_1.03.bb b/meta-fsl-arm/recipes-bsp/libmcc/libmcc_1.04.bb
similarity index 63%
rename from meta-fsl-arm/recipes-bsp/libmcc/libmcc_1.03.bb
rename to meta-fsl-arm/recipes-bsp/libmcc/libmcc_1.04.bb
index 5d3c968ce8a3fa09a52e1cdac7ddea9599f1a438..35efd45a1a3785c0f8b88e2c405f27c12b33571b 100644 (file)
--- a/meta-fsl-arm/recipes-bsp/libmcc/libmcc_1.03.bb
+++ b/meta-fsl-arm/recipes-bsp/libmcc/libmcc_1.04.bb
@@ -7,12 +7,10 @@ DEPENDS = "kernel-module-mcc"
 
 inherit autotools
 
-SRC_URI = "http://repository.timesys.com/buildsources/l/libmcc/libmcc-${PV}/libmcc-${PV}.tar.bz2 \
-           file://libmcc-cflags.patch \
-           file://libmcc-symlink.patch"
+SRC_URI = "http://repository.timesys.com/buildsources/l/libmcc/libmcc-${PV}/libmcc-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "adac15d52206be21a4589b2b923af4cc"
-SRC_URI[sha256sum] = "8b4d88f260d4d3a67ee2c16e20112e0584403f350182087daa1cfafeceb16a7f"
+SRC_URI[md5sum] = "e93ce76b4419f0902a848e1769bf22ea"
+SRC_URI[sha256sum] = "3de76c5b1a096021afebfc79ca4e85d05646beb3101edcecf73b82886e7a00c0"
 
 S = "${WORKDIR}/libmcc-${PV}"