commit: 65fcc50086bba795f212f918479c99d4c74f6a50 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Dec 2 21:17:11 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 2 21:22:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65fcc500
sys-libs/libunwind: add 1.8.0_rc1 (unkeyworded) Bug: https://bugs.gentoo.org/918969 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/libunwind/Manifest | 1 + .../libunwind-1.8.0_rc1-configure-bashism.patch | 21 +++++++++++++++++++ ...wind-9999.ebuild => libunwind-1.8.0_rc1.ebuild} | 24 +++++++++++++++------- sys-libs/libunwind/libunwind-9999.ebuild | 7 +++++-- 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest index b40120edf128..6accc5696763 100644 --- a/sys-libs/libunwind/Manifest +++ b/sys-libs/libunwind/Manifest @@ -3,3 +3,4 @@ DIST libunwind-1.6.2-loong.patch.xz 122756 BLAKE2B 1d369d18e71c4b9faa79a31a917a0 DIST libunwind-1.6.2.tar.gz 901392 BLAKE2B 3d0313f7e92cbc3e1a84ad3831a5170f21cdf772f1697ca0a59dea63cdd47da382e9f1fd77325d9ff8bcd47559a425dc883a820c646c628cd00faed82cb0f83f SHA512 1d17dfb14f99a894a6cda256caf9ec481c14068aaf8f3a85fa3befa7c7cca7fca0f544a91a3a7c2f2fc55bab19b06a67ca79f55ac9081151d94478c7f611f8f7 DIST libunwind-1.7.1-docs.tar.xz 27248 BLAKE2B 0905f49ce72e6cafbb185828a4adf7eb5a88ede335104b1b0679e66199079e3dad9d83815d10a864b4480d88abd82b73bb71181962b1fea39ec41f534d78d549 SHA512 d786572e7fbd5ef7852712f592bd17d4110951083991c5ffcff2bb4ae91e4519b42743f848fe7f2cc9f72d8a0240531ec3d27806972c2c309d06a9048284b97b DIST libunwind-1.7.2.tar.gz 912590 BLAKE2B 519570a02d06ce4a174ca226941e493499054112de1c92938434e9fb56fabc8446f699a886ea8beee672ac5e28acd03d16169257a43e2ee1bab084fb331ef4cf SHA512 903f7e26c7d4c22e6ef4fe8954ca0f153fdf346cec40e1e8f7ab966d251110f4deb0a84d1fd150aee194ed966b5c1e01ee27c821cd043859852da33a94faae1f +DIST libunwind-1.8.0-rc1.tar.gz 977482 BLAKE2B 0cf4dde187b68a2ba642fc588fcb020bf3e631584d4cac888972f714e7c4ce7a88e10a4c816eadec2051f318a196c61f6c3b4ba5e8ebf17ce4e10ff61e6cd0c5 SHA512 0d9cd896a90ea6e36a9a8aeb049ce71ec3a893fcf991533a79bb663c54b0f4b1f04c7b306c06c56e809f829a42284655d52c9fec3d88c60c37f06681dd99d9e3 diff --git a/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch b/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch new file mode 100644 index 000000000000..b4e36d71efdc --- /dev/null +++ b/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch @@ -0,0 +1,21 @@ +https://github.com/libunwind/libunwind/pull/675 + +From ac81d339a7999e054deda2c0041c01424df3eadd Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Sat, 2 Dec 2023 21:18:44 +0000 +Subject: [PATCH] configure.ac: fix bashism in LDFLAGS append + +'+=' is not required for POSIX shells and may not work with e.g. /bin/sh +provided by dash. Just expand it instead. +--- a/configure.ac ++++ b/configure.ac +@@ -54,7 +54,7 @@ dnl Checks for libraries. + AC_MSG_NOTICE([--- Checking for libraries ---]) + save_LDFLAGS="$LDFLAGS" + save_LIBS="$LIBS" +-LDFLAGS+=" -nostdlib" ++LDFLAGS="${LDFLAGS} -nostdlib" + AC_SEARCH_LIBS([_Unwind_Resume], [gcc_s gcc], + [AS_IF([test "$ac_cv_search__Unwind_Resume" != "none required"], + [AC_SUBST([LIBCRTS], ["$ac_cv_search__Unwind_Resume"])])], + diff --git a/sys-libs/libunwind/libunwind-9999.ebuild b/sys-libs/libunwind/libunwind-1.8.0_rc1.ebuild similarity index 88% copy from sys-libs/libunwind/libunwind-9999.ebuild copy to sys-libs/libunwind/libunwind-1.8.0_rc1.ebuild index f851e69da60a..a8d8ee1b3c83 100644 --- a/sys-libs/libunwind/libunwind-9999.ebuild +++ b/sys-libs/libunwind/libunwind-1.8.0_rc1.ebuild @@ -6,14 +6,14 @@ EAPI=8 # Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libunwind-docs # Set to 1 if prebuilt, 0 if not # (the construct below is to allow overriding from env for script) -: ${LIBUNWIND_DOCS_PREBUILT:=1} +: ${LIBUNWIND_DOCS_PREBUILT:=0} LIBUNWIND_DOCS_PREBUILT_DEV=sam LIBUNWIND_DOCS_VERSION=1.7.1 # Default to generating docs (inc. man pages) if no prebuilt; overridden later LIBUNWIND_DOCS_USEFLAG="+doc" -inherit multilib-minimal +inherit autotools multilib-minimal DESCRIPTION="Portable and efficient API to determine the call-chain of a program" HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"; @@ -24,12 +24,15 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/libunwind/libunwind"; inherit autotools git-r3 else - SRC_URI="https://github.com/libunwind/libunwind/releases/download/v${PV}/${P}.tar.gz"; + SRC_URI="https://github.com/libunwind/libunwind/releases/download/v${PV/_rc/-rc}/${P/_rc/-rc}.tar.gz"; if [[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] ; then SRC_URI+=" !doc? ( https://dev.gentoo.org/~${LIBUNWIND_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBUNWIND_DOCS_VERSION}-docs.tar.xz )" fi + S="${WORKDIR}"/${P/_rc/-rc} - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 -sparc ~x86 ~amd64-linux ~x86-linux" + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 -sparc ~x86 ~amd64-linux ~x86-linux" + fi fi [[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] && LIBUNWIND_DOCS_USEFLAG="doc" @@ -71,14 +74,21 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libunwind-x86_64.h ) +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0_rc1-configure-bashism.patch +) + src_prepare() { default chmod +x src/ia64/mk_cursor_i || die - if [[ ${PV} == 9999 ]] ; then - eautoreconf - fi + #if [[ ${PV} == 9999 ]] ; then + # eautoreconf + #fi + + # temporarily for bashism patch + eautoreconf } multilib_src_configure() { diff --git a/sys-libs/libunwind/libunwind-9999.ebuild b/sys-libs/libunwind/libunwind-9999.ebuild index f851e69da60a..a3d63d421da6 100644 --- a/sys-libs/libunwind/libunwind-9999.ebuild +++ b/sys-libs/libunwind/libunwind-9999.ebuild @@ -24,12 +24,15 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/libunwind/libunwind"; inherit autotools git-r3 else - SRC_URI="https://github.com/libunwind/libunwind/releases/download/v${PV}/${P}.tar.gz"; + SRC_URI="https://github.com/libunwind/libunwind/releases/download/v${PV/_rc/-rc}/${P/_rc/-rc}.tar.gz"; if [[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] ; then SRC_URI+=" !doc? ( https://dev.gentoo.org/~${LIBUNWIND_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBUNWIND_DOCS_VERSION}-docs.tar.xz )" fi + S="${WORKDIR}"/${P/_rc/-rc} - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 -sparc ~x86 ~amd64-linux ~x86-linux" + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 -sparc ~x86 ~amd64-linux ~x86-linux" + fi fi [[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] && LIBUNWIND_DOCS_USEFLAG="doc"
