diff options
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/Manifest.gz | bin | 6221 -> 6224 bytes | |||
| -rw-r--r-- | sys-devel/gcc/Manifest | 2 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-12.4.1_p20250320.ebuild | 65 | ||||
| -rw-r--r-- | sys-devel/patch/Manifest | 6 | ||||
| -rw-r--r-- | sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch | 80 | ||||
| -rw-r--r-- | sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch | 78 | ||||
| -rw-r--r-- | sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild | 10 |
7 files changed, 70 insertions, 171 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz Binary files differindex 4c5550912875..01b9f840344d 100644 --- a/sys-devel/Manifest.gz +++ b/sys-devel/Manifest.gz diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index fb55b92e7908..4b12e799530a 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -14,6 +14,7 @@ DIST gcc-12-20241219.tar.xz 79920016 BLAKE2B 71044352515f33eaf0bcc64cc6eacdecb8b DIST gcc-12-20250227.tar.xz 79915940 BLAKE2B 0adb19847cb3f317316549f657434654b9923806366a4b95e496effea9c07995b7d3de65c40cc2f62ba1e87cfb0f8cd8a1a833284042fdc5e6fce2bd7e7e9543 SHA512 d01cad1771762f5b56c783d6a3b39415be1c7619229b5ff056fe40ef0bf821c67a2d1a2272c2227a44f92825582579625352d19e2342d11f76a079556dae0ae8 DIST gcc-12-20250306.tar.xz 79914120 BLAKE2B 52744beac63301b3e0f2564efc82384f6452cd05bb2543f3c421d14fdfc4eed107d25d24183e9d7045d33f1e9f14741b8cb8580bb0c7e8cda8b3e5b4dd5e0d4e SHA512 585aeab071fda880a6ad5c9e0e766164683faf4e84ad63764ad7dc0420fe5e355452338234f76f6f2cb2b25f4b39b059658323f53594c2c7da3db6631c69a14c DIST gcc-12-20250313.tar.xz 79917528 BLAKE2B 2ce76d12f0d90d5728df2e14ece3c13e781005eac43dd10357602efc1dd3a9c939fee7640c1baae643df88354905bdbcd314d6bb7c7f384df9148074d8448afc SHA512 465a9923c8ebef98cf4590096afd44468993116cf38ba1e5bbbc70dfb57ec1716ad55a544dc12444011663dc8cd3c9a7c19326d69dfcea181d07783a0aceb73f +DIST gcc-12-20250320.tar.xz 79921688 BLAKE2B cafdd710d1bf04083f8db4cce873667caded67961b701760f95e95f76ad98924582b51752061fe404e2e7f6dbab4215e0fe5c4436826ac320d9bd224ae7a061c SHA512 1dc331f1a942c4a10ae56fc234bcc37c72dd720df1cb9e1aa1802092307378abffd83b887b718a8f8d11c16296c0a7aa53011a7358aea86c8e60522d8f50e76d DIST gcc-12.4.0-musl-patches-1.tar.xz 3068 BLAKE2B e5e39c24934072ea89e4467d0dc5196f3dadfb5ffba0c856d051648a2fbf57d434a57e95227cdf2b8cea45f0f5555aec2bc372d2f6cb0b69efd87831d248d364 SHA512 b9db204845a25be043d76cae826d42eebeeb4f9be7c3049af6fe7601a552bedfd24731156a6a36b4b5e2e2af656a589a5c556d2b0b3ded33ba290a773ee87c62 DIST gcc-12.4.0-patches-1.tar.xz 15576 BLAKE2B 98c29888de7701b365be7ac9062f0cee3340d58c85485e26f0d02f1483ec64cc9c10651488a4fd937551afe30f4e19777e6766871a724ae3ba6c290c16f4fdf1 SHA512 3f7c5d36e56e07ea9dd143a5d13342a6c1ccbf0643abd1c0bcbfb46bb7c7b1308aef6e3e882031c9c191610f01af906b19be5aa2b139cf617614f46e97463aec DIST gcc-12.4.0-patches-2.tar.xz 14876 BLAKE2B 6bf5abbb2abba4b9fe9fa153ac4112fe5f563e97cd4e1b885ccd0d88abf1124fa91f20d6be972e2242410447be73bca60014785f8551b8087ed0d4cc3e868225 SHA512 dfd5f02d4c1076fad4ee998b2f620171dd3eb65a1160312def9dae89b18327a06db853f569e0e3c049e5ab06c61488bb6faecec52bafe737fddeb43628c54a1f @@ -50,6 +51,7 @@ EBUILD gcc-12.4.1_p20241219.ebuild 1615 BLAKE2B ea5fc1179a82bc8c92c01be77a9c6cff EBUILD gcc-12.4.1_p20250227.ebuild 1623 BLAKE2B c1a1de3e527d07739c4b4ba10b7c0f318cd593b271bb52e86d14fae39d0d30c8c2e28b5849dd60ddaf74fe01e391654dc0f5b517149cd621b387612fdf67f406 SHA512 a59988681339c1d63f7ae7347369e2559289a6748912674ab2ff72def0ea475e29c8af4ef09e21d2627bfdd5eafa0215776cd8de7071c90819a803141210ab3f EBUILD gcc-12.4.1_p20250306.ebuild 1624 BLAKE2B f4a16d6af11158666ec0ad9ced5841c89b6ce70964950b3c439105b240a3534b633dca7bf97aaef847b222f8aa323f815fa7410b5f4b115f07f50f4ff1cd31db SHA512 30bc2e09a28caf65eccc0e2f496d5095d2735e5e118b269d2cfad638c8874283ce364a14074d63c4e43862e247cc0626364c7f19ab3ac314250a5e52360331fc EBUILD gcc-12.4.1_p20250313.ebuild 1624 BLAKE2B f4a16d6af11158666ec0ad9ced5841c89b6ce70964950b3c439105b240a3534b633dca7bf97aaef847b222f8aa323f815fa7410b5f4b115f07f50f4ff1cd31db SHA512 30bc2e09a28caf65eccc0e2f496d5095d2735e5e118b269d2cfad638c8874283ce364a14074d63c4e43862e247cc0626364c7f19ab3ac314250a5e52360331fc +EBUILD gcc-12.4.1_p20250320.ebuild 1624 BLAKE2B f4a16d6af11158666ec0ad9ced5841c89b6ce70964950b3c439105b240a3534b633dca7bf97aaef847b222f8aa323f815fa7410b5f4b115f07f50f4ff1cd31db SHA512 30bc2e09a28caf65eccc0e2f496d5095d2735e5e118b269d2cfad638c8874283ce364a14074d63c4e43862e247cc0626364c7f19ab3ac314250a5e52360331fc EBUILD gcc-12.5.9999.ebuild 1592 BLAKE2B 287d83b5979c9cf974e890e5835bab37fa34a97dfc8fd473d1344e9896835a2980c885e7584649ebaede68b06dcf5cdbbc0f768aa1fa6c1603d3b0135a93d170 SHA512 025fa1a7803303e99c2186bc2eb2e69e9cd5401f787aa4eac2f0ad709558142130adff6fb75e610d2b9acf9ea7775540e4b249ecbd348d30167a04108e97d523 EBUILD gcc-13.2.0.ebuild 1682 BLAKE2B 5a19639504afafced19bd1ad913e3106a65d16b4b3d5aeabedb0cbc891bdac22d9cd0a21928eef51b88dcbbe64927fabe8fc9bf0fe19ea755ad5959bf5acfb67 SHA512 3865dff4bb19f022f6a1a2d653bc8f7eab9c47e99ec5b30e4600506faab301f410ff26f1155b5305f219f3b89f344cc8271aef8b6d6fb2568e8937d5867ea843 EBUILD gcc-13.3.1_p20241220.ebuild 1674 BLAKE2B f259931c9581507f6140ee400ddab4bb7f0889a6eefdf2f7f72430cf34c487f0aa0cde5b3bbe13b513331e3f656078c5033f3540b8873de949d3225b2f584976 SHA512 865c309f411438db3b85ee5cdc93025e4ae7808236d382057c4d0c40a03850555d559357168f2928c174660fbe7a4aa530fb055af90ad5f086af7f46c9654029 diff --git a/sys-devel/gcc/gcc-12.4.1_p20250320.ebuild b/sys-devel/gcc/gcc-12.4.1_p20250320.ebuild new file mode 100644 index 000000000000..83011b194d30 --- /dev/null +++ b/sys-devel/gcc/gcc-12.4.1_p20250320.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +TOOLCHAIN_HAS_TESTS=1 +PATCH_GCC_VER="12.4.0" +PATCH_VER="2" +MUSL_VER="1" +MUSL_GCC_VER="12.4.0" +PYTHON_COMPAT=( python3_{10..12} ) + +if [[ ${PV} == *.9999 ]] ; then + MY_PV_2=$(ver_cut 2) + MY_PV_3=1 + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + MY_PV_3=0 + else + MY_PV_2=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain + +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=releases/gcc-$(ver_cut 1) +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + :; +fi + +if [[ ${CATEGORY} != cross-* ]] ; then + # Technically only if USE=hardened *too* right now, but no point in complicating it further. + # If GCC is enabling CET by default, we need glibc to be built with support for it. + # bug #830454 + RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" + DEPEND="${RDEPEND}" +fi + +src_prepare() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + toolchain_src_prepare + + eapply_user +} diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest index c6a48bd0b108..fab454563955 100644 --- a/sys-devel/patch/Manifest +++ b/sys-devel/patch/Manifest @@ -13,14 +13,14 @@ AUX patch-2.7.6-configure-mkdir.patch 478 BLAKE2B 95135becb2749c9c0217aa6185a384 AUX patch-2.7.6-fix-error-handling-with-git-style-patches.patch 3582 BLAKE2B c443abb5112283aeb20db4ccf57c0d1241bfa586ad8d54d0ff2e1ae9026174f560df37dda1fedfc39db8178db05f77a4f94827ede80982311f475f460e4ae57f SHA512 1c05cf05b7348b86c878bd464a3f2f978b3e97655bf4f9aa83732af8bfd1e82046b88db39b7ce70e33ffc00c7f09c28ba777fba3fbd9538fd76767bfc396f382 AUX patch-2.7.6-fix-test-suite.patch 3006 BLAKE2B 4b00c743f880f3cd672d6d37ff89d691d34d38b9652a9434544db10c3e28adf412071a14b5f6e4fcb1cead5e6ec0c20f786b061c96eb3fed4d9e8744a18bb02a SHA512 626256394ca2df1fadfb6cfaaa4458b86912ba70debac88d959ce3c34d2f5791284fb2b9b38b88b3e38a50a1e0f6585f0c860a9866f27c40be4884e95d7d83f2 AUX patch-2.7.6-ndebug-assert-hash-table.patch 1563 BLAKE2B 283a1d0cf5228965809223fd977d9793313b8b031e8666813b0fc68da9b841ff9d46d840261fb8ef7e3b45957151f351d832d9c860df8e37ad9490a895f5edaa SHA512 5847dc8288ddd5149902bd0b2e4fb33d37eaf5d6ee253ccbba25378bec2261640b0ce557a89aff7e48d306ef825f7a8db9bb87707f42615bea103784e0cfc7d4 -AUX patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch 3476 BLAKE2B 3251e773b11cdc6d37e0907d17d4c659eb58107c8ea270de9d77b976d58879a8429689f7e97cfc9ed3b58215b3d1b0493724f6d33c1e197508bb8be34ad48747 SHA512 1da3bca476f2969422417f5803914c6bbb4b4fb44ac3576ff1b0fa8598c4fe627e99a3acf54336c326f0f7b21cf485c219c315549eabc1a121b48451697642d9 -AUX patch-2.7.6_p20250206-traditional-diff-lines.patch 2936 BLAKE2B f21a58b6e39694d9237a9eb5e05ef2aa6ba30fce4348e216c81302666e2a941a6a6bbd4a30df4d3c0a1b50fb56044152d727eec64cf903b298237c626266c7a9 SHA512 45c0103d868f93106c2df1e2cd79a51ec5208dbead0f003f213083d0d1e723e2d881916c04d5b45bf208cb062782f97e05a95356d5ccc63fff53ccfbac2f2e62 +AUX patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch 1834 BLAKE2B 50ec6e266baa882e6fa847b2a97567cd3eca6a9ac6e8ca7e445892647aa484bdd4a8612c2c898137e871b8c356e902d9e9d877508f96ab05edafcbb0f8e3a915 SHA512 715df5b6ba77f06bccb10740c4866fecbe02d89896086625408e7a53d953de2097f2333d23a3df116705ca076cfa99753d8edac1430c30f0225067ab4942c875 +AUX patch-2.7.6_p20250206-traditional-diff-lines.patch 1157 BLAKE2B 2ad41206d544b19f2f5b2c6b44714e13dd5f96899ee4d732f4482f5b724d2c04169b6538c2a4589569b3888593651313e0d30999e7c871aa0669c2ce6a2d0ae6 SHA512 fb5c0b2148c00dbe5f33794f05aa353fad48952cf278148ff65d2f31ad2d939d646ab04d74a1a8e79cdfc1c136ea54291d3e3470fb44c5877bcb42e8ba9e2bff DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd DIST patch-2.7.6.tar.xz.sig 801 BLAKE2B 8f2decb10402ecf0208d05ea7cce3bae565d31ee2bb2a118367c117d25b158d8bd525cae654ec0c0e2c036cc8f47a331edc1bb10b100683ade64dfa3b651988b SHA512 1302a1110dcda4f3d83b5263415d72be55c46dae0efb1c123e9c346154e09def5657004bbe7249e2d014555349410e7a5217140dd8852331235f75bcc757351b DIST patch-2.7.6_p20250206.tar.xz 906596 BLAKE2B f110bcf19b655c900327088ba023743fd845161dd00cab228675d3c0992fa397916adf153c35775fc5ff8e733b559ce8a05eac71eec7156403f4c9ab17ff2a3e SHA512 2dd05af5f9f0864b0cccc5c5194d0ba4ca427fc366b91210e2f539a50bd2006d7142606f8f223b45c5d426eafef7e6b17c6b67c2ef9b7ec75589bb3d9fce68d3 DIST patch-2.7.6_p20250206.tar.xz.sig 833 BLAKE2B 8363136c58bbde5c349a4c96cd277588f3b679a98ea1c21da39bcf375c2b85c0d36165f1dceab453a09bcc2745d5ab6959d5ba28020e138591e7530dbf72f180 SHA512 a114f836502bb02910c8f88d7e667ce92ef6b0b9a26eb466ee9bd1ad8956036867801b19ea3ee27418fe0fb6e673e3d5d2aad2b9c05f7e99fd8bb1a9d604ea6f EBUILD patch-2.7.6-r6.ebuild 2393 BLAKE2B bee456b5704807b931046f85172a93aa3ed564979a02ff307943b7c4d585d21bdcebc1d637f5914925d0eb9d088f5d2413ab9903ec8daf442a316455c9a2954a SHA512 706529f59336e2d746b88c68acfea63d299372505e021b38fd301f25ae09c3afc2fea9daab73526399dc1fa0898914a1937f9a18d1bce1c0cade10354ec484c6 EBUILD patch-2.7.6-r7.ebuild 2463 BLAKE2B f7ac6ef1bf4a98c8e8bc1257a1fd1732325888ea96e10c3ad1e130262b3e53ef73c82b82042fce0a990dba79e9be5a09c2bb1a51b730b6283ae67ed725323244 SHA512 36e5e6b27932bb904953d139f42bba3a6ce1d0e321b67298c54a422204bb124ed4206a3ccc4e3ce8ed2610c2265b26ef049a4bfdc3a4695055893e3010a57b93 -EBUILD patch-2.7.6_p20250206-r1.ebuild 2406 BLAKE2B 90bc1c01591a62cd5068d0dadfc4e850810e4283dc1a10bf63ff10c0102736447bf552ef0afdc64a5dac90da09e53e445c79bd2a369234a6c5f0b6fbc67c1946 SHA512 8b71298941bb4a2edfc314aa6b9008a8b3ae6388911d94fde5f0b822aa3b887193d63842368d6e28dfe0353671b5a4c68447e5a37d251984638d4e7e366abf2f +EBUILD patch-2.7.6_p20250206-r1.ebuild 2292 BLAKE2B c0387d6fb199ccd2adca5363de1b7696bf1063a9c0c46c1fbd5d8258f78e491adeb0b73ee87cdb798161b63c387804975de7ee6adfc2e8fec556a0d980ba94aa SHA512 43863983607271f157d9c03e36ab824603dc86b1b30e8a5841c4b5fb64944b6ce9c171dfc8e0a59205353b843af8bbbac97d93c384a8699b295d57ac3d4e69b1 EBUILD patch-9999.ebuild 2043 BLAKE2B 1656b1095752f92ae19eba238049d203590bea056d784f1011f8fdf48ab95a16bb4a91b51674cf7ce1e8e01889abfbb45d8a19a371da37ce3f64889d2ca2fea1 SHA512 d15f55a85a5674d05805931b75369c13ae072582ed370d590a85831e1591304cff232ab69752795303555b64a7b090894d99061a51db0024c887ce170682f6af MISC metadata.xml 329 BLAKE2B ac0ac5e4a422955e2e1cc040d03ab9df083c70d0275145366ffe47c04fb08ac5e9c1cf776ab9c96e023910a0f66a7ff3cfd8377574d8e282cd78c435a6d8bdd2 SHA512 a0c5d5bc2d111a6d22afa4bae0e56ac7f927798122fed5373dd64a214d7b51dc436482bf21eb2ef32073c2f4004cb6dd6449afd58b7ab6936ed3c2e3a4c39872 diff --git a/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch b/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch index f4d162694ab4..0891b855d998 100644 --- a/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch +++ b/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch @@ -13,10 +13,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=949834 * tests/Makefile.am (TESTS): Add it. --- src/patch.c | 6 ++++- - tests/Makefile.am | 1 + - tests/no-backup | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) - create mode 100644 tests/no-backup diff --git a/src/patch.c b/src/patch.c index 6c460f7..e4d0524 100644 @@ -52,80 +49,3 @@ index 6c460f7..e4d0524 100644 break; case CHAR_MAX + 7: posixly_correct = true; -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 43ddf66..acb449a 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -50,6 +50,7 @@ TESTS = \ - mixed-patch-types \ - munged-context-format \ - need-filename \ -+ no-backup \ - no-mode-change-git-diff \ - no-newline-triggers-assert \ - preserve-c-function-names \ -diff --git a/tests/no-backup b/tests/no-backup -new file mode 100644 -index 0000000..57b73fa ---- /dev/null -+++ b/tests/no-backup -@@ -0,0 +1,56 @@ -+# Copyright 2025 Free Software Foundation, Inc. -+# -+# Copying and distribution of this file, with or without modification, -+# in any medium, are permitted without royalty provided the copyright -+# notice and this notice are preserved. -+ -+# Test the --no-backup-if-mismatch option -+ -+. $srcdir/test-lib.sh -+ -+require cat -+use_local_patch -+use_tmpdir -+ -+# ============================================================== -+ -+cat >my_file <<'EOF' -+/* ... */ -+void baz(); -+ -+ -+void baz() { -+ /* ... */ -+} -+ -+int main() { -+ int foo; -+ int bar; -+ -+ /* ... */ -+ baz(); -+} -+EOF -+ -+cat >my_file.patch <<'EOF' -+--- my_file 2025-02-16 11:22:12.881765792 +0000 -++++ my_file_new 2025-02-16 11:22:12.881796732 +0000 -+@@ -2,7 +2,7 @@ -+ void baz(); -+ -+ void baz() { -+- /* ... */ -++ // ... -+ } -+ -+ int main() { -+EOF -+ -+unset POSIXLY_CORRECT -+ -+check 'patch -N --no-backup-if-mismatch <my_file.patch || echo "Status: $?"' <<'EOF' -+patching file my_file -+Hunk #1 succeeded at 3 with fuzz 1 (offset 1 line). -+EOF -+ -+ncheck 'test ! -f my_file.orig' --- -2.45.3 - diff --git a/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch b/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch index 3d9d3109e91c..f33a79980f3e 100644 --- a/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch +++ b/sys-devel/patch/files/patch-2.7.6_p20250206-traditional-diff-lines.patch @@ -34,81 +34,3 @@ index 63c9a0c..d9f5c61 100644 p_ptrn_lines = (*s != 'a'); -- 2.45.3 - - -From b3d0c933389208ccac795a1b517c5a8b11cc012e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org> -Date: Wed, 26 Feb 2025 16:44:48 -0800 -Subject: [PATCH 2/2] Regression in commit abe92e8010ab affecting MariaDB tests - -I have disovered a regression in commit abe92e8010ab ("Prefer idx_t, -ptrdiff_t to lin") while I was running MariaDB tests. The regression is -related to a diff file [1], where the patch fails to apply it with -following error: - - patch: **** '---' expected at line 2 of patch - -To illustrate the issue, I have attached a git patch containing a -testcase with simplified reproducer. - -[1] https://github.com/MariaDB/server/blob/mariadb-10.6.21/mysql-test/suite/innodb/r/innodb-wl5522%2Cstrict_crc32.rdiff file ---- - tests/Makefile.am | 1 + - tests/regression-abe92e8010ab | 33 +++++++++++++++++++++++++++++++++ - 2 files changed, 34 insertions(+) - create mode 100644 tests/regression-abe92e8010ab - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index acb449a..8f1a248 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -57,6 +57,7 @@ TESTS = \ - preserve-mode-and-timestamp \ - quoted-filenames \ - read-only-files \ -+ regression-abe92e8010ab \ - reject-format \ - remember-backup-files \ - remember-reject-files \ -diff --git a/tests/regression-abe92e8010ab b/tests/regression-abe92e8010ab -new file mode 100644 -index 0000000..0e11e34 ---- /dev/null -+++ b/tests/regression-abe92e8010ab -@@ -0,0 +1,33 @@ -+. $srcdir/test-lib.sh -+ -+require cat -+use_local_patch -+use_tmpdir -+ -+cat > f <<EOF -+1 -+2 -+test: -+a -+4 -+EOF -+ -+cat > f.diff <<EOF -+2,3c2 -+< test: -+< a -+--- -+> 3 -+EOF -+ -+check 'patch f < f.diff' <<EOF -+patching file f -+Hunk #1 succeeded at 3 (offset 1 line). -+EOF -+ -+check 'cat f' <<EOF -+1 -+2 -+3 -+4 -+EOF --- -2.45.3 - diff --git a/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild b/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild index 0c0ae58d62c4..fbaa5fd97f05 100644 --- a/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild @@ -3,11 +3,6 @@ EAPI=8 -WANT_AUTOCONF=none -WANT_LIBTOOL=none -WANT_AUTOMAKE=1.16 -inherit autotools - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/patch.asc inherit flag-o-matic verify-sig @@ -61,11 +56,6 @@ src_unpack() { default } -src_prepare() { - default - eautomake -} - src_configure() { use static && append-ldflags -static |