diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-06-04 11:45:52 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2019-06-04 11:51:26 -0700 |
| commit | 02a4ac87c0358a91ac613a2a18c35094d6ccf4bd (patch) | |
| tree | 4c2ad50e17d4ad214b53aa2f5eda4de6ec8dd693 | |
| parent | 438326179ed547e58e7b13f453133d0de023784e (diff) | |
powertop: Do not use fstack-protector on ARC
Not compatible. Instead of setting PKG_SSP, I had to do this as the
powertop Makefile defines it.
Use $(FPIC) instead of -fPIC to fix potential issues.
Removed musl patch. Not needed anymore.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
| -rw-r--r-- | utils/powertop/Makefile | 8 | ||||
| -rw-r--r-- | utils/powertop/patches/001-musl-fix-headers.patch | 22 |
2 files changed, 7 insertions, 23 deletions
diff --git a/utils/powertop/Makefile b/utils/powertop/Makefile index 15a5881e4..4fa32c542 100644 --- a/utils/powertop/Makefile +++ b/utils/powertop/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=powertop PKG_VERSION:=2.10 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://01.org/sites/default/files/downloads/ @@ -39,8 +39,14 @@ define Package/powertop/description and power management. endef +TARGET_CFLAGS += $(FPIC) +ifeq ($(CONFIG_USE_UCLIBC),y) +TARGET_CFLAGS += -fno-stack-protector +endif TARGET_LDFLAGS += $(if $(INTL_FULL),-lintl) +CONFIGURE_ARGS += --without-pic + define Package/powertop/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/powertop \ diff --git a/utils/powertop/patches/001-musl-fix-headers.patch b/utils/powertop/patches/001-musl-fix-headers.patch deleted file mode 100644 index 9839d15bf..000000000 --- a/utils/powertop/patches/001-musl-fix-headers.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./src/devices/devfreq.h.orig -+++ ./src/devices/devfreq.h -@@ -25,6 +25,7 @@ - #ifndef _INCLUDE_GUARD_DEVFREQ_H - #define _INCLUDE_GUARD_DEVFREQ_H - -+#include <sys/time.h> - #include "device.h" - #include "../parameters/parameters.h" - -diff --git a/src/perf/perf.h b/src/perf/perf.h -index ee072ae06d24..932588a684f9 100644 ---- a/src/perf/perf.h -+++ b/src/perf/perf.h -@@ -26,6 +26,7 @@ - #define _INCLUDE_GUARD_PERF_H_ - - #include <iostream> -+#include <stdio.h> - - - extern "C" { |