public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libowfat/, dev-libs/libowfat/files/
@ 2017-12-20 21:03 Thomas Deutschmann
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2017-12-20 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     2f47fececac67939c38fbcb6c4bbd74a6f6fd8b5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 21:01:58 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 21:03:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f47fece

dev-libs/libowfat: Cleanup old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-libs/libowfat/Manifest                         |  2 -
 .../libowfat/files/libowfat-0.28-GNUmakefile.patch | 10 -----
 dev-libs/libowfat/libowfat-0.29.ebuild             | 49 ----------------------
 dev-libs/libowfat/libowfat-0.30.ebuild             | 44 -------------------
 dev-libs/libowfat/libowfat-0.31.ebuild             | 44 -------------------
 5 files changed, 149 deletions(-)

diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index cabd228a735..81615514918 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,3 +1 @@
-DIST libowfat-0.29.tar.bz2 139489 BLAKE2B 16773fa9dc151d8d45fae301e1b57d74b0b1fb3348b2f999b4575b526e1b22f761cdc07145fe4d4543cff0be1789c5ffc353e7c26a130744116eb0badc40d366 SHA512 35b3be01f288a24ebf01e1f860bc2bba7431db890be1b117f9a7f0702532610d283f6e569b1a1d1e625a4fec3394d2c6ed5c2bf512a11c38ecf89cf89ec72136
-DIST libowfat-0.30.tar.xz 177368 BLAKE2B 31178f6fc6b515f09421797017950d6a4fc568b9c6ab8ccef07926e8400e877037fe652b162f1fcb551d2c0f6146f1744f2bd393957bd044e63c4a88ba65d51a SHA512 ce7b13266dbb0360aaeac62882e7138437507ea23b811c49a92b698a08ffb3afe9be6762c74cc1de7236c3d135c3cfaaa9236c7536e4183108747fc82bbb911b
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5

diff --git a/dev-libs/libowfat/files/libowfat-0.28-GNUmakefile.patch b/dev-libs/libowfat/files/libowfat-0.28-GNUmakefile.patch
deleted file mode 100644
index 03b8981876d..00000000000
--- a/dev-libs/libowfat/files/libowfat-0.28-GNUmakefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- GNUmakefile.bak	2011-10-22 22:08:53.443669478 -0700
-+++ GNUmakefile	2011-10-22 22:09:27.535002311 -0700
-@@ -277,6 +277,7 @@
- socket_accept4.o socket_accept6.o socket_connected.o socket_local4.o \
- socket_local6.o socket_recv4.o socket_recv6.o socket_remote4.o \
- socket_remote6.o: havesl.h
-+socket_remote4.o: havescope.h
- 
- dns_nd6.o fmt_xlong.o scan_xlong.o fmt_ip6_flat.o $(TEXTCODE_OBJS): haveinline.h
- 

diff --git a/dev-libs/libowfat/libowfat-0.29.ebuild b/dev-libs/libowfat/libowfat-0.29.ebuild
deleted file mode 100644
index 0197b92862a..00000000000
--- a/dev-libs/libowfat/libowfat-0.29.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
-SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
-HOMEPAGE="http://www.fefe.de/libowfat/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE="diet"
-
-RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	# Required for mult/umult64.c to be usable
-	append-flags -fomit-frame-pointer
-}
-
-src_prepare() {
-	sed -e "s:^CFLAGS.*:CFLAGS=-I. ${CFLAGS}:" \
-		-e "s:^DIET.*:DIET?=/usr/bin/diet -Os:" \
-		-e "s:^prefix.*:prefix=/usr:" \
-		-e "s:^INCLUDEDIR.*:INCLUDEDIR=\${prefix}/include/libowfat:" \
-		-i GNUmakefile || die "sed failed"
-	epatch "${FILESDIR}/libowfat-0.28-GNUmakefile.patch"
-}
-
-src_compile() {
-	emake -j1 \
-		CC=$(tc-getCC) \
-		$( use diet || echo 'DIET=' )
-}
-
-src_install () {
-	emake -j1 \
-		LIBDIR="${D}/usr/lib" \
-		MAN3DIR="${D}/usr/share/man/man3" \
-		INCLUDEDIR="${D}/usr/include/libowfat" \
-		install || die "emake install failed"
-
-	cd "${D}"/usr/share/man
-	mv man3/buffer.3 man3/owfat-buffer.3
-}

