summaryrefslogtreecommitdiff
path: root/dev-libs/libowfat
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-08-26 00:09:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-08-26 00:09:36 +0100
commitb1c81de4fadbd00897700a7321f03b390d952b2e (patch)
treee6cc812351d4f105c110cfc363ebb497e996f47a /dev-libs/libowfat
parent7c59acba5699c9c58090a7a738669669a7307023 (diff)
gentoo resync : 26.08.2021
Diffstat (limited to 'dev-libs/libowfat')
-rw-r--r--dev-libs/libowfat/Manifest3
-rw-r--r--dev-libs/libowfat/files/libowfat-0.32-ar.patch66
-rw-r--r--dev-libs/libowfat/libowfat-0.32-r4.ebuild (renamed from dev-libs/libowfat/libowfat-0.32-r3.ebuild)3
3 files changed, 71 insertions, 1 deletions
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 208ebcdae766..c60ff77208e1 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,5 +1,6 @@
+AUX libowfat-0.32-ar.patch 1564 BLAKE2B 43477182d5ea37327376511ff1f6a4db9ac117a11a6246be1e016b6b6e363432d959d2a986a604cce15a2a6d58558dc4627b0824624aae707f127dbfd43e5da8 SHA512 9945333b6cb9bf68242e6053a8634595e226031557309e190ac9ada860019daac8f11c562a661a60ec1cfd91d0502416006d13e877f8429acb0b653a6cccfa98
AUX libowfat-0.32-gcc10.patch 633 BLAKE2B fdafa991694156b4c9bd93a6ad1a77b8673c9b176735da0bf525faf2549336121e4ca6a17dd7a35e58292ed6fc66ea176656b7cb97884f1fff3400194de3ef00 SHA512 ba3eef982f8345a96b2612bfbb8a97dc6477b21a58a35cda513ecdcd346b0cbf752574d565003f1d6887cda4467d8efc5777aa4d80fd50f731d35387028cda84
DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
EBUILD libowfat-0.32-r1.ebuild 1039 BLAKE2B 534907ee194eff327e07f903df0f5dc5728572b013fca29e583aa3df3e852db91c3145f2f2d604b0017963d8423a0c946c2eaeff93da0785f486da939e055047 SHA512 71e1d1a579943fe2b1d53c22ed23c579745ab3d4d058033d7a789563ac0ead400039232472a116ae9abb7ee83df3421d7a43dadbca187567bd8fdac2157b3e86
-EBUILD libowfat-0.32-r3.ebuild 1070 BLAKE2B 09d4b580db801b1edb865a8fde62afab1ed4b1c71927347964b2b606d874b8c25b49c7486c674a302222d50897b1441e869446d65c654facb0a37d62e06355f1 SHA512 dee868478c6106c7a43fee48ae5d57441727ba167646091fa23d92f56cf483bd9ca36a1b78225b086a51f625fec61a3db9697249661c4a0905278f123e7904cb
+EBUILD libowfat-0.32-r4.ebuild 1145 BLAKE2B 9877439631aa915a175f5b330aa72658577fcab6db8743c42213ea1909dfac29b2b2e5e3f2a8608eb386cf7e39140f88af2e2b4f5dc26485b0c2dff3e4373be9 SHA512 8eb2fe2102caa6b92e15a89a46c61befcb4aae36a74ceab5c7d5b42670de640497f41f2484c8aff99ed9ab34d6ba10339eb759fb980201cc38f6d983b2d19c72
MISC metadata.xml 479 BLAKE2B 166384450dec36385a099401c817ed00304ebab0aef309370dd35a12f0d1cee8b0be21b47248cfb89856add59b1e056aea591ada19950bc53bac8892fc67e9aa SHA512 aa3268660002f53d5b07d1ad9fc537f7613e5b9080fd26a905a9ef1dae0952c92e2140184230283de17d2882674dd4b7fc6efa42f1c09ed341830ecd93e0f32e
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 000000000000..c817f35ae7e7
--- /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
index a479ad553991..1d012c474e76 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" \