diff options
| -rw-r--r-- | recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch | 32 | ||||
| -rw-r--r-- | recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch | 18 | ||||
| -rw-r--r-- | recipes-bsp/libmcc/libmcc_1.05.bb | 27 |
3 files changed, 0 insertions, 77 deletions
diff --git a/recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch b/recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch deleted file mode 100644 index 0aebe00b4..000000000 --- a/recipes-bsp/libmcc/libmcc/build-Fix-symlink-generation.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From adef7a71a3bd40650685183c8a023000423ec880 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
| 3 | Date: Tue, 6 Jan 2015 12:03:27 -0200 | ||
| 4 | Subject: [PATCH] build: Fix symlink generation | ||
| 5 | Organization: O.S. Systems Software LTDA. | ||
| 6 | |||
| 7 | Upstream-Status: Pending | ||
| 8 | |||
| 9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 10 | --- | ||
| 11 | Makefile | 5 ++--- | ||
| 12 | 1 file changed, 2 insertions(+), 3 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/Makefile b/Makefile | ||
| 15 | index ac46f5c..248b2eb 100644 | ||
| 16 | --- a/Makefile | ||
| 17 | +++ b/Makefile | ||
| 18 | @@ -14,9 +14,8 @@ install: | ||
| 19 | mkdir -p $(DESTDIR)/usr/include $(DESTDIR)/usr/lib | ||
| 20 | cp -f build/libmcc.so.* build/libmcc.a $(DESTDIR)/usr/lib | ||
| 21 | cp -f include/*.h $(DESTDIR)/usr/include | ||
| 22 | - cd $(DESTDIR)/usr/lib/ | ||
| 23 | - ln -sf libmcc.so.1.0 libmcc.so.1 | ||
| 24 | - ln -sf libmcc.so.1 libmcc.so | ||
| 25 | + ln -sf libmcc.so.1.0 $(DESTDIR)/usr/lib/libmcc.so.1 | ||
| 26 | + ln -sf libmcc.so.1 $(DESTDIR)/usr/lib/libmcc.so | ||
| 27 | |||
| 28 | clean: | ||
| 29 | rm -rf build | ||
| 30 | -- | ||
| 31 | 2.1.4 | ||
| 32 | |||
diff --git a/recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch b/recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch deleted file mode 100644 index d004b78aa..000000000 --- a/recipes-bsp/libmcc/libmcc/build-with-versioned-soname.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | libmcc: build with versioned soname | ||
| 2 | |||
| 3 | This adds a versioned soname to the shared library during linking. | ||
| 4 | Otherwise an application linked with '-lmcc' needs libmcc.so for execution, | ||
| 5 | having libmcc.so.1 would not be enough. | ||
| 6 | |||
| 7 | Signed-off-by: Max Krummenacher <max.oss.09@gmail.com> | ||
| 8 | --- a/Makefile 2015-01-07 17:09:13.657675270 +0100 | ||
| 9 | +++ b/Makefile 2015-01-07 17:21:19.457545709 +0100 | ||
| 10 | @@ -8,7 +8,7 @@ | ||
| 11 | $(AR) rcs $@ $< | ||
| 12 | |||
| 13 | build/libmcc.so.1.0: build/libmcc.o | ||
| 14 | - $(CC) -shared -o $@ $< | ||
| 15 | + $(CC) -shared -Wl,-soname,libmcc.so.1 -o $@ $< -lc | ||
| 16 | |||
| 17 | install: | ||
| 18 | mkdir -p $(DESTDIR)/usr/include $(DESTDIR)/usr/lib | ||
diff --git a/recipes-bsp/libmcc/libmcc_1.05.bb b/recipes-bsp/libmcc/libmcc_1.05.bb deleted file mode 100644 index 1140ed18a..000000000 --- a/recipes-bsp/libmcc/libmcc_1.05.bb +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | # Copyright (C) 2013 Timesys Corporation | ||
| 2 | SUMMARY = "Multicore communication Library" | ||
| 3 | LICENSE = "GPL-2.0" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c49712341497d0b5f2e40c30dff2af9d" | ||
| 5 | |||
| 6 | DEPENDS = "virtual/kernel-module-mcc" | ||
| 7 | |||
| 8 | SRC_URI = "http://repository.timesys.com/buildsources/l/libmcc/libmcc-${PV}/libmcc-${PV}.tar.bz2 \ | ||
| 9 | file://build-Fix-symlink-generation.patch \ | ||
| 10 | file://build-with-versioned-soname.patch" | ||
| 11 | |||
| 12 | SRC_URI[md5sum] = "cc3965f162dd20b8e6b9babf5dd963ee" | ||
| 13 | SRC_URI[sha256sum] = "b98c1f857bf851e41c35c4fcdb823e83e0e058c746dffb50038c8759c8c1e104" | ||
| 14 | |||
| 15 | S = "${WORKDIR}/libmcc-${PV}" | ||
| 16 | |||
| 17 | CFLAGS += "-I${STAGING_KERNEL_DIR}/include" | ||
| 18 | |||
| 19 | RDEPENDS_${PN} = "virtual/kernel-module-mcc" | ||
| 20 | |||
| 21 | COMPATIBLE_MACHINE = "(vf60)" | ||
| 22 | |||
| 23 | do_install() { | ||
| 24 | oe_runmake 'DESTDIR=${D}' install | ||
| 25 | } | ||
| 26 | |||
| 27 | RDEPENDS_${PN}-dev += "virtual/kernel-module-mcc-dev" | ||