diff --git a/dev-libs/libowfat/libowfat-0.30.ebuild b/dev-libs/libowfat/libowfat-0.30.ebuild
deleted file mode 100644
index 912b3c76e8f..00000000000
--- a/dev-libs/libowfat/libowfat-0.30.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
-SRC_URI="http://www.fefe.de/libowfat/${P}.tar.xz"
-HOMEPAGE="http://www.fefe.de/libowfat/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="diet"
-
-RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	# Required for mult/umult64.c to be usable
-	append-flags -fomit-frame-pointer
-}
-
-src_compile() {
-	emake -j1 \
-		CC=$(tc-getCC) \
-		CFLAGS="-I. ${CFLAGS}" \
-		DIET="/usr/bin/diet -Os" \
-		prefix=/usr \
-		INCLUDEDIR=/usr/include/libowfat \
-		$( use diet || echo 'DIET=' )
-}
-
-src_install () {
-	emake -j1 \
-		LIBDIR="${D}/usr/lib" \
-		MAN3DIR="${D}/usr/share/man/man3" \
-		INCLUDEDIR="${D}/usr/include/libowfat" \
-		install || die "emake install failed"
-
-	cd "${D}"/usr/share/man
-	mv man3/buffer.3 man3/owfat-buffer.3
-}

diff --git a/dev-libs/libowfat/libowfat-0.31.ebuild b/dev-libs/libowfat/libowfat-0.31.ebuild
deleted file mode 100644
index 436ac0f8b93..00000000000
--- a/dev-libs/libowfat/libowfat-0.31.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
-SRC_URI="http://www.fefe.de/libowfat/${P}.tar.xz"
-HOMEPAGE="http://www.fefe.de/libowfat/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="diet"
-
-RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	# Required for mult/umult64.c to be usable
-	append-flags -fomit-frame-pointer
-}
-
-src_compile() {
-	emake -j1 \
-		CC=$(tc-getCC) \
-		CFLAGS="-I. ${CFLAGS}" \
-		DIET="/usr/bin/diet -Os" \
-		prefix=/usr \
-		INCLUDEDIR=/usr/include/libowfat \
-		$( use diet || echo 'DIET=' )
-}
-
-src_install () {
-	emake -j1 \
-		LIBDIR="${D}/usr/lib" \
-		MAN3DIR="${D}/usr/share/man/man3" \
-		INCLUDEDIR="${D}/usr/include/libowfat" \
-		install || die "emake install failed"
-
-	cd "${D}"/usr/share/man
-	mv man3/buffer.3 man3/owfat-buffer.3
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libowfat/, dev-libs/libowfat/files/
@ 2020-11-26 18:36 Sebastian Pipping
  0 siblings, 0 replies; 4+ messages in thread
From: Sebastian Pipping @ 2020-11-26 18:36 UTC (permalink / raw
  To: gentoo-commits

commit:     129f4ab9f8571c651937c46ba7bd4c82d6d052a2
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 18:33:02 2020 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 18:36:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=129f4ab9

dev-libs/libowfat: Fix compile with GCC 10 for www-servers/gatling

Closes: https://bugs.gentoo.org/756847
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.0, Repoman-2.3.23

 dev-libs/libowfat/files/libowfat-0.32-gcc10.patch | 25 ++++++++++++
 dev-libs/libowfat/libowfat-0.32-r2.ebuild         | 49 +++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/dev-libs/libowfat/files/libowfat-0.32-gcc10.patch b/dev-libs/libowfat/files/libowfat-0.32-gcc10.patch
new file mode 100644
index 00000000000..3f292430431
--- /dev/null
+++ b/dev-libs/libowfat/files/libowfat-0.32-gcc10.patch
@@ -0,0 +1,25 @@
+From 67729f54c2e7a24b2bebfa23b75afe607c09a67a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 26 Nov 2020 19:28:03 +0100
+Subject: [PATCH] Fix build with -fno-common or GCC 10
+
+---
+ io_internal.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/io_internal.h b/io_internal.h
+index 6d37c11..3e378d9 100644
+--- a/io_internal.h
++++ b/io_internal.h
+@@ -83,7 +83,7 @@ my_extern array io_pollfds;
+ my_extern long first_readable;
+ my_extern long first_writeable;
+ 
+-my_extern long first_deferred;
++extern long first_deferred;
+ 
+ my_extern enum __io_waitmode {
+   UNDECIDED,
+-- 
+2.27.0
+

diff --git a/dev-libs/libowfat/libowfat-0.32-r2.ebuild b/dev-libs/libowfat/libowfat-0.32-r2.ebuild
new file mode 100644
index 00000000000..6e711f600ef
--- /dev/null
+++ b/dev-libs/libowfat/libowfat-0.32-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
+SRC_URI="https://www.fefe.de/${PN}/${P}.tar.xz"
+HOMEPAGE="https://www.fefe.de/libowfat/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="diet"
+
+RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc10.patch
+)
+
+pkg_setup() {
+	# Required for mult/umult64.c to be usable
+	append-flags -fomit-frame-pointer
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="-I. ${CFLAGS}" \
+		DIET="${EPREFIX}/usr/bin/diet -Os" \
+		prefix="${EPREFIX}/usr" \
+		INCLUDEDIR="${EPREFIX}/usr/include" \
+		$( use diet || echo 'DIET=' )
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		MAN3DIR="${EPREFIX}/usr/share/man/man3" \
+		INCLUDEDIR="${EPREFIX}/usr/include" \
+		install
+
+	mv "${ED}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libowfat/, dev-libs/libowfat/files/
@ 2021-08-22  3:07 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-08-22  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     980727e322ee68cd912a2f00f491d3eb77d09f67
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Aug 20 13:10:28 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 03:07:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980727e3

dev-libs/libowfat: respect ar and ranlib settings from toolchain

Closes: https://bugs.gentoo.org/723036
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/22048
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libowfat/files/libowfat-0.32-ar.patch     | 66 ++++++++++++++++++++++
 ...wfat-0.32-r3.ebuild => libowfat-0.32-r4.ebuild} |  3 +
 2 files changed, 69 insertions(+)

diff --git a/dev-libs/libowfat/files/libowfat-0.32-ar.patch b/dev-libs/libowfat/files/libowfat-0.32-ar.patch
new file mode 100644
index 00000000000..c817f35ae7e
--- /dev/null
+++ b/dev-libs/libowfat/files/libowfat-0.32-ar.patch
@@ -0,0 +1,66 @@
+--- a/Makefile	2021-08-20 08:58:11.523401075 +0200
++++ b/Makefile	2021-08-20 08:58:38.122920942 +0200
+@@ -241,6 +242,8 @@
+ CROSS=
+ #CROSS=i686-mingw-
+ CC?=gcc
++AR?=ar
++RANLIB?=ranlib
+ CCC=$(CROSS)$(CC)
+ WERROR=
+ WARN=-W -Wall -Wextra $(WERROR)
+@@ -1092,8 +1296,8 @@
+ $(IO_OBJS) $(CDB_OBJS) $(CRITBIT_OBJS)
+ 
+ libowfat.a: $(ALL_OBJS)
+-	$(CROSS)ar cru $@ $(ALL_OBJS)
+-	-$(CROSS)ranlib $@
++	$(CROSS)$(AR) cru $@ $(ALL_OBJS)
++	-$(CROSS)$(RANLIB) $@
+ 
+ CFLAGS+=-I.
+ CFLAGS_OPT+=-I.
+@@ -1105,8 +1309,8 @@
+ 	$(DIET) $(CCC) -c $< $(CFLAGS)
+ 
+ %.a:
+-	$(CROSS)ar cru $@ $^
+-	-$(CROSS)ranlib $@
++	$(CROSS)$(AR) cru $@ $^
++	-$(CROSS)$(RANLIB) $@
+ 
+ t.o: t.c fmt.h scan.h str.h uint16.h uint32.h stralloc.h socket.h \
+   buffer.h ip4.h ip6.h byte.h mmap.h open.h textcode.h dns.h iopause.h \
+--- a/GNUmakefile	2021-08-20 08:58:11.523401075 +0200
++++ b/GNUmakefile	2021-08-20 08:58:38.122920942 +0200
+@@ -241,6 +242,8 @@
+ CROSS=
+ #CROSS=i686-mingw-
+ CC?=gcc
++AR?=ar
++RANLIB?=ranlib
+ CCC=$(CROSS)$(CC)
+ WERROR=
+ WARN=-W -Wall -Wextra $(WERROR)
+@@ -1092,8 +1296,8 @@
+ $(IO_OBJS) $(CDB_OBJS) $(CRITBIT_OBJS)
+ 
+ libowfat.a: $(ALL_OBJS)
+-	$(CROSS)ar cru $@ $(ALL_OBJS)
+-	-$(CROSS)ranlib $@
++	$(CROSS)$(AR) cru $@ $(ALL_OBJS)
++	-$(CROSS)$(RANLIB) $@
+ 
+ CFLAGS+=-I.
+ CFLAGS_OPT+=-I.
+@@ -1105,8 +1309,8 @@
+ 	$(DIET) $(CCC) -c $< $(CFLAGS)
+ 
+ %.a:
+-	$(CROSS)ar cru $@ $^
+-	-$(CROSS)ranlib $@
++	$(CROSS)$(AR) cru $@ $^
++	-$(CROSS)$(RANLIB) $@
+ 
+ t.o: t.c fmt.h scan.h str.h uint16.h uint32.h stralloc.h socket.h \
+   buffer.h ip4.h ip6.h byte.h mmap.h open.h textcode.h dns.h iopause.h \

diff --git a/dev-libs/libowfat/libowfat-0.32-r3.ebuild b/dev-libs/libowfat/libowfat-0.32-r4.ebuild
similarity index 93%
rename from dev-libs/libowfat/libowfat-0.32-r3.ebuild
rename to dev-libs/libowfat/libowfat-0.32-r4.ebuild
index a479ad55399..1d012c474e7 100644
--- a/dev-libs/libowfat/libowfat-0.32-r3.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r4.ebuild
@@ -19,6 +19,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc10.patch
+	"${FILESDIR}"/${P}-ar.patch
 )
 
 pkg_setup() {
@@ -29,6 +30,8 @@ pkg_setup() {
 src_compile() {
 	emake \
 		CC=$(tc-getCC) \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB) \
 		CFLAGS="-I. ${CFLAGS}" \
 		DIET="${EPREFIX}/usr/bin/diet -Os" \
 		prefix="${EPREFIX}/usr" \


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libowfat/, dev-libs/libowfat/files/
@ 2022-11-23  1:45 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-11-23  1:45 UTC (permalink / raw
  To: gentoo-commits

commit:     a8795f55e6a903eb911a303dfa6ab08e2330d703
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Nov 20 18:09:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 01:42:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8795f55

dev-libs/libowfat: prevent recompile during install

Somehow the patch to fix parallel compile broke the dependencies for the
installation. Fall back to serial compile and drop the bad patch instead.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/28352
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libowfat/files/libowfat-0.33-headerdeps.patch  | 82 ----------------------
 ...ibowfat-0.33.ebuild => libowfat-0.33-r1.ebuild} |  7 +-
 2 files changed, 3 insertions(+), 86 deletions(-)

diff --git a/dev-libs/libowfat/files/libowfat-0.33-headerdeps.patch b/dev-libs/libowfat/files/libowfat-0.33-headerdeps.patch
deleted file mode 100644
index df3d312e3b22..000000000000
--- a/dev-libs/libowfat/files/libowfat-0.33-headerdeps.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 3a34ab07a66da18cbe11321d451be701d814a167 Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eb@emlix.com>
-Date: Wed, 16 Nov 2022 15:22:00 +0100
-Subject: [PATCH] libowfat: fix header dependencies
-
----
- GNUmakefile | 44 +++++++++++++++-------------
- 1 file changed, 23 insertions(+), 21 deletions(-)
-
-diff --git a/GNUmakefile b/GNUmakefile
-index 67f8373..63f105b 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -46,7 +46,7 @@ CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT_PLUS)
- 
- #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
- 
--ent: ent.c haveuint128.h
-+ent: ent.c haveuint128.h headers
- 	$(CC) -g -o ent ent.c -I.
- 
- # CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2
-@@ -110,34 +110,36 @@ IO_OBJS=$(patsubst io/%.c,%.o,$(wildcard io/*.c))
- CDB_OBJS=$(patsubst cdb/%.c,%.o,$(wildcard cdb/*.c))
- CRITBIT_OBJS=$(patsubst critbit/%.c,%.o,$(wildcard critbit/*.c))
- 
--$(BYTE_OBJS): byte.h
--$(FMT_OBJS): fmt.h
--$(SCAN_OBJS): scan.h haveuint128.h
--$(STR_OBJS): str.h
-+$(BYTE_OBJS): byte.h headers
-+$(FMT_OBJS): fmt.h headers
-+$(SCAN_OBJS): scan.h haveuint128.h headers
-+$(STR_OBJS): str.h headers
- $(UINT_OBJS): uint16.h uint32.h
--$(STRALLOC_OBJS): stralloc.h
--$(SOCKET_OBJS): socket.h
--$(BUFFER_OBJS): buffer.h
--$(MMAP_OBJS): mmap.h open.h
--$(TEXTCODE_OBJS): textcode.h
--$(TAI_OBJS): tai.h uint64.h
--$(TAIA_OBJS): taia.h tai.h uint64.h
--$(DNS_OBJS): dns.h stralloc.h taia.h tai.h uint64.h iopause.h
--$(CASE_OBJS): case.h
--$(ARRAY_OBJS): uint64.h array.h
--$(MULT_OBJS): uint64.h uint32.h uint16.h safemult.h
--$(IO_OBJS): uint64.h array.h io.h io_internal.h taia.h tai.h haveepoll.h havekqueue.h havesigio.h havebsdsf.h havedevpoll.h havesendfile.h
--$(CDB_OBJS): cdb.h uint32.h
--$(CRITBIT_OBJS): critbit.h
-+$(OPEN_OBJS): open.h headers
-+$(STRALLOC_OBJS): stralloc.h headers
-+$(UNIX_OBJS): headers
-+$(SOCKET_OBJS): socket.h headers
-+$(BUFFER_OBJS): buffer.h headers
-+$(MMAP_OBJS): mmap.h open.h headers
-+$(TEXTCODE_OBJS): textcode.h headers
-+$(TAI_OBJS): tai.h uint64.h headers
-+$(TAIA_OBJS): taia.h tai.h uint64.h headers
-+$(DNS_OBJS): dns.h stralloc.h taia.h tai.h uint64.h iopause.h headers
-+$(CASE_OBJS): case.h headers
-+$(ARRAY_OBJS): uint64.h array.h headers
-+$(MULT_OBJS): uint64.h uint32.h uint16.h safemult.h rangecheck.h headers
-+$(IO_OBJS): uint64.h array.h io.h io_internal.h taia.h tai.h haveepoll.h havekqueue.h havesigio.h havebsdsf.h havedevpoll.h havesendfile.h headers
-+$(CDB_OBJS): cdb.h uint32.h headers
-+$(CRITBIT_OBJS): critbit.h headers
- 
- mult64.o: haveuint128.h
- 
- 
--iob_addbuf.o iob_addfile.o iob_new.o iob_reset.o iob_send.o: iob_internal.h iob.h
-+iob_addbuf.o iob_addfile.o iob_new.o iob_reset.o iob_send.o: iob_internal.h iob.h headers
- 
- iopause.o: iopause.h select.h
- openreadclose.o readclose.o: readclose.h
--dns_rcip.o dns_rcrw.o openreadclose.o: openreadclose.h
-+dns_rcip.o dns_rcrw.o openreadclose.o: openreadclose.h headers
- 
- iob_send.o scan_ip6if.o: havealloca.h
- 
--- 
-2.38.1
-

diff --git a/dev-libs/libowfat/libowfat-0.33.ebuild b/dev-libs/libowfat/libowfat-0.33-r1.ebuild
similarity index 95%
rename from dev-libs/libowfat/libowfat-0.33.ebuild
rename to dev-libs/libowfat/libowfat-0.33-r1.ebuild
index fb74b9b387c4..140aed4ff868 100644
--- a/dev-libs/libowfat/libowfat-0.33.ebuild
+++ b/dev-libs/libowfat/libowfat-0.33-r1.ebuild
@@ -17,16 +17,15 @@ IUSE="diet"
 RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-headerdeps.patch
-)
-
 pkg_setup() {
 	# Required for mult/umult64.c to be usable
 	append-flags -fomit-frame-pointer
 }
 
 src_compile() {
+	# workaround for broken dependencies
+	emake headers
+
 	emake \
 		CC="$(tc-getCC)" \
 		AR="$(tc-getAR)" \


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-23  1:45 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-26 18:36 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libowfat/, dev-libs/libowfat/files/ Sebastian Pipping
  -- strict thread matches above, loose matches on Subject: below --
2022-11-23  1:45 Sam James
2021-08-22  3:07 Sam James
2017-12-20 21:03 Thomas Deutschmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox