diff options
3 files changed, 0 insertions, 102 deletions
diff --git a/meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch b/meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch deleted file mode 100644 index d59a7f7d88..0000000000 --- a/meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 272a8a069a8f5f06a1e5dfa0ef12f5f92984728b Mon Sep 17 00:00:00 2001 | ||
2 | From: Noor <noor_ahsan@mentor.com> | ||
3 | Date: Wed, 12 Aug 2015 20:54:00 +0500 | ||
4 | Subject: [PATCH] Makefile: Add LDFLAGS variable to SLDFLAGS. | ||
5 | |||
6 | * Add LDFLAGS variable to SLDFLAGS so that extra linker | ||
7 | flags can be sent via this variable. | ||
8 | |||
9 | Upstream-Status: Submitted [perfmon2-libpfm4-commits@lists.sourceforge.net] | ||
10 | |||
11 | Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> | ||
12 | --- | ||
13 | lib/Makefile | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/lib/Makefile b/lib/Makefile | ||
17 | index 1cc8765..4bd92ef 100644 | ||
18 | --- a/lib/Makefile | ||
19 | +++ b/lib/Makefile | ||
20 | @@ -187,7 +187,7 @@ CFLAGS += -DCONFIG_PFMLIB_CELL | ||
21 | endif | ||
22 | |||
23 | ifeq ($(SYS),Linux) | ||
24 | -SLDFLAGS=-shared -Wl,-soname -Wl,$(VLIBPFM) | ||
25 | +SLDFLAGS=$(LDFLAGS) -shared -Wl,-soname -Wl,$(VLIBPFM) | ||
26 | SLIBPFM=libpfm.so.$(VERSION).$(REVISION).$(AGE) | ||
27 | VLIBPFM=libpfm.so.$(VERSION) | ||
28 | SOLIBEXT=so | ||
29 | -- | ||
30 | 1.7.9.5 | ||
31 | |||
diff --git a/meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch b/meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch deleted file mode 100644 index 25d47ef125..0000000000 --- a/meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Fix compile error: | ||
4 | |||
5 | | syst_count.c:346:3: error: this 'for' clause does not guard... [-Werror=misleading-indentation] | ||
6 | | for(c=cmin ; c < cmax; c++) | ||
7 | | ^~~ | ||
8 | |||
9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
10 | --- | ||
11 | diff --git a/perf_examples/syst_count.c b/perf_examples/syst_count.c | ||
12 | index 0d53078..2dfb9b9 100644 | ||
13 | --- a/perf_examples/syst_count.c | ||
14 | +++ b/perf_examples/syst_count.c | ||
15 | @@ -343,8 +343,9 @@ measure(void) | ||
16 | |||
17 | for (delay = 1 ; delay <= options.delay; delay++) { | ||
18 | |||
19 | - for(c=cmin ; c < cmax; c++) | ||
20 | - start_cpu(c); | ||
21 | + for(c=cmin ; c < cmax; c++) { | ||
22 | + start_cpu(c); | ||
23 | + } | ||
24 | |||
25 | if (0) { | ||
26 | tv.tv_sec = 0; | ||
27 | @@ -353,8 +354,9 @@ measure(void) | ||
28 | } else | ||
29 | sleep(1); | ||
30 | |||
31 | - for(c=cmin ; c < cmax; c++) | ||
32 | - stop_cpu(c); | ||
33 | + for(c=cmin ; c < cmax; c++) { | ||
34 | + stop_cpu(c); | ||
35 | + } | ||
36 | |||
37 | for(c = cmin; c < cmax; c++) { | ||
38 | printf("# %'ds -----\n", delay); | ||
diff --git a/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb b/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb deleted file mode 100644 index 4136eac81f..0000000000 --- a/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | SUMMARY = "Monitoring tools exploiting the performance monitoring events" | ||
2 | DESCRIPTION = "This package provides a library, called libpfm4 which is used to develop \ | ||
3 | monitoring tools exploiting the performance monitoring events such as those \ | ||
4 | provided by the Performance Monitoring Unit (PMU) of modern processors." | ||
5 | HOMEPAGE = "http://perfmon2.sourceforge.net/" | ||
6 | BUGTRACKER = "http://sourceforge.net/tracker/?group_id=144822&atid=759953&source=navbar" | ||
7 | |||
8 | LICENSE = "MIT" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=0de488f3bd4424e308e2e399cb99c788" | ||
10 | |||
11 | SECTION = "devel" | ||
12 | |||
13 | COMPATIBLE_HOST = "powerpc64" | ||
14 | |||
15 | SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/${BPN}/libpfm-${PV}.tar.gz \ | ||
16 | file://0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch \ | ||
17 | file://fix-misleading-indentation-error.patch \ | ||
18 | " | ||
19 | |||
20 | SRC_URI[md5sum] = "5077b9022440e4951d96f2d0e73bd487" | ||
21 | SRC_URI[sha256sum] = "5ab1e5b0472550f9037a8800834f6bc3b927690070f69fac0b67284b4b05fd5f" | ||
22 | |||
23 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/" | ||
24 | |||
25 | EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\"" | ||
26 | EXTRA_OEMAKE_append_powerpc = " ARCH=\"powerpc\"" | ||
27 | EXTRA_OEMAKE_append_powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\"" | ||
28 | |||
29 | S = "${WORKDIR}/libpfm-${PV}" | ||
30 | |||
31 | do_install () { | ||
32 | oe_runmake install | ||
33 | } | ||