diff --git a/distributions/OpenELEC/options b/distributions/OpenELEC/options index 97105eca84..1323fb4736 100644 --- a/distributions/OpenELEC/options +++ b/distributions/OpenELEC/options @@ -212,9 +212,6 @@ # cron support (yes / no) CRON_SUPPORT="yes" -# Perf support in development builds (yes / no) - PERF_SUPPORT="yes" - # Distribution Specific source location DISTRO_MIRROR="http://sources.openelec.tv/mirror" DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION" diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 07bf23e3b3..c4b8a84c95 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -47,10 +47,6 @@ PKG_LONGDESC="This package contains a precompiled kernel image and the modules." PKG_IS_ADDON="no" PKG_AUTORECONF="no" -if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET elfutils Python" -fi - PKG_MAKE_OPTS_HOST="ARCH=$TARGET_ARCH headers_check" if [ "$BOOTLOADER" = "u-boot" ]; then @@ -148,33 +144,6 @@ make_target() { fi LDFLAGS="" make $KERNEL_IMAGE $KERNEL_MAKE_EXTRACMD - - if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then - ( cd tools/perf - - # dont use some optimizations because of build problems - strip_lto - LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` - - export FLAGSGLIBC="$CFLAGS -I$SYSROOT_PREFIX/usr/include" - export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include" - export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/lib -L$SYSROOT_PREFIX/usr/lib" - - make CROSS_COMPILE="$TARGET_PREFIX" \ - ARCH="$TARGET_ARCH" \ - V=1 \ - DEBUG=false \ - NLS=false \ - NO_GTK2=true \ - NO_LIBELF=false \ - NO_LIBPERL=true \ - NO_LIBPYTHON=false \ - PYTHON=$SYSROOT_PREFIX/usr/bin/python \ - WERROR=0 \ - NO_SLANG=1 \ - EXTRA_CFLAGS="$CFLAGS" - ) - fi } makeinstall_target() { @@ -194,15 +163,6 @@ makeinstall_target() { fi done fi - - if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then - mkdir -p $INSTALL/usr/bin - cp -P tools/perf/perf $INSTALL/usr/bin/ - - mkdir -p $INSTALL/usr/libexec/perf-core/scripts/python/ - cp -P tools/perf/perf-archive $INSTALL/usr/libexec/perf-core/ - cp -rP tools/perf/scripts/python/* $INSTALL/usr/libexec/perf-core/scripts/python/ - fi } make_init() { diff --git a/packages/linux/patches/3.19/linux-999.05-fix-perf-build.patch b/packages/linux/patches/3.19/linux-999.05-fix-perf-build.patch deleted file mode 100644 index e8c1040582..0000000000 --- a/packages/linux/patches/3.19/linux-999.05-fix-perf-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From He Kuang <> -Subject [PATCH] perf: fix building error in x86_64 -Date Wed, 11 Feb 2015 10:01:08 +0800 - - -When build with ARCH=x86_64, perf failed to compile with following error: - -tests/builtin-test.o:(.data+0x158): undefined reference to `test__perf_time_to_tsc' -collect2: error: ld returned 1 exit status -Makefile.perf:632: recipe for target 'perf' failed -... - -Which is caused commit c6e5e9fbc3ea1 ("perf tools: Fix building error -in x86_64 when dwarf unwind is on"), ARCH test in Makefile.perf -conflicts with tests/builtin-test.c's __x86_64__. -To x86/x86_64 platform, ARCH should always override to x86 while -IS_64_BIT stands for the actual architecture. - -Signed-off-by: He Kuang ---- - tools/perf/config/Makefile.arch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch -index ff95a68..8c6214d 100644 ---- a/tools/perf/config/Makefile.arch -+++ b/tools/perf/config/Makefile.arch -@@ -14,7 +14,7 @@ ifeq ($(RAW_ARCH),i386) - endif - - ifeq ($(RAW_ARCH),x86_64) -- ARCH ?= x86 -+ override ARCH := x86 - - ifneq (, $(findstring m32,$(CFLAGS))) - RAW_ARCH := x86_32 --- -2.2.0.33.gc18b867 -