cpufrequtils: use the last available upstream version

Closes: #11975 [via git-merge-pr]
This commit is contained in:
cr6git 2018-02-28 00:28:42 +01:00 committed by Jürgen Buchmüller
parent 58d4cb856b
commit dcb199829c
2 changed files with 10 additions and 42 deletions

View File

@ -1,33 +0,0 @@
--- utils/cpuid.h 2010-07-05 17:43:17.000000000 +0200
+++ utils/cpuid.h 2016-10-13 22:31:26.988374329 +0200
@@ -1,6 +1,21 @@
#ifndef _CPUFREQ_CPUID_H
#define _CPUFREQ_CPUID_H
+#if defined(__i386__) && defined(__PIC__)
+static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
+ unsigned int *ecx, unsigned int *edx)
+{
+ /* ecx is often an input as well as an output. */
+ asm volatile("xchgl\t%%ebx, %1\n\t" \
+ "cpuid\n\t" \
+ "xchgl\t%%ebx, %1"
+ : "=a" (*eax),
+ "=r" (*ebx),
+ "=c" (*ecx),
+ "=d" (*edx)
+ : "0" (*eax), "2" (*ecx));
+}
+#else
static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
unsigned int *ecx, unsigned int *edx)
{
@@ -12,6 +27,8 @@
"=d" (*edx)
: "0" (*eax), "2" (*ecx));
}
+#endif
+
static inline void cpuid(unsigned int op,
unsigned int *eax, unsigned int *ebx,
unsigned int *ecx, unsigned int *edx)

View File

@ -1,22 +1,23 @@
# Template file for 'cpufrequtils' # Template file for 'cpufrequtils'
pkgname=cpufrequtils pkgname=cpufrequtils
version=008 version=008
revision=11 revision=12
_commit=a2f0c39d5f21596bb9f5223e895c0ff210b265d0
wrksrc="${pkgname}-${_commit}"
build_style=gnu-makefile
make_build_args="STRIP=true"
make_install_args="mandir=/usr/share/man"
short_desc="Userspace tools for the Linux kernel cpufreq subsystem" short_desc="Userspace tools for the Linux kernel cpufreq subsystem"
homepage="ftp://ftp.archlinux.org/other/cpufrequtils/" homepage="https://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpufrequtils.git"
license="GPL-2" license="GPL-2"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
distfiles="${KERNEL_SITE}/utils/kernel/cpufreq/${pkgname}-${version}.tar.xz" distfiles="${homepage}/snapshot/${pkgname}-${_commit}.tar.gz"
checksum=a2149db551f83112209b1a8e79bd50d386979bbf64edbc69126f4e0b4f0a4cab checksum=53b0fd1092e2053d31f4707ae0485f0d09b7faafcfac0e53da06c28ecfe23c95
only_for_archs="i686 i686-musl x86_64 x86_64-musl" only_for_archs="i686 i686-musl x86_64 x86_64-musl"
do_build() { post_extract() {
make CC=$CC CFLAGS="$CFLAGS" STRIP=true
}
do_install() {
sed -i "s|/usr/bin/install|install|g" Makefile sed -i "s|/usr/bin/install|install|g" Makefile
make DESTDIR=${DESTDIR} mandir=/usr/share/man install
} }
libcpufreq_package() { libcpufreq_package() {