| 1 |
commit: 980727e322ee68cd912a2f00f491d3eb77d09f67 |
| 2 |
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> |
| 3 |
AuthorDate: Fri Aug 20 13:10:28 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 22 03:07:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980727e3 |
| 7 |
|
| 8 |
dev-libs/libowfat: respect ar and ranlib settings from toolchain |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/723036 |
| 11 |
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/22048 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-libs/libowfat/files/libowfat-0.32-ar.patch | 66 ++++++++++++++++++++++ |
| 16 |
...wfat-0.32-r3.ebuild => libowfat-0.32-r4.ebuild} | 3 + |
| 17 |
2 files changed, 69 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-libs/libowfat/files/libowfat-0.32-ar.patch b/dev-libs/libowfat/files/libowfat-0.32-ar.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..c817f35ae7e |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-libs/libowfat/files/libowfat-0.32-ar.patch |
| 24 |
@@ -0,0 +1,66 @@ |
| 25 |
+--- a/Makefile 2021-08-20 08:58:11.523401075 +0200 |
| 26 |
++++ b/Makefile 2021-08-20 08:58:38.122920942 +0200 |
| 27 |
+@@ -241,6 +242,8 @@ |
| 28 |
+ CROSS= |
| 29 |
+ #CROSS=i686-mingw- |
| 30 |
+ CC?=gcc |
| 31 |
++AR?=ar |
| 32 |
++RANLIB?=ranlib |
| 33 |
+ CCC=$(CROSS)$(CC) |
| 34 |
+ WERROR= |
| 35 |
+ WARN=-W -Wall -Wextra $(WERROR) |
| 36 |
+@@ -1092,8 +1296,8 @@ |
| 37 |
+ $(IO_OBJS) $(CDB_OBJS) $(CRITBIT_OBJS) |
| 38 |
+ |
| 39 |
+ libowfat.a: $(ALL_OBJS) |
| 40 |
+- $(CROSS)ar cru $@ $(ALL_OBJS) |
| 41 |
+- -$(CROSS)ranlib $@ |
| 42 |
++ $(CROSS)$(AR) cru $@ $(ALL_OBJS) |
| 43 |
++ -$(CROSS)$(RANLIB) $@ |
| 44 |
+ |
| 45 |
+ CFLAGS+=-I. |
| 46 |
+ CFLAGS_OPT+=-I. |
| 47 |
+@@ -1105,8 +1309,8 @@ |
| 48 |
+ $(DIET) $(CCC) -c $< $(CFLAGS) |
| 49 |
+ |
| 50 |
+ %.a: |
| 51 |
+- $(CROSS)ar cru $@ $^ |
| 52 |
+- -$(CROSS)ranlib $@ |
| 53 |
++ $(CROSS)$(AR) cru $@ $^ |
| 54 |
++ -$(CROSS)$(RANLIB) $@ |
| 55 |
+ |
| 56 |
+ t.o: t.c fmt.h scan.h str.h uint16.h uint32.h stralloc.h socket.h \ |
| 57 |
+ buffer.h ip4.h ip6.h byte.h mmap.h open.h textcode.h dns.h iopause.h \ |
| 58 |
+--- a/GNUmakefile 2021-08-20 08:58:11.523401075 +0200 |
| 59 |
++++ b/GNUmakefile 2021-08-20 08:58:38.122920942 +0200 |
| 60 |
+@@ -241,6 +242,8 @@ |
| 61 |
+ CROSS= |
| 62 |
+ #CROSS=i686-mingw- |
| 63 |
+ CC?=gcc |
| 64 |
++AR?=ar |
| 65 |
++RANLIB?=ranlib |
| 66 |
+ CCC=$(CROSS)$(CC) |
| 67 |
+ WERROR= |
| 68 |
+ WARN=-W -Wall -Wextra $(WERROR) |
| 69 |
+@@ -1092,8 +1296,8 @@ |
| 70 |
+ $(IO_OBJS) $(CDB_OBJS) $(CRITBIT_OBJS) |
| 71 |
+ |
| 72 |
+ libowfat.a: $(ALL_OBJS) |
| 73 |
+- $(CROSS)ar cru $@ $(ALL_OBJS) |
| 74 |
+- -$(CROSS)ranlib $@ |
| 75 |
++ $(CROSS)$(AR) cru $@ $(ALL_OBJS) |
| 76 |
++ -$(CROSS)$(RANLIB) $@ |
| 77 |
+ |
| 78 |
+ CFLAGS+=-I. |
| 79 |
+ CFLAGS_OPT+=-I. |
| 80 |
+@@ -1105,8 +1309,8 @@ |
| 81 |
+ $(DIET) $(CCC) -c $< $(CFLAGS) |
| 82 |
+ |
| 83 |
+ %.a: |
| 84 |
+- $(CROSS)ar cru $@ $^ |
| 85 |
+- -$(CROSS)ranlib $@ |
| 86 |
++ $(CROSS)$(AR) cru $@ $^ |
| 87 |
++ -$(CROSS)$(RANLIB) $@ |
| 88 |
+ |
| 89 |
+ t.o: t.c fmt.h scan.h str.h uint16.h uint32.h stralloc.h socket.h \ |
| 90 |
+ buffer.h ip4.h ip6.h byte.h mmap.h open.h textcode.h dns.h iopause.h \ |
| 91 |
|
| 92 |
diff --git a/dev-libs/libowfat/libowfat-0.32-r3.ebuild b/dev-libs/libowfat/libowfat-0.32-r4.ebuild |
| 93 |
similarity index 93% |
| 94 |
rename from dev-libs/libowfat/libowfat-0.32-r3.ebuild |
| 95 |
rename to dev-libs/libowfat/libowfat-0.32-r4.ebuild |
| 96 |
index a479ad55399..1d012c474e7 100644 |
| 97 |
--- a/dev-libs/libowfat/libowfat-0.32-r3.ebuild |
| 98 |
+++ b/dev-libs/libowfat/libowfat-0.32-r4.ebuild |
| 99 |
@@ -19,6 +19,7 @@ DEPEND="${RDEPEND}" |
| 100 |
|
| 101 |
PATCHES=( |
| 102 |
"${FILESDIR}"/${P}-gcc10.patch |
| 103 |
+ "${FILESDIR}"/${P}-ar.patch |
| 104 |
) |
| 105 |
|
| 106 |
pkg_setup() { |
| 107 |
@@ -29,6 +30,8 @@ pkg_setup() { |
| 108 |
src_compile() { |
| 109 |
emake \ |
| 110 |
CC=$(tc-getCC) \ |
| 111 |
+ AR=$(tc-getAR) \ |
| 112 |
+ RANLIB=$(tc-getRANLIB) \ |
| 113 |
CFLAGS="-I. ${CFLAGS}" \ |
| 114 |
DIET="${EPREFIX}/usr/bin/diet -Os" \ |
| 115 |
prefix="${EPREFIX}/usr" \ |
Archives