From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- sys-devel/make/Manifest | 6 +++--- sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch | 4 ++-- sys-devel/make/files/make-4.2-default-cxx.patch | 6 ++---- sys-devel/make/make-4.3.ebuild | 8 +------- 4 files changed, 8 insertions(+), 16 deletions(-) (limited to 'sys-devel/make') diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index 1a015a107a26..07b792f1eab6 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,6 +1,6 @@ -AUX make-3.82-darwin-library_search-dylib.patch 386 BLAKE2B 4341e38aa89d08442dde331a7640b95771fb2cad824a32642c8b6bfbcffe609ae1af189d3e49c2eb529cfcbe10e137b9dc34cee3d7aecc8995c9a4459817bc8a SHA512 abd63b6a6d0b3bf77c5f26f0f711d148dd47964564d17562d9714272ff37700afffad50d77d5921c47b1f3eb705112b854ad15933740751071d2579123f9f259 -AUX make-4.2-default-cxx.patch 269 BLAKE2B 6bbadfe43e3494c7dbd423edc5caf1eba1b6c3bb8f3b2f04368ccbe5c03f248a2692ba1b2299b966bd630c94e2b66674c079eaafa9b3b3c54bd163e75ac53f9f SHA512 b9c6254c8111111d9986de617023fad1673a8992d5a8b2e1e5ce32a92f5e4d064e1a9677b44f1d647a54ddd1c62782eccfd2d71ddc8d41baee141f65bdc894fe +AUX make-3.82-darwin-library_search-dylib.patch 394 BLAKE2B abd83733bc3036e412a57e0ced927511f45b9308f77d759ab299a5fc7fd76e81346cb4b908513ab20bc4aa931d436dbd4b3cd8cd0f5b05f94816569830589ce8 SHA512 32728cda66093f813e2731e120d71befa71e97e57a908503f60f79fd400e9fe0766f72d0c2ed065def1ea3a36a03b67d189dbff474728f41622489f1c3a515cb +AUX make-4.2-default-cxx.patch 212 BLAKE2B 16ab647e54b27b2be8fe3b8abc37940690e828a1f68a21856377dec4b282ef489246f5de7c2b364654327166fb9b3f2a0dae755dc15db786c607c6d7f1fd76d1 SHA512 9b9be230f8c74ee438851d1c10409ebd188f818d04e99b799a353fc26c2da78d2e298b907287ceece7b6e64f9ac0908ae65e33c35634b9338b246225b63cb409 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c8111179e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 -EBUILD make-4.3.ebuild 1687 BLAKE2B 07708c24ab23ff62e07277d7021f2c0393da4aedbbdcd9264f596da2f4359ae07e289d9d571d649c61342b88b07a9801e52ca757fac1a2d12d0fdfae566a4230 SHA512 b3709446880847ddd657aab2c297f31b6fa93817eaace98c09dd320f4e653522c9510c5f83f537f3cc302250f1469d3b3f2324515e8f785c16eea1fb939183bf +EBUILD make-4.3.ebuild 1610 BLAKE2B 130d351a1f54c87757a28d6715457d7cb7e5c460fed7c048b17e78438c6864e9302eef9b4fa69e0203d0d9a2a945674835f2c5f4ff174a2995b840ec8b166a11 SHA512 ed04765cc73f0d2a050103e7638e3b55e6eeac0f7d7e537a2fefdbda9260a651380bad9ccea8544b0918d2dc9f31a559c7fa6a8005c302992b9483f2e5e0781b MISC metadata.xml 328 BLAKE2B 97a05dd19a59e516a070a39cbe636db4c1b13e5aabe3c0030e6b6000fe4fd0f10fa7e5979771f0d55bbe11f1fa149035554286af9c3415727afcbe44938e0515 SHA512 30dbabfa767feae8a452b25faab445cdaaf84a0ba0b294dd41b3dc276224693837104080b01801a8f44e99c7b159d24d3a9eb53a2553ff23a831a0a2f012a4c7 diff --git a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch index d2f60ec91cc0..743583b5a0a3 100644 --- a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch +++ b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch @@ -1,8 +1,8 @@ Fixed default libpatttern on Darwin, imported from prefix overlay. Got merged upstream: https://savannah.gnu.org/bugs/?37197 ---- a/default.c -+++ b/default.c +--- a/src/default.c ++++ b/src/default.c @@ -509,7 +509,11 @@ #ifdef __MSDOS__ ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch index 4d592086a6ff..39e3ee0dd9f9 100644 --- a/sys-devel/make/files/make-4.2-default-cxx.patch +++ b/sys-devel/make/files/make-4.2-default-cxx.patch @@ -1,7 +1,5 @@ -diff --git a/default.c b/default.c -index 3d865c7..e8b3ed6 100644 ---- a/default.c -+++ b/default.c +--- a/src/default.c ++++ b/src/default.c @@ -530,7 +530,7 @@ static const char *default_variables[] = "OBJC", "gcc", #else diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index e8c5f2009dca..50caf0365bb0 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -14,7 +14,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then else SRC_URI="mirror://gnu//make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" @@ -32,12 +32,6 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-default-cxx.patch ) -src_prepare() { - # sources were moved into src directory - cd src || die - default -} - src_configure() { use static && append-ldflags -static local myeconfargs=( -- cgit v1.2.3