diff options
| -rw-r--r-- | testing/rocksdb/10-support-busybox-install.patch | 8 | ||||
| -rw-r--r-- | testing/rocksdb/20-skip-glibc-specific-features.patch | 23 | ||||
| -rw-r--r-- | testing/rocksdb/APKBUILD | 43 |
3 files changed, 17 insertions, 57 deletions
diff --git a/testing/rocksdb/10-support-busybox-install.patch b/testing/rocksdb/10-support-busybox-install.patch index 8974dfa9a09..1e20378c33b 100644 --- a/testing/rocksdb/10-support-busybox-install.patch +++ b/testing/rocksdb/10-support-busybox-install.patch @@ -1,17 +1,17 @@ --- a/Makefile +++ b/Makefile -@@ -996,14 +996,14 @@ install-headers: +@@ -1548,14 +1548,14 @@ install -d $(INSTALL_PATH)/$$header_dir; \ done - for header in `find "include/rocksdb" -type f -name *.h`; do \ + for header in `$(FIND) "include/rocksdb" -type f -name *.h`; do \ - install -C -m 644 $$header $(INSTALL_PATH)/$$header; \ + install -c -m 644 $$header $(INSTALL_PATH)/$$header; \ done - + install-static: install-headers $(LIBRARY) - install -C -m 755 $(LIBRARY) $(INSTALL_PATH)/lib + install -c -m 755 $(LIBRARY) $(INSTALL_PATH)/lib - + install-shared: install-headers $(SHARED4) - install -C -m 755 $(SHARED4) $(INSTALL_PATH)/lib && \ + install -c -m 755 $(SHARED4) $(INSTALL_PATH)/lib && \ diff --git a/testing/rocksdb/20-skip-glibc-specific-features.patch b/testing/rocksdb/20-skip-glibc-specific-features.patch deleted file mode 100644 index b331a42e2d0..00000000000 --- a/testing/rocksdb/20-skip-glibc-specific-features.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/port/port_posix.cc -+++ b/port/port_posix.cc -@@ -32,7 +32,7 @@ static int PthreadCall(const char* label, int result) { - } - - Mutex::Mutex(bool adaptive) { --#ifdef OS_LINUX -+#if 0 - if (!adaptive) { - PthreadCall("init mutex", pthread_mutex_init(&mu_, nullptr)); - } else { ---- a/port/stack_trace.cc -+++ b/port/stack_trace.cc -@@ -5,8 +5,7 @@ - // - #include "port/stack_trace.h" - --#if defined(ROCKSDB_LITE) || !(defined(OS_LINUX) || defined(OS_MACOSX)) || \ -- defined(CYGWIN) -+#if 1 - - // noop - diff --git a/testing/rocksdb/APKBUILD b/testing/rocksdb/APKBUILD index 978056fd2f8..054b53bb594 100644 --- a/testing/rocksdb/APKBUILD +++ b/testing/rocksdb/APKBUILD @@ -1,32 +1,22 @@ # Contributor: James Bowes <jbowes@repl.ca> # Maintainer: pkgname=rocksdb -pkgver=4.2 -pkgrel=2 +pkgver=5.15.10 +pkgrel=3 pkgdesc="A persistent key-value store for fast storage environments" -url="http://rocksdb.org" -arch="x86_64" -license="BSD" +url="https://rocksdb.org" +arch="all" +license="GPL-2.0" depends="" -depends_dev="bzip2-dev snappy-dev zlib-dev" -makedepends="$depends_dev linux-headers" +depends_dev="bzip2-dev snappy-dev zlib-dev lz4-dev zstd-dev" +makedepends="$depends_dev linux-headers bash perl" install="" subpackages="$pkgname-dev $pkgname-doc" +options="!check" # no upstream/available test-suite source="$pkgname-$pkgver.tar.gz::https://github.com/facebook/$pkgname/archive/v$pkgver.tar.gz - 10-support-busybox-install.patch - 20-skip-glibc-specific-features.patch" + 10-support-busybox-install.patch" _builddir="$srcdir/$pkgname-$pkgver" -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - build() { cd "$_builddir" make shared_lib @@ -35,19 +25,12 @@ build() { package() { cd "$_builddir" INSTALL_PATH="$pkgdir"/usr make install-shared - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING mkdir -p "$pkgdir"/usr/share/doc - cp -a doc "$pkgdir"/usr/share/doc/$pkgname + cp -a docs "$pkgdir"/usr/share/doc/$pkgname install -Dm644 README.md "$pkgdir"/usr/share/doc/$pkgname/README.md install -Dm644 HISTORY.md "$pkgdir"/usr/share/doc/$pkgname/HISTORY.md } -md5sums="503a821e3fcc1bda759a99f934c14875 rocksdb-4.2.tar.gz -cfb497c3c250089632bd79d37f5ee686 10-support-busybox-install.patch -b6f3ad1dac1df1378647236de310bd4f 20-skip-glibc-specific-features.patch" -sha256sums="83d89ca5b7574328b2380132413ba1e1e6fe5688d1cf1c85f1d2910d93e68f4c rocksdb-4.2.tar.gz -f96e21398f1bbd2e508280f294bfe8cafd4e750aa32d56fa89da32e2014f2304 10-support-busybox-install.patch -0036ae5fd12bc0941aee572b5f5f28a4ccc296d64e19bcc3309af6a26b0f4ab9 20-skip-glibc-specific-features.patch" -sha512sums="ac95f2ad5f0d31f189308b4b664d45468d7cdb05330f2cc9fd013f9541c91e69f8766c34483b8154753c93693467592b2a04e80f852e67cb6a4cf20c1f754390 rocksdb-4.2.tar.gz -ef35fec6d4c831b1ede297466bc9a06db8884e79c1b6fb0d2757e02aee933eb36269d067aaa665cbbd2b5b2854777ea56692a318f45a928c8d8161bf74576aef 10-support-busybox-install.patch -6e6e93fa05cc7225cef381b020bd2a4e94bb8d38fa930d8117e8f2f1afd2abb1604c129892c891a8c9cc8f52bcdf2f6856d855bb717b7f71a2f0499f23b613d8 20-skip-glibc-specific-features.patch" +sha512sums="3faef43cc343c20e044f92af7cd9eae9783612d888bfe17b7d0ae6812090088f43a128e5686600ec56f5a88c100eaa893b2551f8c32df793a4ccd94330c07037 rocksdb-5.15.10.tar.gz +2b33041baa061e6cedfcbc606fd9752d907ebba84cb76ff13641ac4683e614e527530453bcbe0e0c6b67b36415dee477aec268024a05b8815c534f4d6bfb6cc0 10-support-busybox-install.patch" |