* [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/files/, sys-apps/hdparm/
@ 2016-04-18 16:57 Mike Frysinger
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2016-04-18 16:57 UTC (permalink / raw
To: gentoo-commits
commit: b916e6674d101f748394f4899d9f804672e0b064
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 16:57:03 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 16:57:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b916e667
sys-apps/hdparm: fix building w/newer glibc #580052
sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch | 23 +++++++++++++++++++++++
sys-apps/hdparm/hdparm-9.48.ebuild | 3 ++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch b/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch
new file mode 100644
index 0000000..98a08c7
--- /dev/null
+++ b/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/580052
+https://sourceforge.net/p/hdparm/patches/44/
+
+--- a/geom.c
++++ b/geom.c
+@@ -15,6 +15,7 @@
+ #include <errno.h>
+ #include <dirent.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/ioctl.h>
+ #include <linux/types.h>
+ #include <linux/fs.h>
+--- a/sysfs.c
++++ b/sysfs.c
+@@ -15,6 +15,7 @@
+ #include <dirent.h>
+ #include <limits.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <linux/types.h>
+
+ #include "hdparm.h"
diff --git a/sys-apps/hdparm/hdparm-9.48.ebuild b/sys-apps/hdparm/hdparm-9.48.ebuild
index 6a777fd..8a087e8 100644
--- a/sys-apps/hdparm/hdparm-9.48.ebuild
+++ b/sys-apps/hdparm/hdparm-9.48.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic eutils
DESCRIPTION="Utility to change hard drive performance parameters"
HOMEPAGE="http://sourceforge.net/projects/hdparm/"
@@ -16,6 +16,7 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
IUSE="static"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-sysmacros.patch #580052
use static && append-ldflags -static
sed -i \
-e "/^CFLAGS/ s:-O2:${CFLAGS}:" \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/files/, sys-apps/hdparm/
@ 2017-01-19 20:29 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2017-01-19 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 5d1c197e7c700d5d3a8fcd6d0d880ce7ee269f45
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 20:25:44 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 20:29:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1c197e
sys-apps/hdparm: Bump to version 9.51
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-apps/hdparm/Manifest | 1 +
sys-apps/hdparm/files/hdparm-9.51-build.patch | 32 +++++++++++++++++++
sys-apps/hdparm/hdparm-9.51.ebuild | 45 +++++++++++++++++++++++++++
3 files changed, 78 insertions(+)
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 2885341..f98a1a4 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -2,3 +2,4 @@ DIST hdparm-9.45.tar.gz 129410 SHA256 23b01caa56a995cf0897877b6aff98ea622a5df255
DIST hdparm-9.48.tar.gz 130277 SHA256 ce97b4a71cb04146f54cf6f69787e7f97ddfda9836dc803b459d3b3df3a4fbee SHA512 5b8908a762d892c403406da4798202bed95f035396e3c49f04da910fa53a6b442a7d7c9cb1e5d786d7c8c5a1b681c8d1db10f1bd8dad09600a6f3811fbf8afb7 WHIRLPOOL 4f17e6622a9c6516834b0487c0d73ba7aaaffcd5381cbcf03c01fa936924975c3fb7190052c4d1bba7a0b53a53fc9b910fe4c71440f4a556d533d43ecd474516
DIST hdparm-9.49.tar.gz 158179 SHA256 31d20903b92aff24843b66fad2f1e21a4bcdb252d1a78e324b71715b54eb823c SHA512 3326e4387fa246a10a68d1c7d75d37e1151bcc4aeb2bef906824d6e53b1c8ae40a7939847cb6e7a3c445ff2775616e323cb9ff705f066f9665ee76c7e178baf5 WHIRLPOOL 2a08313fc9e38c18daa210d0b5d5657449bf445e1a04381f7995a0d239ac1f8d01389bf3f42b7e5119bd5d15b90583ed1ce964ba34b61b798ceed19e9b8849e7
DIST hdparm-9.50.tar.gz 133305 SHA256 0892b44bd817c251264a24f6ecbbb010958033e0395d2030f25f1c5608ac780e SHA512 e781da560f4ff7c75934b262b1be896765055ab0d90f9f637df2b7a13865a8dff0316811eae889e2bb09cbea08599b8f65e1fd1ef92f1f17e0fa728afda73fbc WHIRLPOOL 2a50edd4be38ea6e31099a5172d3c5afa845ef9ebfa560caf8019a3b390551b84e7614853a64f37b1f485a2fcbce833791276b21d7aab04b79a09f0ca85e3708
+DIST hdparm-9.51.tar.gz 133725 SHA256 1afad8891ecbe644c283f7d725157660ebf8bd5b4d9d67232afd45f83d2d5d91 SHA512 144d073d697d05058e0240ff46e5517803baa8475e1d381a31c25179ceb1564bbb561ba7f9dee8654d80a3510e3bf2f2d2f4a267618f0ab27967f37626aef91c WHIRLPOOL 4010a38656098820f7b34fced0b001209c12c42d22a1d8c2ca8ac3370e938ba1fb06f98afd7dcc1a1e22abf910bd476663fe8ad18fb221605e702e14bcabc25f
diff --git a/sys-apps/hdparm/files/hdparm-9.51-build.patch b/sys-apps/hdparm/files/hdparm-9.51-build.patch
new file mode 100644
index 00000000..2c6bdba
--- /dev/null
+++ b/sys-apps/hdparm/files/hdparm-9.51-build.patch
@@ -0,0 +1,32 @@
+* drop hardcoded -O2 flag from CFLAGS
+* drop hardcoded -s (strip) flag from LDFLAGS, and respect user LDFLAGS
+* fix hardcoded `make` and hardcoded -j2 flags
+* respect CFLAGS when linking
+
+--- hdparm-9.51/Makefile
++++ hdparm-9.51/Makefile
+@@ -13,9 +13,8 @@
+ CC ?= gcc
+ STRIP ?= strip
+
+-CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
++CFLAGS += -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs
+
+-LDFLAGS = -s
+ #LDFLAGS = -s -static
+ INSTALL = install
+ INSTALL_DATA = $(INSTALL) -m 644
+@@ -24,11 +23,10 @@
+
+ OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fallocate.o fibmap.o fwdownload.o dvdspeed.o wdidle3.o
+
+-all:
+- $(MAKE) -j4 hdparm
++all: hdparm
+
+ hdparm: hdparm.h sgio.h $(OBJS)
+- $(CC) $(LDFLAGS) -o hdparm $(OBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o hdparm $(OBJS)
+ $(STRIP) hdparm
+
+ hdparm.o: hdparm.h sgio.h
diff --git a/sys-apps/hdparm/hdparm-9.51.ebuild b/sys-apps/hdparm/hdparm-9.51.ebuild
new file mode 100644
index 00000000..908ff91
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.51.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="https://sourceforge.net/projects/hdparm/"
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+LICENSE="BSD GPL-2" # GPL-2 only
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="static"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.48-sysmacros.patch #580052
+ "${FILESDIR}"/${PN}-9.51-build.patch
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+ use static && append-ldflags -static
+}
+
+src_configure() {
+ tc-export CC
+ export STRIP=:
+}
+
+src_install() {
+ into /
+ dosbin hdparm contrib/idectl
+
+ newinitd "${FILESDIR}"/hdparm-init-8 hdparm
+ newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
+
+ doman hdparm.8
+ dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
+ docinto wiper
+ dodoc wiper/{README.txt,wiper.sh}
+ docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/files/, sys-apps/hdparm/
@ 2022-08-05 1:04 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-08-05 1:04 UTC (permalink / raw
To: gentoo-commits
commit: 25b2c005b4d330755c20628113ea850f447e785e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 5 00:59:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 5 00:59:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b2c005
sys-apps/hdparm: fix build w/ glibc 2.36
Closes: https://bugs.gentoo.org/863671
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch | 27 ++++++++++++++++++++++
sys-apps/hdparm/hdparm-9.64.ebuild | 1 +
2 files changed, 28 insertions(+)
diff --git a/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch b/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch
new file mode 100644
index 000000000000..c235b0f3941c
--- /dev/null
+++ b/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/863671
+https://sourceforge.net/p/hdparm/patches/52/
+
+From c8fc52968f9e97d29ccf6deb348ec02627d74235 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Jul 2022 13:00:40 -0700
+Subject: [PATCH] hdparm: Remove unused linux/fs.h header
+
+this helps fixing builds with glibc 2.36 where mount.h conflits now with
+kernel mount.h which is included indirectly by linux/fs.h see [1] for
+details
+
+[1] https://sourceware.org/glibc/wiki/Release/2.36
+
+Upstream-Status: Submitted []
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/hdparm.c
++++ b/hdparm.c
+@@ -25,7 +25,6 @@
+ #include <sys/mman.h>
+ #include <sys/user.h>
+ #include <linux/types.h>
+-#include <linux/fs.h>
+ #include <linux/major.h>
+ #include <endian.h>
+ #include <asm/byteorder.h>
+
diff --git a/sys-apps/hdparm/hdparm-9.64.ebuild b/sys-apps/hdparm/hdparm-9.64.ebuild
index 16d39cbe5836..066375abdd74 100644
--- a/sys-apps/hdparm/hdparm-9.64.ebuild
+++ b/sys-apps/hdparm/hdparm-9.64.ebuild
@@ -17,6 +17,7 @@ IUSE="static"
PATCHES=(
"${FILESDIR}"/${PN}-9.60-build.patch
+ "${FILESDIR}"/${PN}-9.64-glibc-2.36.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-05 1:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-19 20:29 [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/files/, sys-apps/hdparm/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2022-08-05 1:04 Sam James
2016-04-18 16:57 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox