Merge pull request #9151 from neheb/po

powertop: Do not use fstack-protector on ARC
This commit is contained in:
Rosen Penev 2019-06-09 09:58:40 -07:00 committed by GitHub
commit 38dcd42b87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 23 deletions

View file

@ -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 \

View file

@ -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" {