* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xxhash/, dev-libs/xxhash/files/
@ 2018-03-07 13:16 Guilherme Amadio
0 siblings, 0 replies; 4+ messages in thread
From: Guilherme Amadio @ 2018-03-07 13:16 UTC (permalink / raw
To: gentoo-commits
commit: 5344a12960e267c18b7d90163a99b1f4e1fb1527
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 7 13:07:39 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Mar 7 13:15:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5344a129
dev-libs/xxhash: new package
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-libs/xxhash/Manifest | 1 +
dev-libs/xxhash/files/xxhash-staticlib.patch | 27 +++++++++++++++++++++++++++
dev-libs/xxhash/metadata.xml | 12 ++++++++++++
dev-libs/xxhash/xxhash-0.6.4.ebuild | 24 ++++++++++++++++++++++++
4 files changed, 64 insertions(+)
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
new file mode 100644
index 00000000000..58202f6ce63
--- /dev/null
+++ b/dev-libs/xxhash/Manifest
@@ -0,0 +1 @@
+DIST xxhash-0.6.4.tar.gz 28995 BLAKE2B 2556ac14e6a6b1341adeeba244ad5bac7b52ff43b5d85acfc51de903771f1a7b32defeab657db765d21a33ec49aee1a892617d6656a152ad5ce6e1636a743e18 SHA512 6c914bac5092dfd01349c8223c382d3c13ba1b22e08300ce86ea9663a9a934f930debdeb71c14365ec57d72b95088a4354da92dfb7fcf7d07ec01c0f4fb70ca7
diff --git a/dev-libs/xxhash/files/xxhash-staticlib.patch b/dev-libs/xxhash/files/xxhash-staticlib.patch
new file mode 100644
index 00000000000..b30ac93dbef
--- /dev/null
+++ b/dev-libs/xxhash/files/xxhash-staticlib.patch
@@ -0,0 +1,27 @@
+Only in xxHash-0.6.3.orig/cmake_unofficial: CMakeLists.txt
+diff -ru xxHash-0.6.3.orig/Makefile xxHash-0.6.3/Makefile
+--- xxHash-0.6.3.orig/Makefile 2017-12-18 10:47:41.740700013 +0100
++++ xxHash-0.6.3/Makefile 2017-12-18 11:14:05.157379597 +0100
+@@ -50,7 +50,7 @@
+ default: xxhsum
+
+ .PHONY: all
+-all: xxhsum xxhsum32 xxhsum_inlinedXXH
++all: xxhsum xxhsum32 xxhsum_inlinedXXH libxxhash.a
+
+ xxhsum32: CFLAGS += -m32
+ xxhsum xxhsum32: xxhash.c xxhsum.c
+@@ -58,6 +58,13 @@
+ ln -sf $@ xxh32sum
+ ln -sf $@ xxh64sum
+
++xxhash.o: CPPFLAGS += -DXXHASH_EXPORT
++xxhash.o: xxhash.c
++ $(CC) $(FLAGS) -c $^
++
++libxxhash.a: xxhash.o
++ $(AR) rcs $@ $^ $@
++
+ xxhsum_inlinedXXH: xxhsum.c
+ $(CC) $(FLAGS) -DXXH_PRIVATE_API $^ -o $@$(EXT)
+
diff --git a/dev-libs/xxhash/metadata.xml b/dev-libs/xxhash/metadata.xml
new file mode 100644
index 00000000000..ffe46e89cab
--- /dev/null
+++ b/dev-libs/xxhash/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>amadio@gentoo.org</email>
+ <name>Guilherme Amadio</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Cyan4973/xxHash</remote-id>
+ <bugs-to>https://github.com/Cyan4973/xxHash/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-libs/xxhash/xxhash-0.6.4.ebuild b/dev-libs/xxhash/xxhash-0.6.4.ebuild
new file mode 100644
index 00000000000..e21fdc1aa0d
--- /dev/null
+++ b/dev-libs/xxhash/xxhash-0.6.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Extremely fast non-cryptographic hash algorithm"
+HOMEPAGE="http://www.xxhash.com"
+SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND=""
+
+S="${WORKDIR}/xxHash-${PV}"
+
+src_install() {
+ PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" emake DESTDIR="${D}" install
+ if ! use static-libs ; then
+ rm "${ED}"/usr/$(get_libdir)/libxxhash.a || die
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xxhash/, dev-libs/xxhash/files/
@ 2018-09-08 13:28 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-09-08 13:28 UTC (permalink / raw
To: gentoo-commits
commit: 01e24f2cd0d3bea9dab9c6047648941d677dbcb6
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 8 13:28:03 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Sep 8 13:28:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e24f2c
dev-libs/xxhash: Compile xxhash.o once
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch | 11 +++++++++++
dev-libs/xxhash/xxhash-0.6.5.ebuild | 3 +++
2 files changed, 14 insertions(+)
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
new file mode 100644
index 00000000000..dcbc8c32dec
--- /dev/null
+++ b/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch
@@ -0,0 +1,11 @@
+--- 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 f23c18c478a..f8633569a91 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -16,6 +16,9 @@ IUSE="static-libs"
DEPEND=""
S="${WORKDIR}/xxHash-${PV}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.6.5-do-not-compile-xxhash.o-twice.patch
+)
src_configure() {
use hppa && replace-flags '-O*' '-O0'
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xxhash/, dev-libs/xxhash/files/
@ 2018-09-09 9:44 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-09-09 9:44 UTC (permalink / raw
To: gentoo-commits
commit: 173c62837c28971e2c0c3bbc038ec16fe4930b38
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 9 09:39:58 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> 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() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/xxhash/, dev-libs/xxhash/files/
@ 2018-09-17 9:50 Guilherme Amadio
0 siblings, 0 replies; 4+ messages in thread
From: Guilherme Amadio @ 2018-09-17 9:50 UTC (permalink / raw
To: gentoo-commits
commit: 9e004b8041e0ad0dac24797b8b7c0d26d0271cab
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 09:40:25 2018 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 09:40:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e004b80
Revert "dev-libs/xxhash: Compile xxhash.c just once, really"
This reverts commit 173c62837c28971e2c0c3bbc038ec16fe4930b38.
.../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, 12 insertions(+), 29 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
deleted file mode 100644
index 2eb7f8c22a8..00000000000
--- a/dev-libs/xxhash/files/xxhash-0.6.5-compile-xxhash.o-once.patch
+++ /dev/null
@@ -1,28 +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
-@@ -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
new file mode 100644
index 00000000000..dcbc8c32dec
--- /dev/null
+++ b/dev-libs/xxhash/files/xxhash-0.6.5-do-not-compile-xxhash.o-twice.patch
@@ -0,0 +1,11 @@
+--- 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 f01881f5cb1..18a037770e5 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -15,7 +15,7 @@ IUSE="static-libs"
S="${WORKDIR}/xxHash-${PV}"
PATCHES=(
- "${FILESDIR}"/${PN}-0.6.5-compile-xxhash.o-once.patch
+ "${FILESDIR}"/${PN}-0.6.5-do-not-compile-xxhash.o-twice.patch
)
src_compile() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-17 9:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-09 9:44 [gentoo-commits] repo/gentoo:master commit in: dev-libs/xxhash/, dev-libs/xxhash/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2018-09-17 9:50 Guilherme Amadio
2018-09-08 13:28 Jeroen Roovers
2018-03-07 13:16 Guilherme Amadio
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox