From 5bb88c9c02f6c7cc6c728508ae8adf52d454a285 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 13 Jan 2019 18:34:08 -0200 Subject: [PATCH] CPU-X: update to 3.2.4. --- srcpkgs/CPU-X/patches/fix-no-pie-check.patch | 18 ++++++++++++++++++ srcpkgs/CPU-X/template | 15 ++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/CPU-X/patches/fix-no-pie-check.patch diff --git a/srcpkgs/CPU-X/patches/fix-no-pie-check.patch b/srcpkgs/CPU-X/patches/fix-no-pie-check.patch new file mode 100644 index 00000000000..ac1ef59b2f1 --- /dev/null +++ b/srcpkgs/CPU-X/patches/fix-no-pie-check.patch @@ -0,0 +1,18 @@ +This shouldn't exist and erroneously fails for us. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dca0029..93b8c79 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -32,10 +32,6 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack - + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now") + + include(CheckCCompilerFlag) +-check_c_compiler_flag("-no-pie" HAS_NO_PIE) +-if(HAS_NO_PIE) +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie") +-endif(HAS_NO_PIE) + + # Options + option(WITH_GTK "Build support for GUI in GTK3+" ON) + diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template index f6a1af3345d..cdd753672b0 100644 --- a/srcpkgs/CPU-X/template +++ b/srcpkgs/CPU-X/template @@ -1,22 +1,23 @@ -# Template file for 'CPU-X'. +# Template file for 'CPU-X' pkgname=CPU-X -version=3.2.3 +version=3.2.4 revision=1 only_for_archs="i686 x86_64 i686-musl x86_64-musl" build_style=cmake -build_options="gtk3" -build_options_default="gtk3" hostmakedepends="nasm pkg-config" makedepends="libcpuid-devel libcurl-devel ncurses-devel pciutils-devel - procps-ng-devel $(vopt_if gtk3 'gtk+3-devel')" + procps-ng-devel json-c-devel $(vopt_if gtk3 'gtk+3-devel')" short_desc="Free software that gathers information on CPU, motherboard and more" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://x0rg.github.io/CPU-X/" distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz" -checksum=4c11b3e3632870e9af81c5c0fa642edff8dd4622a172bbb788c4e6be595eb014 +checksum=f266388e13c527a5d1d98ec70957b1284f67aa89470cf71bc98ecb41c21542eb -case $XBPS_TARGET_MACHINE in +build_options="gtk3" +build_options_default="gtk3" + +case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel" LDFLAGS="-lexecinfo"