diff options
Diffstat (limited to 'dev-libs/libbytesize')
-rw-r--r-- | dev-libs/libbytesize/Manifest | 5 | ||||
-rw-r--r-- | dev-libs/libbytesize/files/libbytesize-2.6-configure-bashism.patch | 31 | ||||
-rw-r--r-- | dev-libs/libbytesize/libbytesize-2.5.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/libbytesize/libbytesize-2.6.ebuild | 3 |
4 files changed, 38 insertions, 5 deletions
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest index 9f339a52c73d..5d0ebe9807da 100644 --- a/dev-libs/libbytesize/Manifest +++ b/dev-libs/libbytesize/Manifest @@ -1,6 +1,7 @@ AUX libbytesize-2.4-no_Werror.patch 827 BLAKE2B a9192908e7ec0bad0cd4d1f853fd6f48a17977380d6f2e6a0c8255058d1e3ebecbfdaff68311f70f8d26291ed0c917dafb8f7d85fd5ad8f097ea929f4a200677 SHA512 6972e86cdc8de7f27b850742c4e0d8c492e354c1a526e103f4f4ec080cc6543db7ad4abd54a9674807521d083eb19fa811e351942330a73591e0a9700e876bd7 +AUX libbytesize-2.6-configure-bashism.patch 1239 BLAKE2B c579abd45db89e2c252be853edc2306b7c29ea4d74d9c1aeb5f6d937456fb1386f19f7dc114d49959a89ecff641eb63473447478851f60d4a3dd169274af5577 SHA512 50e3f5adde12a809d7356429b39e8746045a88587e21111dfc988e723ee59207d1c786d2405c1a8309b9a92b47512845d11767ed84fd849b2c2b4fe169e7a79e DIST libbytesize-2.5.tar.gz 439194 BLAKE2B 8d2cd82cea1e95f3368eed5855abfbc89b410fe1d627f7cbe69974f0d1fc89b600c93ad242816a37c3585b8318fcce77ef0fe6ab349d10f34a8be4c69303e343 SHA512 730d9c84bfc7199424fa34de5037dd9187d60c1f32d82cedc3e395167bf39a98a3b7f20b15f154206e797144c11de05ae0f606e0af6a2157ed946f138a346ad6 DIST libbytesize-2.6.tar.gz 444795 BLAKE2B 5f89b2c614ebdd8efd3ac0841ad99c32309bdb33236373a0c9b007415a2f40ff30a0edcecb56947f2f41403cabb6a6bff68c2e4ce52e322df15d6daa3e10d2af SHA512 f6e72b763216c54c08318d090d604791c61cd5a3e683ffbe6e9d01de850661bd4e8a3adeb85c6fd0fb60244e2e128292cbae06c0aa2d1fe9f34104e64af8210e -EBUILD libbytesize-2.5.ebuild 1575 BLAKE2B ac0a761addd9cedaf39a8500a64ad66480a2febafc6ddb6e5cba6654303031339559cf20e6e9823da2530d70724419d663d81f786920ae38a26cf0f1964b33c1 SHA512 b56aca7cf6910ab870dd46d5e528146f7abbbee710980484a2bfbc447b3366e010a673af529e8ddedeec5d54b3181e9b562f317b07bfd6933f4e01cf52a7d689 -EBUILD libbytesize-2.6.ebuild 1582 BLAKE2B 8b30c4ed1009812f07725033170a350f3162d18ed6beb4cf995ccd85ef338a1d7f428dbf7bc5bdad86253574a55dcd0988dc5c7c61daec1d71b5ea077846ac45 SHA512 067a06bee9569fe831df2282aefb089ca882ef4a10d89a9fe936c12ecb292fe2007b5cab47158097333e0f2bdea51f169dc8e0364b1e3aba8846f1a45cc083df +EBUILD libbytesize-2.5.ebuild 1609 BLAKE2B 6508a1777cf4e28205e371a9bce0e669cb4a5db58af622f9ed1814e3036924ce60ae75aac6ad3ea16fb3bb3604e5f31180797947995e880d2c9a86791e36f794 SHA512 febcd1883b9cee736fb08632c77b10bdacb443e0c2177ecfcd305dbfd4437bcf3fba431081e822f2a33b7212faa3c63d31200f26ae7e074ea8e8e27ecb67e625 +EBUILD libbytesize-2.6.ebuild 1632 BLAKE2B d76ce8a93b59f15d0e26fd02de51ce5936b42e9f1c670a62404b760758f7cb2b1706daaaa5ae86f31f6448ee103716be9a0ab55d66a8abacc33b9fee61bce08b SHA512 f4db7184424318c99f6f9fd51cb5a794b6347eadfa412c24b548916fc4b7e3a268fc781c6b04a126309a0a1c0899a0b031e0bdf8d53bd92f3a183db5b60faa0d MISC metadata.xml 426 BLAKE2B 9476445b939bba3c8cc648a30455b653fb77660e010bb8238af7f7773617d28304986dccdb856bff949ca30c8296bda26ecd0cc2d085609b4bcd891c0ed4f110 SHA512 bdb43b7259039d6170cdae6af640bd8eb5e84277db1fb28f51f3eace267ad81ae0546c805ad929b78bab4c5b8603cea2dc9b5a610787a0b7413f32bcf30ab97a diff --git a/dev-libs/libbytesize/files/libbytesize-2.6-configure-bashism.patch b/dev-libs/libbytesize/files/libbytesize-2.6-configure-bashism.patch new file mode 100644 index 000000000000..5fe0f095eaca --- /dev/null +++ b/dev-libs/libbytesize/files/libbytesize-2.6-configure-bashism.patch @@ -0,0 +1,31 @@ +https://github.com/storaged-project/libbytesize/pull/102 + +From: Sam James <sam@gentoo.org> +Date: Fri, 24 Dec 2021 07:58:47 +0000 +Subject: [PATCH] build: avoid bashisms in configure + +configure needs to be executable by a POSIX-compliant shell (/bin/sh) +and while this is often Bash, which tolerates non-POSIX statements, it +might sometimes be e.g. dash which doesn't. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -59,7 +59,7 @@ AC_ARG_WITH([python3], + AC_SUBST(WITH_PYTHON3, 0) + if test "x$with_python3" != "xno"; then + AC_PATH_PROG([python3], [python3], [no]) +- AS_IF([test "x$python3" == "xno"], ++ AS_IF([test "x$python3" = "xno"], + [if test "x$with_python3" = "xyes"; then + LIBBYTESIZE_SOFT_FAILURE([Python3 support requested, but python3 is not available]) + fi], +@@ -77,7 +77,7 @@ AC_ARG_WITH([gtk-doc], + AC_SUBST(WITH_GTK_DOC, 0) + if test "x$with_gtk_doc" != "xno"; then + AC_PATH_PROG([gtkdoc_scan], [gtkdoc-scan], [no]) +- AS_IF([test "x$gtkdoc_scan" == "xno"], ++ AS_IF([test "x$gtkdoc_scan" = "xno"], + [if test "x$with_gtk_doc" = "xyes"; then + LIBBYTESIZE_SOFT_FAILURE([Building documentation with gtk-doc requested, but not available]) + fi], diff --git a/dev-libs/libbytesize/libbytesize-2.5.ebuild b/dev-libs/libbytesize/libbytesize-2.5.ebuild index a819367ec1e7..9afd519fb6c1 100644 --- a/dev-libs/libbytesize/libbytesize-2.5.ebuild +++ b/dev-libs/libbytesize/libbytesize-2.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools python-r1 @@ -66,7 +66,7 @@ src_configure() { $(use_with tools) ) local ECONF_SOURCE="${S}" - python_do econf "${myeconfargs[@]}" + CONFIG_SHELL="${BROOT}/bin/bash" python_do econf "${myeconfargs[@]}" } src_compile() { diff --git a/dev-libs/libbytesize/libbytesize-2.6.ebuild b/dev-libs/libbytesize/libbytesize-2.6.ebuild index f261594c01a2..84be8f1ddd9e 100644 --- a/dev-libs/libbytesize/libbytesize-2.6.ebuild +++ b/dev-libs/libbytesize/libbytesize-2.6.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools python-r1 @@ -44,6 +44,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}/${PN}-2.4-no_Werror.patch" + "${FILESDIR}/${PN}-2.6-configure-bashism.patch" ) python_do() { |