diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-libs/libtomcrypt | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-libs/libtomcrypt')
| -rw-r--r-- | dev-libs/libtomcrypt/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch | 45 |
2 files changed, 46 insertions, 1 deletions
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest index 5321bbb7da3a..47ca5dc18052 100644 --- a/dev-libs/libtomcrypt/Manifest +++ b/dev-libs/libtomcrypt/Manifest @@ -1,4 +1,4 @@ -AUX libtomcrypt-1.18.2-slibtool.patch 2859 BLAKE2B 2af276b50dd627a7dab88b6d349c908a32b364b0cbf199d14ca43019a65c4ac47ec16f8498c22e27454ce0144286502253fe3434cade6a614c7f9162d99fb20c SHA512 f6c5a802a581971b309815f82416c649a388e853c143f849bf89478ca4b9d883b3ab426c4ab5bbd94b5748d5b466f6ec56336c18959ca1c3ef5396b5be8d2da0 +AUX libtomcrypt-1.18.2-slibtool.patch 4038 BLAKE2B 5fe1dadfc6afbc8f85f104299ff7b45706df3df5698f3375c83f4f573ea662a61158602e03b4c89da57969896181865f1f6b29ae6695ad71a3ab19adf4c559d8 SHA512 9486ae1abfe429d1dbe54185bb8b1fb1dc0550ae1089a000baf7afa4b6aa5011a4f1ad1b404b87a90fdae078125fcfd809298a46962a3cbba44d233231a834f7 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893 EBUILD libtomcrypt-1.18.2-r2.ebuild 2948 BLAKE2B 6621119cf52e105c1fc2bb8d25558cda5e4411f7d06e9844bd7d2bb59f2799c50bd2c82f3642df701dcedef41d78bf9de8d218a124ca01a659cb34f1e946eb26 SHA512 00353d27023436f1d4154a6179ce17d74a1d5f342cfd58ff8bc4109c7841c97bbaa52106b5c337c0ac9000f25a4e6d0335653e0764c63ffe6ea165be2cb21953 MISC metadata.xml 643 BLAKE2B e66df23ddfeb04650dfa8c4cbd7d6e6a1816164fd0cac86dba9990610b672957c5ff7b6e83a17f8b6c19f75d1f50a1b448b8b618058510b8d6f54259ad451822 SHA512 7517fc02844cd6b9a9801b371c2c8faf9626dded317ad610af234cd89078221be021acb9da66f9078bb4b754a5e2f1b5efcbca2ccb1ef5c58afd8cf925e7a44e diff --git a/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch b/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch index 5c7bcda502c3..b783ed1d2440 100644 --- a/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch +++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch @@ -1,4 +1,6 @@ https://github.com/libtom/libtomcrypt/pull/433 +(and then https://github.com/libtom/libtomcrypt/commit/4b3ef7890156a55889b6657e4b295a77907c1f0f) + https://bugs.gentoo.org/777084 From ccc18b9eda52c31cc70a3e46eb33b87b3c076d65 Mon Sep 17 00:00:00 2001 @@ -70,3 +72,46 @@ index 98ec2b501..c72f2ac8d 100644 endef $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo)))) +From 4b3ef7890156a55889b6657e4b295a77907c1f0f Mon Sep 17 00:00:00 2001 +From: Steffen Jaeckel <s@jaeckel.eu> +Date: Mon, 3 Jun 2019 09:32:06 +0200 +Subject: [PATCH] TGTLIBTOOL wasn't always defined + +--- + makefile.shared | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +diff --git a/makefile.shared b/makefile.shared +index c72f2ac8d..e63d77032 100644 +--- a/makefile.shared ++++ b/makefile.shared +@@ -18,19 +18,22 @@ PLATFORM := $(shell uname | sed -e 's/_.*//') + + ifeq ($(LIBTOOL),rlibtool) + TGTLIBTOOL:=slibtool-shared +-endif +- +-ifndef LIBTOOL +- ifeq ($(PLATFORM), Darwin) +- LIBTOOL:=glibtool ++else ++ ifndef LIBTOOL ++ ifeq ($(PLATFORM), Darwin) ++ TGTLIBTOOL:=glibtool ++ else ++ TGTLIBTOOL:=libtool ++ endif + else +- LIBTOOL:=libtool ++ TGTLIBTOOL=$(LIBTOOL) + endif +- TGTLIBTOOL=$(LIBTOOL) + endif ++ + ifeq ($(PLATFORM), CYGWIN) + NO_UNDEFINED:=-no-undefined + endif ++ + LTCOMPILE = $(TGTLIBTOOL) --mode=compile --tag=CC $(CC) + INSTALL_CMD = $(TGTLIBTOOL) --mode=install install + UNINSTALL_CMD = $(TGTLIBTOOL) --mode=uninstall rm |