commit: 8556ea8399e782d2c13a15719c58a153c645b3c6 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Fri Dec 25 13:03:18 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Fri Dec 25 13:28:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8556ea83
sys-block/open-isns: respect AR Closes: https://bugs.gentoo.org/721492 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> .../files/open-isns-0.100-respect-AR.patch | 30 ++++++++++++++++++++++ sys-block/open-isns/open-isns-0.100.ebuild | 2 ++ 2 files changed, 32 insertions(+) diff --git a/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch b/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch new file mode 100644 index 00000000000..66e52e54812 --- /dev/null +++ b/sys-block/open-isns/files/open-isns-0.100-respect-AR.patch @@ -0,0 +1,30 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -33,6 +33,7 @@ else + SOLIB_VERSION_OPTS = + endif + ++AR = @AR@ + CC = @CC@ + CPPFLAGS= @CPPFLAGS@ + CFLAGS = @CFLAGS@ -I. -Iinclude -I$(srcdir) -I$(srcdir)/include +@@ -161,7 +162,7 @@ solib-message.o: message.c + + ifeq ($(BUILD_STATIC),1) + $(LIB): $(LIBOBJS) +- ar cr $@ $(LIBOBJS) ++ $(AR) cr $@ $(LIBOBJS) + else + $(LIB): + endif +--- a/configure.ac ++++ b/configure.ac +@@ -4,6 +4,7 @@ AC_CONFIG_AUX_DIR([aclocal]) + + AC_CONFIG_HEADER(config.h) + ++AM_PROG_AR + AC_PROG_CC + AC_CANONICAL_HOST + AC_C_BIGENDIAN + diff --git a/sys-block/open-isns/open-isns-0.100.ebuild b/sys-block/open-isns/open-isns-0.100.ebuild index 878669c9073..63213dbfd79 100644 --- a/sys-block/open-isns/open-isns-0.100.ebuild +++ b/sys-block/open-isns/open-isns-0.100.ebuild @@ -25,6 +25,8 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-0.98-libressl-compatibility.patch" + "${FILESDIR}/${PN}-0.100-respect-AR.patch" + # Upstream patches (can usually be removed with next version bump) "${FILESDIR}"/${P}-no_Werror.patch )
