diff options
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libowfat/files/libowfat-0.32-ar.patch | 66 | ||||
| -rw-r--r-- | dev-libs/libowfat/libowfat-0.32-r4.ebuild (renamed from dev-libs/libowfat/libowfat-0.32-r3.ebuild) | 3 |
2 files changed, 69 insertions, 0 deletions
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" \ |