commit: 1baab4b640ed925d97e91f0e768abe39c87777b8 Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> AuthorDate: Wed Nov 16 16:44:21 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Nov 17 23:27:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1baab4b6
dev-libs/libowfat: bump to 0.33 Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> Closes: https://github.com/gentoo/gentoo/pull/28306 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libowfat/Manifest | 1 + .../libowfat/files/libowfat-0.33-headerdeps.patch | 82 ++++++++++++++++++++++ dev-libs/libowfat/libowfat-0.33.ebuild | 50 +++++++++++++ 3 files changed, 133 insertions(+) diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest index f10b19ebb8e9..829ac2cdc3c6 100644 --- a/dev-libs/libowfat/Manifest +++ b/dev-libs/libowfat/Manifest @@ -1 +1,2 @@ DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b +DIST libowfat-0.33.tar.xz 213920 BLAKE2B f902279ae2be96a24ff8760e082a16058db06d20f8e9b55ee54731035f142eb1d9058633be31bc975a3916a44d8d1d4372c2b594e317f5957bff32150aa60785 SHA512 03a56bcbc1a58e340c473d260877218a35841a6915a8369381d74463244cd754fc736006344814855c4d33598ad811d51b7fff4ba41c5e6d38d56297903dcaf5 diff --git a/dev-libs/libowfat/files/libowfat-0.33-headerdeps.patch b/dev-libs/libowfat/files/libowfat-0.33-headerdeps.patch new file mode 100644 index 000000000000..df3d312e3b22 --- /dev/null +++ b/dev-libs/libowfat/files/libowfat-0.33-headerdeps.patch @@ -0,0 +1,82 @@ +From 3a34ab07a66da18cbe11321d451be701d814a167 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer <e...@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.ebuild new file mode 100644 index 000000000000..fb74b9b387c4 --- /dev/null +++ b/dev-libs/libowfat/libowfat-0.33.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +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}" + +PATCHES=( + "${FILESDIR}"/${P}-headerdeps.patch +) + +pkg_setup() { + # Required for mult/umult64.c to be usable + append-flags -fomit-frame-pointer +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + 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 +}
