From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Sep 2018 17:37:09 +0100 Subject: gentoo resync : 15.09.2018 --- dev-libs/xxhash/Manifest | 3 ++- .../files/xxhash-0.6.5-compile-xxhash.o-once.patch | 28 ++++++++++++++++++++++ dev-libs/xxhash/xxhash-0.6.5.ebuild | 8 +++---- 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 dev-libs/xxhash/files/xxhash-0.6.5-compile-xxhash.o-once.patch (limited to 'dev-libs/xxhash') diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest index 333ff81e7add..2cbde0c0c26d 100644 --- a/dev-libs/xxhash/Manifest +++ b/dev-libs/xxhash/Manifest @@ -1,3 +1,4 @@ +AUX xxhash-0.6.5-compile-xxhash.o-once.patch 746 BLAKE2B 697ff4de0dc4540a084b5373b8684d922f8d338ba96f23035647ec5ec5736296fbf2ecda4cb0fb1837a251fde2cd9660fb0e54c44fca8b61c5936e06044c0a8f SHA512 a357ab65f3ae8c1a63565c2d488e5626ade11fd5547a8c896b99bcefa2e4cc59843be6d7c04534341dd4c4057b24d946a0005b68ad27047fece09f56bfb0e139 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0 -EBUILD xxhash-0.6.5.ebuild 845 BLAKE2B 5a40f8029b7c27a74b3067093fd54461003370d7af026423230806376c450a179ad680f81fe76fc42845de61c7408bfe1b258e61c3358b90aa5c6de67ec381b4 SHA512 8dd17ec00173f5b19e6d9384e017a8685a7f482af2406b55e320b1392622e127a4c39776043db418d7ddbeca86497d95ec0ff09daf20c121911ab311e7c4b48c +EBUILD xxhash-0.6.5.ebuild 906 BLAKE2B 3191d7dd2ec037d5c041a50ebdb1daf53b1a24071a310698aeb3b74085b0e08c7ceb3c2a881c065a9462916c9c270747c48e2de201d86f7e13d7bec1f99371a8 SHA512 d628a41b1fa9eb62b7290a5b495f877f1b7d77acbff8ac9322a1624480ad71660cce677db7c3b5d129b6f749029ff5a38b5e4557cc91e3cdb687b54020b41127 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e 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 000000000000..2eb7f8c22a8b --- /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/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild index 2b31be40a067..f01881f5cb10 100644 --- a/dev-libs/xxhash/xxhash-0.6.5.ebuild +++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 - inherit toolchain-funcs DESCRIPTION="Extremely fast non-cryptographic hash algorithm" @@ -11,12 +10,13 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD-2 GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x64-macos" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x64-macos" IUSE="static-libs" -DEPEND="" - S="${WORKDIR}/xxHash-${PV}" +PATCHES=( + "${FILESDIR}"/${PN}-0.6.5-compile-xxhash.o-once.patch +) src_compile() { PREFIX="${EPREFIX}/usr" \ -- cgit v1.2.3