diff options
Diffstat (limited to 'sys-devel/bmake')
-rw-r--r-- | sys-devel/bmake/Manifest | 10 | ||||
-rw-r--r-- | sys-devel/bmake/bmake-20210206-r1.ebuild (renamed from sys-devel/bmake/bmake-20210206.ebuild) | 8 | ||||
-rw-r--r-- | sys-devel/bmake/bmake-20210314.ebuild (renamed from sys-devel/bmake/bmake-20201117.ebuild) | 12 | ||||
-rw-r--r-- | sys-devel/bmake/files/bmake-20201117-tests.patch | 34 | ||||
-rw-r--r-- | sys-devel/bmake/files/bmake-20210206-lib-mk.patch | 11 | ||||
-rw-r--r-- | sys-devel/bmake/metadata.xml | 4 |
6 files changed, 36 insertions, 43 deletions
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest index be4f6fe51768..0723074d267c 100644 --- a/sys-devel/bmake/Manifest +++ b/sys-devel/bmake/Manifest @@ -1,8 +1,8 @@ -AUX bmake-20201117-tests.patch 796 BLAKE2B e30d5584e9fa36203ed54bd969b174a082f188b191ce0c3990a6b798ea938d71d14a208f7e5e1963cc74ddb85548aec20ba0b63c059c6b042e7cd04298455fc8 SHA512 270bcc2f4353e0aeba97215f92e6cf51e858b24c44d761b1d588d66604c61471b9a69e259900ad68ea71b0efe92942524763a39e4be081e24e246790f92bad78 +AUX bmake-20210206-lib-mk.patch 434 BLAKE2B bf83ead1909041a10fc3889b9157810edc8ace40bae1ed8446e2bfd839220cc3af178cd321ae2cb98ff37748a24ca5d3c9c092f89addf6fc304a73a0b20dc976 SHA512 7580c880992c7ab6a46554f91945ad99da20d6e5fd262a4f8437ee6aa8405855e67eabf8165c81f15d313f8fc741b191ac3a67fd8df095764fd7c7ee8718c08e AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe -DIST bmake-20201117.tar.gz 696371 BLAKE2B e92568e844d74f1ace157d68ea029c7a999351b18c3afab50ab584abb8c41691dee5fe4f2e1fd7936103cbbabe33dbbd6c7b2b0af2e0cc199dbb83150b237f8c SHA512 b78e6f6276032fe68a67196d18b6786556b1079109998b1c9a585a9d58e9245294ee01b3b787329a04e7f024fa72763c109351a8da9ec09f8bf8407393758588 DIST bmake-20210206.tar.gz 740065 BLAKE2B 2482b980ad4e4aac4292e0244020eeb3699148d84b0f493865a8317673eddb20ed48219f1319c490c6a88c6f1c50a44bd95af5de43f5853876bd10c1aef9b4bd SHA512 abda3aadd49abfe0e7801f4c37539a9172c3bb2d6ed542e0dec5b6177a799774a4b513041ff6167409c69ac6af35f506b1d6e585694259192a65a8575c232839 +DIST bmake-20210314.tar.gz 749343 BLAKE2B 765b06577d8b06924627de7c2551e4fa25bdf533f2ce96db09a63af01d965e2bc29001e2c07df98a15d72b3c57a11e99974df82b9ec12257c9340baf563c3faf SHA512 d27c3787102d32ccd541909aaf76083ff9d2f704b938ba64d234c5d29d2e7dea320e99bbee53d3594aa830ced59d512d8701487ec5b0c277339e705d6e64f97d DIST mk-20191111.tar.gz 102361 BLAKE2B 6a542c41e2a2153bd3c812aa9bcdc78a47bf2e9121835279afa2e57ec9cdd44f72a1cd7b48a7647d56b0586c547656f45359821cd2013c5a90532568e12086b5 SHA512 4a3e2344e7ada0666bcb147fcd4627030ba9b928acab6876215c8529b23909be4ced802bea177b078a6b4457370d2d0070114c0d69979622274be74336778861 -EBUILD bmake-20201117.ebuild 1152 BLAKE2B 643222e719b1bc152f930c85c026a19077645e767d1b1256d72882beb1b271348c944d54e5433aa96f3364fd6204e341d2854f2b93dc0f6ed40d487cd588b475 SHA512 b06d919e2d9adff7d7a39498fd1a8e2fd231af83dcac3a358e751cdda1e47e247957465e785245ffd56d0cf1ddc5015c9e23a5be28d5d5a4855d8bb8b713f49f -EBUILD bmake-20210206.ebuild 1153 BLAKE2B 1cb5132e060ae65c0afe2a4b14740172ae2f43be23d1ca93b60001fcd0901d227ad8170d5f11cd593bbcaa80f90375f79fdab656b89876bb5d3370add35b7fea SHA512 6d1eef0c8c9371350ccb28b95c11518f0413c9224e993bd94eb6bf1fa97a51da9662e85acaa353134ddb898d37710910a12a93b1223a2b5268d31f3fb241b20e -MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787 +EBUILD bmake-20210206-r1.ebuild 1244 BLAKE2B 6b6379ab87be0a13dcd3231903cee14d037db478654f80e614b06b942e28b246fc27c396a68a405953e952be60ee21d711528b5cc12be7cb35b4eb099dd58559 SHA512 ce97b06c9fcf24dd9680913d611a49f9453e33dd09dee75a512a28c8db9b8392b9e6d9e10a97e77f6d0033487572169a3f3183f4efcd62bd9e18afbaa3a94274 +EBUILD bmake-20210314.ebuild 1265 BLAKE2B dcfe2099d9fd788bda2fbf3d8b176c63ecf98250d66fc6c8bb7e776234e598b34e04daa3885713736b2e3655dce35fc46ce5c0f9c65589afc2ff4deee4dec9bc SHA512 f879880010feeec7d0a7f0c002e55f20b679f9715e58c58bb5309965bc26de5c495e9d7c9e8bcd320d2b1927cf33c20518ee40242a1f38aab47737bd85935e84 +MISC metadata.xml 356 BLAKE2B c8acffcd095f37e19987d6d116df6654453aab320818262c98e1ccec0871084adb919e408599eb6b4460544c2ec8660abe1e0add7a858d41dc48492f78d1c53d SHA512 c63247454ecc0add57dc73ae2e16421dab39ad199d592c459366b567f3ef3f63c706cb66ac3bdadfafe8a995216e35dc3f90f22ad45a7c078b302b48116f4645 diff --git a/sys-devel/bmake/bmake-20210206.ebuild b/sys-devel/bmake/bmake-20210206-r1.ebuild index 547f81f91f68..3b3e54fcda20 100644 --- a/sys-devel/bmake/bmake-20210206.ebuild +++ b/sys-devel/bmake/bmake-20210206-r1.ebuild @@ -13,13 +13,19 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" S="${WORKDIR}/${PN}" # Skip failing test (sandbox and csh) PATCHES=( "${FILESDIR}"/${P}-tests.patch ) +src_prepare() { + default + cd "${WORKDIR}" || die + eapply "${FILESDIR}"/${P}-lib-mk.patch +} + src_configure() { econf \ --with-mksrc=../mk \ diff --git a/sys-devel/bmake/bmake-20201117.ebuild b/sys-devel/bmake/bmake-20210314.ebuild index 78a6f067ab38..cccbf6666ec7 100644 --- a/sys-devel/bmake/bmake-20201117.ebuild +++ b/sys-devel/bmake/bmake-20210314.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,12 +13,18 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~x86" S="${WORKDIR}/${PN}" # Skip failing test (sandbox and csh) -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) +PATCHES=( "${FILESDIR}"/${PN}-20210206-tests.patch ) + +src_prepare() { + default + cd "${WORKDIR}" || die + eapply "${FILESDIR}"/${PN}-20210206-lib-mk.patch +} src_configure() { econf \ diff --git a/sys-devel/bmake/files/bmake-20201117-tests.patch b/sys-devel/bmake/files/bmake-20201117-tests.patch deleted file mode 100644 index 185f45232e1e..000000000000 --- a/sys-devel/bmake/files/bmake-20201117-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/unit-tests/Makefile -+++ b/unit-tests/Makefile -@@ -168,7 +168,6 @@ - TESTS+= envfirst - TESTS+= error - TESTS+= # escape # broken by reverting POSIX changes --TESTS+= export - TESTS+= export-all - TESTS+= export-env - TESTS+= export-variants -@@ -255,7 +254,6 @@ - TESTS+= sh-meta-chars - TESTS+= sh-multi-line - TESTS+= sh-single-line --TESTS+= shell-csh - TESTS+= shell-custom - .if exists(/bin/ksh) - TESTS+= shell-ksh -@@ -287,7 +285,6 @@ - TESTS+= var-op-assign - TESTS+= var-op-default - TESTS+= var-op-expand --TESTS+= var-op-shell - TESTS+= var-op-sunsh - TESTS+= var-recursive - TESTS+= varcmd -@@ -300,7 +297,6 @@ - TESTS+= varmod-edge - TESTS+= varmod-exclam-shell - TESTS+= varmod-extension --TESTS+= varmod-gmtime - TESTS+= varmod-hash - TESTS+= varmod-head - TESTS+= varmod-ifelse diff --git a/sys-devel/bmake/files/bmake-20210206-lib-mk.patch b/sys-devel/bmake/files/bmake-20210206-lib-mk.patch new file mode 100644 index 000000000000..5f860b6f15aa --- /dev/null +++ b/sys-devel/bmake/files/bmake-20210206-lib-mk.patch @@ -0,0 +1,11 @@ +--- a/mk/lib.mk ++++ b/mk/lib.mk +@@ -170,7 +170,7 @@ LD_solib= lib${LIB}_pic.a + .elif ${TARGET_OSNAME} == "Linux" + SHLIB_LD = ${CC} + # this is ambiguous of course +-LD_shared=-shared -Wl,"-soname lib${LIB}.so.${SHLIB_MAJOR}" ++LD_shared=-shared -Wl,-soname,lib${LIB}.so.${SHLIB_MAJOR} + LD_solib= -Wl,--whole-archive lib${LIB}_pic.a -Wl,--no-whole-archive + .if ${COMPILER_TYPE} == "gcc" + # Linux uses GNU ld, which is a multi-pass linker diff --git a/sys-devel/bmake/metadata.xml b/sys-devel/bmake/metadata.xml index 70f78a5392df..97c59ff25556 100644 --- a/sys-devel/bmake/metadata.xml +++ b/sys-devel/bmake/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>jakov.smolic@sartura.hr</email> + <name>Jakov Smolic</name> + </maintainer> + <maintainer type="person"> <email>soap@gentoo.org</email> <name>David Seifert</name> </maintainer> |