commit: 2990abfcf26b5be52767550acc6695263bf28b85 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sat Jun 18 02:07:01 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 20 02:03:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2990abfc
dev-libs/libmpack: Fix build with rlibtool The build uses libtool, but does not use autoconf meaning the libtool script is never generated and the build falls back to the system version. This is problematic with rlibtool which depends on the generated libtool to determine if it should build shared or static libraries. This patch fixes the issue by creating a minimal configure.ac only for libtool. Bug: https://bugs.gentoo.org/778899 Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/25950 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libmpack/files/libmpack-1.0.5-libtool.patch | 89 ++++++++++++++++++++++ dev-libs/libmpack/libmpack-1.0.5-r3.ebuild | 63 +++++++++++++++ 2 files changed, 152 insertions(+) diff --git a/dev-libs/libmpack/files/libmpack-1.0.5-libtool.patch b/dev-libs/libmpack/files/libmpack-1.0.5-libtool.patch new file mode 100644 index 000000000000..59ebd91fc9e4 --- /dev/null +++ b/dev-libs/libmpack/files/libmpack-1.0.5-libtool.patch @@ -0,0 +1,89 @@ +https://bugs.gentoo.org/778899 + +Author: orbea <or...@riseup.net> +Date: Fri Jun 17 17:29:51 2022 -0700 + + configure: Add minimal configure.ac for libtool + +diff --git a/Makefile b/Makefile.in +similarity index 92% +rename from Makefile +rename to Makefile.in +index 76cfd35..2c05a99 100644 +--- a/Makefile ++++ b/Makefile.in +@@ -4,11 +4,9 @@ + config ?= debug + SYSTEM ?= $(shell uname -s) + +-ifeq ($(SYSTEM),Darwin) +- LIBTOOL ?= glibtool +-else +- LIBTOOL ?= libtool +-endif ++top_builddir = @top_builddir@ ++ ++LIBTOOL := @LIBTOOL@ + + ifneq ($(VERBOSE),1) + LIBTOOL += --quiet +@@ -33,11 +31,11 @@ else + XCFLAGS += -std=c99 + endif + +-NAME := mpack +-MAJOR := 1 +-MINOR := 0 +-PATCH := 3 +-VERSION := $(MAJOR).$(MINOR).$(PATCH) ++NAME := @PACKAGE_NAME@ ++MAJOR := @MAJOR@ ++MINOR := @MINOR@ ++PATCH := @PATCH@ ++VERSION := @PACKAGE_VERSION@ + + LT_REVISION=0 + LT_CURRENT=0 +@@ -130,6 +128,11 @@ clean: + $(TOBJ): XCFLAGS := $(filter-out $(TEST_FILTER_OUT),$(XCFLAGS)) \ + -std=gnu99 -Wno-conversion -Wno-unused-parameter + ++$(OUTDIR)/.tag: ++ @mkdir -p $(OUTDIR)/$(SRCDIR) ++ @mkdir -p $(OUTDIR)/$(TESTDIR)/deps/tap ++ @touch $@ ++ + $(COVOUT): $(SRC) $(TSRC) + find $(OUTDIR) -type f -name '*.gcda' -print0 | xargs -0 rm -f + $(MAKE) CFLAGS='-DNDEBUG -g --coverage' LDFLAGS=--coverage config=$(config) test +@@ -142,7 +145,7 @@ $(PROFOUT): $(SRC) $(TSRC) + gprof $(OUTDIR)/run-tests gmon.out > $@ + rm gmon.out + +-$(OUTDIR)/%.lo: %.c $(AMALG) ++$(OUTDIR)/%.lo: %.c $(AMALG) $(OUTDIR)/.tag + @echo compile $< =\> $@ + @$(LIBTOOL) --mode=compile --tag=CC $(CC) $(XCFLAGS) $(CFLAGS) -o $@ -c $< + +diff --git a/configure.ac b/configure.ac +new file mode 100644 +index 0000000..d2f02e7 +--- /dev/null ++++ b/configure.ac +@@ -0,0 +1,16 @@ ++m4_define([MAJOR], [1]) ++m4_define([MINOR], [0]) ++m4_define([PATCH], [5]) ++ ++AC_INIT([mpack], [MAJOR.MINOR.PATCH]) ++AC_CONFIG_FILES([Makefile]) ++ ++LT_INIT ++ ++AC_SUBST([top_builddir], [$abs_builddir]) ++ ++AC_SUBST([MAJOR], [MAJOR]) ++AC_SUBST([MINOR], [MINOR]) ++AC_SUBST([PATCH], [PATCH]) ++ ++AC_OUTPUT diff --git a/dev-libs/libmpack/libmpack-1.0.5-r3.ebuild b/dev-libs/libmpack/libmpack-1.0.5-r3.ebuild new file mode 100644 index 000000000000..ee84302d76e2 --- /dev/null +++ b/dev-libs/libmpack/libmpack-1.0.5-r3.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Simple implementation of msgpack in C" +HOMEPAGE="https://github.com/libmpack/libmpack"; +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" + +PATCHES=( + "${FILESDIR}"/${P}-libtool.patch # 778899 +) + +src_prepare() { + default + + # Respect users CFLAGS + sed -e 's/-ggdb//g' -i Makefile.in || die + sed -e 's/-O3//g' -i .config/release.mk || die + + eautoreconf +} + +src_compile() { + local myemakeargs=( + "VERBOSE=1" + "PREFIX=${EPREFIX}/usr" + "CC=$(tc-getCC)" + "config=release" + "LIBDIR=/usr/$(get_libdir)" + ) + + emake "${myemakeargs[@]}" lib-bin +} + +src_test() { + emake VERBOSE=1 XLDFLAGS="-shared" test +} + +src_install() { + local myemakeargs=( + "VERBOSE=1" + "PREFIX=${EPREFIX}/usr" + "DESTDIR=${ED}" + "LIBDIR=/usr/$(get_libdir)" + "XLDFLAGS=-shared" + ) + + emake "${myemakeargs[@]}" install + + if [[ ${CHOST} == *-darwin* ]] ; then + local file="libmpack.0.0.0.dylib" + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name" + fi + + find "${ED}" -name '*.la' -delete || die +}
