From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- dev-util/meson/Manifest | 7 +- .../files/0.54.2-prefix-dont-strip-rpath.patch | 25 ++++++ dev-util/meson/meson-0.54.2.ebuild | 4 +- dev-util/meson/meson-0.54.3.ebuild | 98 ++++++++++++++++++++++ dev-util/meson/meson-9999.ebuild | 2 + 5 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch create mode 100644 dev-util/meson/meson-0.54.3.ebuild (limited to 'dev-util/meson') diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 3b7de74a5622..dfebf7a8ad6c 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -2,15 +2,18 @@ AUX 0.52.1-test_pkgconfig_gen_deps.patch 1688 BLAKE2B f228e1d721449611799606cfb3 AUX 0.53.1-remove-asan-ld_preload.patch 946 BLAKE2B 2f43446f853b5233c7c959e0216eadae9d190efd4743a138afae73d42f082499793b4688e2419cb3ef38fe7c5e7f29b472e8a27e9ce8701c28f83f390f55dddd SHA512 50b7b4c269d186e3c2274297f04dae46484af4f2f090bef3fc42dfbecab94d8a91b31c27369cf40a52c7ce71cf96d9bc22601739b6e886c6c710f0665c2ef311 AUX 0.53.1-remove-asan.patch 842 BLAKE2B 02864bbd41dd16d3e9e8e7ce9e9ef604f2fc6babd26958a4364147d392d56d8a87baec41fb009389a5fc989067019c6de89d1e2c82043ba7df463e32c99f885c SHA512 4abf8088832a1a9336fdffe04bc91a1fbab7363b72c5a1d14b22f408ea25f180d6526f8d6b3a2866a819f1895c93035869fff799da36b5040b8fb89a65ab0e23 AUX 0.54.2-multilib-clang.patch 8033 BLAKE2B 724d87eef8d560eb733b9873d28afaa6dd49c23867440d182d427a9a569bcd6852c5007675fde77724f6e05d1a4beb371fb0b474e8aeec2dbae0a7e8ca3a78b8 SHA512 1251222bc107abc1b5b0acfa6c52b4bfcdd47baf2651b291f162b39d384b61383627a7ab4d925ad2df1f36307e79e4806c6e05eb889e98a58688657e40ada29a +AUX 0.54.2-prefix-dont-strip-rpath.patch 1118 BLAKE2B c28bbb0293c2d15a493bd09c902cd6bb3f48c6d279063f326796919f9d06d0dc99e5a7e975742ad8fe4da3dc5bc9b07329d0ae7cb3186431c12aa93709aaa665 SHA512 bb41c4d06c04af4249c9c5ba5724c982a5edb1fe16118120ed53e52ed82cde0bd0ea43454799c986dd008b48a3bbdb7dac820260d9835b020323babc6ec617ed DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41 DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859 DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7 DIST meson-0.54.1.tar.gz 1687532 BLAKE2B 5bd355b35a4aa037e490615629480a194c04821fb18b137f090af89f6c33c700d0756bb2d7e9e608ecf4873886be10493bfeddce55fef3d905793ad3ccccfa68 SHA512 dbc3fed326ba208f5a6eee7e3106d07450e7a3569d425013fba8c51e7cfd6485f9b083836dc74be49bc9839bd640ce54741d9335097cbd28f6a320d5fec7ecfe DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed +DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b EBUILD meson-0.52.1.ebuild 2101 BLAKE2B 5e6eaaf5c081f0749530b4a69971993e7f926ab69e8fc9f239fddb01c12f42fdc5c788736a3707746b286fdedfcd9dd3b59617bc0a794718c16f6cfbe7fc5ce3 SHA512 88a1a8256211fac613752fdfe62fc9d8f666ef7f7dac7a536ac2312357c7bea6a55316dd7e9f81e810c5d10654afc61a3b62ecd59eeeb01a786b335d1b92fc57 EBUILD meson-0.53.1.ebuild 1981 BLAKE2B ae5dbc32f30a50456ad7bb5780b248e494c22838ba34846141551e206b20ceffcfb3c40908dd17814cdeacac2713b1f4dce69392257b9c12dd3bcc8eab18d697 SHA512 dab0953fc1fd408130d00b2c36fad8a292c0c3e8a1e3b3b97aa675522fd6aa56e9f884f39165ebcc8547d30253250a9e63a7cf922653c1bef569717d51f3f0e2 EBUILD meson-0.54.0.ebuild 1544 BLAKE2B b326f8d159b8e75dd38300046fb7ce718335dc1717735ea0a41754f5331a0d9613260b736603f8d0194e88878cf3c34dfa18f076ed031c5f51bbbc9897465c63 SHA512 8fd2b4c23c6ace8021c0c267472b5bafc4a64092ea5fab222f1d637927769626e3d5f72f40446dba8603abda0e49a5ae88aac912df49a0d70cc8e5fae097f025 EBUILD meson-0.54.1.ebuild 2036 BLAKE2B 23f30ffed174af8155f3a1e6cb761d085f1a8688df6137368752bac79fc57fbb6475310d6f2893beefe3754849bd579bdf50d17e4c2052ff3c9c7507f85f0cc8 SHA512 80949c24c9395631fb8c6b60a75df0360707deb3a2052449f47f9908f793b22d632b6881349278f72f9d820c52985f569719d2bbcfdf135d0ec0fbaaef65bba0 -EBUILD meson-0.54.2.ebuild 2273 BLAKE2B 061e0b4cdaeb3220b63f5e874175b3949419fba1712d365fa0ede75a6e8dfb27bd9b632748c103775bcc62170e7b0cc9ad18bbbe7c984b8a78c093ab09a2cdbf SHA512 97b83377523af3c02f3748d8090ee1d054e96513be0e1203b5eca176315c7d785a91cba7edd56d2215cbdbde9f1876a8870ff40c30d87b66d13662faa68a2801 -EBUILD meson-9999.ebuild 2217 BLAKE2B 8e5cc488d3864a835fb5989f27d3a2a73668bc0f06dc3157f5cf6ff1b9361f170d8e13ab0dc46c6b7731aa2a92c34bfe1b2c8255fcb595eceedbbeefbf208586 SHA512 7e7bca6060adfa4d4c8cb5835ed5dab9dbc2ca15c9da486e8fb7d44c969c21564ebaed6f4cc184a9c047a179a0f88c8ea0a6086988cd0e2634186fa6c51d33dd +EBUILD meson-0.54.2.ebuild 2338 BLAKE2B f2cfb920c655509b00c6c5639fc772a049ea37e1f362e8ec84bef7d5920cb4b4be7e9048d02d38597ab8b0f60afecf589b6f290828f2f456bd237379f4a21067 SHA512 193e2c013adc68da916b0cc57650131757adc2e33c5d91e3db689e6af4ccb386d0c1f669f2a2f402bc062a3adb990baacbfc36560c5185205bdb54ae8956e783 +EBUILD meson-0.54.3.ebuild 2347 BLAKE2B 8e12969d4c7aed7050ea6cb1016cded8c7fcd42bc3b84a5f197006f71f21db310ef34fc62a9ae88a8ba861a828cda73e18d143d4e73bdc9453a76344191543a0 SHA512 ba232f75d4409a55aca941093a96bc36e7ca9794a3761d8084c1728a6f07602a5f934ed7cfdafbddd80e36f00af009fef87e015eb74ce1833168a8a26e08ecaf +EBUILD meson-9999.ebuild 2291 BLAKE2B dd136009f68b5aab380a5edcfb23b2950262bf4fe31cad2f6a64c699da387b67b3eb7fe1bf81a8fe54cfdda5dc48516f30ec137bdce5b88cd5e58b0884de0964 SHA512 3ddb12fa7defc9faa69136bc95f2f9526e79e48828072f79879162dff4e29da6184cf5ba7951fb5354b970cef3fcd20a6c67b371a6b3b5f0342e2ae2041e9fe3 MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4 diff --git a/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch b/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch new file mode 100644 index 000000000000..1fe2e1ac4cc1 --- /dev/null +++ b/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch @@ -0,0 +1,25 @@ +https://bz-attachments.freebsd.org/attachment.cgi?id=204611 +https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238128 + +Stripping RPATH on Prefix is really bad, because it means the default +RPATH entries disappear, and any installed binaries don't work (get +kernel traps). + +Extracted the minstall patch from the FreeBSD full patch. + +--- a/mesonbuild/minstall.py ++++ b/mesonbuild/minstall.py +@@ -488,8 +488,11 @@ + printed_symlink_error = True + if os.path.isfile(outname): + try: +- depfixer.fix_rpath(outname, install_rpath, final_path, +- install_name_mappings, verbose=False) ++ if install_rpath: ++ depfixer.fix_rpath(outname, install_rpath, final_path, ++ install_name_mappings, verbose=False) ++ else: ++ print("RPATH changes at install time disabled") + except SystemExit as e: + if isinstance(e.code, int) and e.code == 0: + pass diff --git a/dev-util/meson/meson-0.54.2.ebuild b/dev-util/meson/meson-0.54.2.ebuild index 4945b8d2278e..eee417491e84 100644 --- a/dev-util/meson/meson-0.54.2.ebuild +++ b/dev-util/meson/meson-0.54.2.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" fi inherit distutils-r1 toolchain-funcs @@ -60,6 +60,8 @@ python_prepare_all() { # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch + distutils-r1_python_prepare_all } diff --git a/dev-util/meson/meson-0.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild new file mode 100644 index 000000000000..f29fb08b500f --- /dev/null +++ b/dev-util/meson/meson-0.54.3.ebuild @@ -0,0 +1,98 @@ +# Copyright 2016-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_USE_SETUPTOOLS="rdepend" + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/mesonbuild/meson" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +fi + +inherit distutils-r1 toolchain-funcs + +DESCRIPTION="Open source build system" +HOMEPAGE="https://mesonbuild.com/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( + dev-libs/glib:2 + dev-libs/gobject-introspection + dev-util/ninja + dev-vcs/git + sys-libs/zlib[static-libs(+)] + virtual/pkgconfig + ) +" + +PATCHES=( + "${FILESDIR}"/0.54.2-multilib-clang.patch +) + +python_prepare_all() { + local disable_unittests=( + # ASAN and sandbox both want control over LD_PRELOAD + # https://bugs.gentoo.org/673016 + -e 's/test_generate_gir_with_address_sanitizer/_&/' + + # ASAN is unsupported on some targets + # https://bugs.gentoo.org/692822 + -e 's/test_pch_with_address_sanitizer/_&/' + + # https://github.com/mesonbuild/meson/issues/7203 + -e 's/test_templates/_&/' + + # Broken due to python2 wrapper + -e 's/test_python_module/_&/' + ) + + sed -i "${disable_unittests[@]}" run_unittests.py || die + + # Broken due to python2 script created by python_wrapper_setup + rm -r "test cases/frameworks/1 boost" || die + + use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch + + distutils-r1_python_prepare_all +} + +src_test() { + tc-export PKG_CONFIG + if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then + ewarn "Found Qt5Core but not Qt5Gui; skipping tests" + else + # https://bugs.gentoo.org/687792 + unset PKG_CONFIG + distutils-r1_src_test + fi +} + +python_test() { + ( + # test_meson_installed + unset PYTHONDONTWRITEBYTECODE + + # test_cross_file_system_paths + unset XDG_DATA_HOME + + ${EPYTHON} -u run_tests.py + ) || die "Testing failed with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all + + insinto /usr/share/vim/vimfiles + doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} + insinto /usr/share/zsh/site-functions + doins data/shell-completions/zsh/_meson +} diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild index 5cd9c5f13bb2..edbd30f51167 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -56,6 +56,8 @@ python_prepare_all() { # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch + distutils-r1_python_prepare_all } -- cgit v1.2.3