* [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/, sys-apps/hdparm/files/
@ 2016-12-20 16:35 Mike Frysinger
0 siblings, 0 replies; 6+ messages in thread
From: Mike Frysinger @ 2016-12-20 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 8c1fe8b7b045c175747525f38e6296b1c523246b
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 16:34:29 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 16:35:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1fe8b7
sys-apps/hdparm: fix parallel build failure
Move the sed commands into a patch to make a bit more reliable since
we have to patch the Makefile anyways to fix parallel build errors.
sys-apps/hdparm/files/hdparm-9.50-build.patch | 32 +++++++++++++++++++++++++++
sys-apps/hdparm/hdparm-9.50.ebuild | 10 ++++-----
2 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/sys-apps/hdparm/files/hdparm-9.50-build.patch b/sys-apps/hdparm/files/hdparm-9.50-build.patch
new file mode 100644
index 00000000..ff1948a
--- /dev/null
+++ b/sys-apps/hdparm/files/hdparm-9.50-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
+
+--- a/Makefile
++++ b/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 @@ INSTALL_PROGRAM = $(INSTALL)
+
+ OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fallocate.o fibmap.o fwdownload.o dvdspeed.o wdidle3.o
+
+-all:
+- make -j2 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.50.ebuild b/sys-apps/hdparm/hdparm-9.50.ebuild
index 4db6889..f447ca4 100644
--- a/sys-apps/hdparm/hdparm-9.50.ebuild
+++ b/sys-apps/hdparm/hdparm-9.50.ebuild
@@ -17,15 +17,13 @@ IUSE="static"
src_prepare() {
epatch "${FILESDIR}"/${PN}-9.48-sysmacros.patch #580052
+ epatch "${FILESDIR}"/${PN}-9.50-build.patch
use static && append-ldflags -static
- sed -i \
- -e "/^CFLAGS/ s:-O2:${CFLAGS}:" \
- -e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
- Makefile || die "sed"
}
-src_compile() {
- emake STRIP=: CC="$(tc-getCC)"
+src_configure() {
+ tc-export CC
+ export STRIP=:
}
src_install() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/, sys-apps/hdparm/files/
@ 2018-11-28 9:06 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2018-11-28 9:06 UTC (permalink / raw
To: gentoo-commits
commit: de2c1b665b20ad6fa61b2ba9fd4fcaa8860761c8
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 08:59:26 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 09:06:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2c1b66
sys-apps/hdparm: Removed old.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/hdparm/Manifest | 1 -
sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch | 23 ------------
sys-apps/hdparm/hdparm-9.52.ebuild | 44 -----------------------
3 files changed, 68 deletions(-)
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index e8b3f3c22d1..8f621eb7d10 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,3 +1,2 @@
-DIST hdparm-9.52.tar.gz 140737 BLAKE2B 0614bfb0844f088b533951c4636bf92879c4ff7e9bb4d150965e936eaa2a4e0ffd350689fc359757a2f9e80a6c93cd111a25b8e2824737e01b4deb6e543b2868 SHA512 7c37d1381c1dd2d46762a8cdcaba2015b0b051ee7bd135dbcf6346def51b085cc2f9ecd7e1ebdc67e12ab4b765df548d4757b3700ed6e7514c2b13ed40661c59
DIST hdparm-9.56.tar.gz 137213 BLAKE2B ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd SHA512 5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
diff --git a/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch b/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch
deleted file mode 100644
index 98a08c7d36d..00000000000
--- a/sys-apps/hdparm/files/hdparm-9.48-sysmacros.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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.52.ebuild b/sys-apps/hdparm/hdparm-9.52.ebuild
deleted file mode 100644
index 6bcd2b516c0..00000000000
--- a/sys-apps/hdparm/hdparm-9.52.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/, sys-apps/hdparm/files/
@ 2020-11-21 23:55 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2020-11-21 23:55 UTC (permalink / raw
To: gentoo-commits
commit: 5dc71f632945c43eaaae16f04c1eb333ed70cda6
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 23:54:48 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 23:55:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc71f63
sys-apps/hdparm: Bump to version 9.60
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/hdparm/Manifest | 1 +
sys-apps/hdparm/files/hdparm-9.60-build.patch | 28 +++++++++++++++++
sys-apps/hdparm/hdparm-9.60.ebuild | 43 +++++++++++++++++++++++++++
3 files changed, 72 insertions(+)
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 8f621eb7d10..f34a07566b7 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,2 +1,3 @@
DIST hdparm-9.56.tar.gz 137213 BLAKE2B ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd SHA512 5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
+DIST hdparm-9.60.tar.gz 155220 BLAKE2B c09a2bd7a61a77d87f7bbd45881d5956392dbedf1f329be59049de68ee8491857b1958f8e5e85086ed53deaad37fc476cfb87f45bf27084719c07d25608ffdc0 SHA512 e40b3b48b409014acd0ec0bd7ff821e850b127627b1f5114c442eeaf0b93f02c6933f93a221037255499b741071c0a5cb4d9cf7f9a06ff92a416caf82673a0ed
diff --git a/sys-apps/hdparm/files/hdparm-9.60-build.patch b/sys-apps/hdparm/files/hdparm-9.60-build.patch
new file mode 100644
index 00000000000..7decf805c53
--- /dev/null
+++ b/sys-apps/hdparm/files/hdparm-9.60-build.patch
@@ -0,0 +1,28 @@
+--- hdparm-9.60/Makefile
++++ hdparm-9.60/Makefile
+@@ -13,7 +13,7 @@
+ 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
+
+ INSTALL = install
+ INSTALL_DATA = $(INSTALL) -m 644
+@@ -22,14 +22,13 @@
+
+ OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fallocate.o fibmap.o fwdownload.o dvdspeed.o wdidle3.o apt.o
+
+-all:
+- $(MAKE) -j4 hdparm
++all: hdparm
+
+ static:
+ LDFLAGS=-static $(MAKE)
+
+ hdparm: Makefile 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.60.ebuild b/sys-apps/hdparm/hdparm-9.60.ebuild
new file mode 100644
index 00000000000..1bfffb80b2f
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.60.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.60-build.patch
+)
+
+src_prepare() {
+ default
+ 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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/, sys-apps/hdparm/files/
@ 2021-06-14 9:19 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-06-14 9:19 UTC (permalink / raw
To: gentoo-commits
commit: fb97f38c862af403c6148a2e6660d48500835818
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 09:19:12 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 09:19:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb97f38c
sys-apps/hdparm: drop 9.58
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-apps/hdparm/Manifest | 1 -
sys-apps/hdparm/files/hdparm-9.51-build.patch | 32 --------------------
sys-apps/hdparm/hdparm-9.58.ebuild | 43 ---------------------------
3 files changed, 76 deletions(-)
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 0e2e651d774..9f2f81614d1 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,2 +1 @@
-DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
DIST hdparm-9.62.tar.gz 139976 BLAKE2B 83ea59e35eeec7fa2a9e2f9f4b7a9a0d44cd4366d95e529c08bf38b04f6d78862bfefdfb905d4fceadbb81453ee92a60aa55db8d4c0bd164ec67181b46f197bf SHA512 ac6c4d285d081ecd8c7b231192a5a0fc268d934eeeb59794ae9a9db01ecbdd0afa0cade6ed42a1fd26ad543c52a3b380ac4f1b679992d167becb4ed6251fd369
diff --git a/sys-apps/hdparm/files/hdparm-9.51-build.patch b/sys-apps/hdparm/files/hdparm-9.51-build.patch
deleted file mode 100644
index 2c6bdba68e3..00000000000
--- a/sys-apps/hdparm/files/hdparm-9.51-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-* 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.58.ebuild b/sys-apps/hdparm/hdparm-9.58.ebuild
deleted file mode 100644
index d03b4546236..00000000000
--- a/sys-apps/hdparm/hdparm-9.58.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9.51-build.patch
-)
-
-src_prepare() {
- default
- 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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/, sys-apps/hdparm/files/
@ 2022-12-26 8:35 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-26 8:35 UTC (permalink / raw
To: gentoo-commits
commit: e269101935ca2183dcef2aff7d99e646d376c15d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 08:24:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 08:33:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2691019
sys-apps/hdparm: drop 9.64
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/hdparm/Manifest | 1 -
sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch | 27 -------------
sys-apps/hdparm/hdparm-9.64.ebuild | 47 ----------------------
3 files changed, 75 deletions(-)
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 42981fcdd846..73fd9a66fa6f 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,2 +1 @@
-DIST hdparm-9.64.tar.gz 140307 BLAKE2B 0196f3ccec4005c542b834d8426cc6f64694783da3d4a064e898e25d17aab3aa0d9621276607169f2104c9a9804f9020554d836ded9efb16367a8ac4c9c9b146 SHA512 c561825143d8872cc2940bd6ba72162f91792bd63b6a8511058e79cc96feb6a4a9d22275581ef2eefab64a4035587b3a63175ccc58fa46f1059b4680d9d58ec4
DIST hdparm-9.65.tar.gz 140425 BLAKE2B 79b1c16e7807f82a992ed7f22faef57045c56da4a281fbd8db3b8846b193ccc4b42329fa6abbebf8b652fbefb13aa0f18dfa726e802e8e1a45c94f414fb303b9 SHA512 4ffc8902b90cee10d68af8ddb9f3b9454d523ecd49cdaaed254b4d7a999462a8ad5ec1bb5d7684b09fefa41b5941ab533b167dad290003b51c795a633ca88913
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
deleted file mode 100644
index c235b0f3941c..000000000000
--- a/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index eccb8be2c047..000000000000
--- a/sys-apps/hdparm/hdparm-9.64.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-# GPL-2 only
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9.60-build.patch
- "${FILESDIR}"/${PN}-9.64-glibc-2.36.patch
-)
-
-src_prepare() {
- default
-
- 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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/, sys-apps/hdparm/files/
@ 2023-10-01 7:43 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-10-01 7:43 UTC (permalink / raw
To: gentoo-commits
commit: 419b3db36f46fec8382467828ab5e2837173905c
Author: Daniil Lunev <dlunev <AT> google <DOT> com>
AuthorDate: Thu Sep 21 21:59:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 1 07:42:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419b3db3
sys-apps/hdparm: enable LFS flags
```
$ diff -u hdparm-9.65-r1.ebuild hdparm-9.65-r2.ebuild
--- hdparm-9.65-r1.ebuild 2023-09-22 07:41:40.287176532 +1000
+++ hdparm-9.65-r2.ebuild 2023-09-22 07:58:18.888053647 +1000
@@ -17,6 +17,7 @@
PATCHES=(
"${FILESDIR}"/${PN}-9.60-build.patch
+ "${FILESDIR}"/${P}-graceful-lfs.patch
)
src_prepare() {
@@ -25,6 +26,10 @@
use static && append-ldflags -static
}
+src_configure() {
+ append-lfs-flags
+}
+
src_compile() {
emake STRIP="true" CC="$(tc-getCC)"
}
```
Closes: https://bugs.gentoo.org/914505
Signed-off-by: Daniil Lunev <dlunev <AT> google.com>
Closes: https://github.com/gentoo/gentoo/pull/32979
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../hdparm/files/hdparm-9.65-graceful-lfs.patch | 16 +++++++
sys-apps/hdparm/hdparm-9.65-r2.ebuild | 50 ++++++++++++++++++++++
2 files changed, 66 insertions(+)
diff --git a/sys-apps/hdparm/files/hdparm-9.65-graceful-lfs.patch b/sys-apps/hdparm/files/hdparm-9.65-graceful-lfs.patch
new file mode 100644
index 000000000000..bb8df3735deb
--- /dev/null
+++ b/sys-apps/hdparm/files/hdparm-9.65-graceful-lfs.patch
@@ -0,0 +1,16 @@
+# Guard _LARGEFILE64_SOURCE define to avoid warning with append-lfs-flags
+# https://bugs.gentoo.org/914505
+diff --git a/hdparm.c b/hdparm.c
+index eb9796b..a3204f9 100644
+--- a/hdparm.c
++++ b/hdparm.c
+@@ -4,7 +4,9 @@
+ */
+ #define HDPARM_VERSION "v9.65"
+
++#ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE /*for lseek64*/
++#endif
+ #define _BSD_SOURCE /* for strtoll() */
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/sys-apps/hdparm/hdparm-9.65-r2.ebuild b/sys-apps/hdparm/hdparm-9.65-r2.ebuild
new file mode 100644
index 000000000000..9f39facd3441
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.65-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="https://sourceforge.net/projects/hdparm/"
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+# GPL-2 only
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-9.60-build.patch
+ "${FILESDIR}"/${P}-graceful-lfs.patch
+)
+
+src_prepare() {
+ default
+
+ use static && append-ldflags -static
+}
+
+src_configure() {
+ append-lfs-flags
+}
+
+src_compile() {
+ emake STRIP="true" CC="$(tc-getCC)"
+}
+
+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] 6+ messages in thread
end of thread, other threads:[~2023-10-01 7:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-26 8:35 [gentoo-commits] repo/gentoo:master commit in: sys-apps/hdparm/, sys-apps/hdparm/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-10-01 7:43 Sam James
2021-06-14 9:19 David Seifert
2020-11-21 23:55 Lars Wendler
2018-11-28 9:06 Lars Wendler
2016-12-20 16:35 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox