From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 49306138335 for ; Sun, 9 Sep 2018 09:44:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 024E0E08C9; Sun, 9 Sep 2018 09:44:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1E5EE08C9 for ; Sun, 9 Sep 2018 09:44:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB91B340CDF for ; Sun, 9 Sep 2018 09:44:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 346AA3B1 for ; Sun, 9 Sep 2018 09:44:42 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1536486274.173c62837c28971e2c0c3bbc038ec16fe4930b38.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xxhash/, dev-libs/xxhash/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/xxhash/files/xxhash-0.6.5-compile-xxhash.o-once.patch dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch dev-libs/xxhash/xxhash-0.6.5.ebuild X-VCS-Directories: dev-libs/xxhash/ dev-libs/xxhash/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 173c62837c28971e2c0c3bbc038ec16fe4930b38 X-VCS-Branch: master Date: Sun, 9 Sep 2018 09:44:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5af39c4d-f23a-4274-af63-c8d89e59fe10 X-Archives-Hash: 04fb86869ef19a07b3a2393d9adb58a0 commit: 173c62837c28971e2c0c3bbc038ec16fe4930b38 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Sep 9 09:39:58 2018 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Sep 9 09:44:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=173c6283 dev-libs/xxhash: Compile xxhash.c just once, really Package-Manager: Portage-2.3.49, Repoman-2.3.10 .../files/xxhash-0.6.5-compile-xxhash.o-once.patch | 28 ++++++++++++++++++++++ ...xhash-0.6.5-do-not-compile-xxhash.o-twice.patch | 11 --------- dev-libs/xxhash/xxhash-0.6.5.ebuild | 2 +- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dev-libs/xxhash/files/xxhash-0.6.5-compile-xxhash.o-once.patch b/dev-libs/xxhash/files/xxhash-0.6.5-compile-xxhash.o-once.patch new file mode 100644 index 00000000000..2eb7f8c22a8 --- /dev/null +++ b/dev-libs/xxhash/files/xxhash-0.6.5-compile-xxhash.o-once.patch @@ -0,0 +1,28 @@ +--- a/Makefile ++++ b/Makefile +@@ -82,7 +82,7 @@ + all: lib xxhsum xxhsum_inlinedXXH + + xxhsum32: CFLAGS += -m32 +-xxhsum xxhsum32: xxhash.c xxhsum.c ++xxhsum xxhsum32: xxhash.o xxhsum.c + $(CC) $(FLAGS) $^ -o $@$(EXT) + + .PHONY: xxhsum_and_links +@@ -105,12 +105,12 @@ + ifeq (,$(filter Windows%,$(OS))) + $(LIBXXH): LDFLAGS += -fPIC + endif +-$(LIBXXH): xxhash.c ++$(LIBXXH): xxhash.o + @echo compiling dynamic library $(LIBVER) +- @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ ++ $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@ + @echo creating versioned links +- @ln -sf $@ libxxhash.$(SHARED_EXT_MAJOR) +- @ln -sf $@ libxxhash.$(SHARED_EXT) ++ ln -sf $@ libxxhash.$(SHARED_EXT_MAJOR) ++ ln -sf $@ libxxhash.$(SHARED_EXT) + + libxxhash : $(LIBXXH) + diff --git a/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch b/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch deleted file mode 100644 index dcbc8c32dec..00000000000 --- a/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -82,7 +82,7 @@ - all: lib xxhsum xxhsum_inlinedXXH - - xxhsum32: CFLAGS += -m32 --xxhsum xxhsum32: xxhash.c xxhsum.c -+xxhsum xxhsum32: xxhash.o xxhsum.c - $(CC) $(FLAGS) $^ -o $@$(EXT) - - .PHONY: xxhsum_and_links diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild index f8633569a91..503fce79380 100644 --- a/dev-libs/xxhash/xxhash-0.6.5.ebuild +++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild @@ -17,7 +17,7 @@ DEPEND="" S="${WORKDIR}/xxHash-${PV}" PATCHES=( - "${FILESDIR}"/${PN}-0.6.5-do-not-compile-xxhash.o-twice.patch + "${FILESDIR}"/${PN}-0.6.5-compile-xxhash.o-once.patch ) src_configure() {