diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2016-08-17 18:05:28 +0200 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2016-08-17 18:06:00 +0200 |
commit | 81b83dcb0ef15d0048824bd2aa7d6826c775dbe6 (patch) | |
tree | ccec72b9d976c5e241332ee1c2a2ffc226ef27e7 /testing/java-snappy | |
parent | 446f21b2944f6415050f9119603db31f6927b8d3 (diff) | |
download | aports-81b83dcb0ef15d0048824bd2aa7d6826c775dbe6.tar.bz2 aports-81b83dcb0ef15d0048824bd2aa7d6826c775dbe6.tar.xz |
community/java-snappy: move from testing
Diffstat (limited to 'testing/java-snappy')
-rw-r--r-- | testing/java-snappy/0001-unbundle-snappy.patch | 59 | ||||
-rw-r--r-- | testing/java-snappy/APKBUILD | 68 |
2 files changed, 0 insertions, 127 deletions
diff --git a/testing/java-snappy/0001-unbundle-snappy.patch b/testing/java-snappy/0001-unbundle-snappy.patch deleted file mode 100644 index b89602386a..0000000000 --- a/testing/java-snappy/0001-unbundle-snappy.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Wed, 6 Apr 2016 00:52:00 +0200 -Subject: [PATCH] Unbundle snappy - -Use system-provided snappy library instead of downloading and building -snappy from the upstream. - -diff --git a/Makefile b/Makefile -index 13838dc..14feedd 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,7 +8,7 @@ all: snappy - - SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch) - SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz --SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc -+SNAPPY_CC:= - SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION) - SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) - SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o) -@@ -59,7 +59,7 @@ $(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy - $(JAVAH) -force -classpath $(TARGET)/jni-classes -o $@ org.xerial.snappy.SnappyNative - - ifndef USE_GIT -- $(SNAPPY_SRC): $(SNAPPY_UNPACKED) -+ $(SNAPPY_SRC): - else - $(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED) - endif -@@ -74,7 +74,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/ - - - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy - $(STRIP) $@ - - clean-native: -@@ -90,17 +90,18 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) - snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d") - - ifndef USE_GIT -- native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) -+ native: $(NATIVE_DLL) - else - native: $(SNAPPY_GIT_UNPACKED) $(NATIVE_DLL) - endif --snappy: native $(TARGET)/$(snappy-jar-version).jar -+snappy: native - - $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) - @mkdir -p $(@D) - cp $< $@ - @mkdir -p $(NATIVE_TARGET_DIR) - cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME) -+ cp $< $(TARGET)/ - - - package: $(TARGET)/$(snappy-jar-version).jar diff --git a/testing/java-snappy/APKBUILD b/testing/java-snappy/APKBUILD deleted file mode 100644 index bfb7bb30a2..0000000000 --- a/testing/java-snappy/APKBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Contributor: Jakub Jirutka <jakub@jirutka.cz> -# Maintainer: Jakub Jirutka <jakub@jirutka.cz> -pkgname=java-snappy -_pkgname=snappy-java -pkgver=1.1.2.6 -_libver=${pkgver%.*} -pkgrel=0 -pkgdesc="Snappy compressor/decompressor for Java" -url="https://github.com/xerial/snappy-java" -arch="x86_64 x86" -license="ASL-2.0" -depends="openjdk8-jre-base" -makedepends="bash openjdk8 perl snappy-dev>=$_libver" -subpackages="$pkgname-native" -source="$pkgname-$pkgver.tar.gz::https://github.com/xerial/$_pkgname/archive/$pkgver.tar.gz - 0001-unbundle-snappy.patch - " -builddir="$srcdir/$_pkgname-$pkgver" - -prepare() { - default_prepare || return 1 - - cd "$builddir" - - # Get rid of bundled native binaries. - rm -r src/main/resources/org/xerial/snappy/native - - # To load libsnappyjava.so from java.library.path. - cat > src/main/resources/org-xerial-snappy.properties <<-EOF - org.xerial.snappy.use.systemlib=true - EOF -} - -build() { - cd "$builddir" - - JAVA_HOME=/usr/lib/jvm/default-jvm \ - make || return 1 - - msg "Downloading SBT and then building JAR (this will take few minutes)..." - ./sbt -Dsbt.boot.directory=/tmp/sbt/boot \ - -Dsbt.ivy.home=/tmp/sbt/.ivy2 \ - package -} - -package() { - arch="noarch" - depends="$depends $pkgname-native" - - install -m644 -D "$builddir"/target/$_pkgname-*.jar \ - "$pkgdir"/usr/share/java/$_pkgname-$pkgver.jar || return 1 - ln -sf $_pkgname-$pkgver.jar "$pkgdir"/usr/share/java/$_pkgname.jar -} - -native() { - local soname="libsnappyjava.so" - - install -m755 -D "$builddir"/target/$soname \ - "$subpkgdir"/usr/lib/$soname.$_libver || return 1 - ln -sf $soname.$_libver "$subpkgdir"/usr/lib/$soname -} - -md5sums="8938dc2d64ec7405581faa454bdf8ed2 java-snappy-1.1.2.6.tar.gz -1bf623f419c1103bce8a76ef129e974b 0001-unbundle-snappy.patch" -sha256sums="404fa39e5337f08b5c80b20b45096af805b5abb3ded126ef63e43ba4538e8d6e java-snappy-1.1.2.6.tar.gz -d624485186c880d7a7ede00b81e70ae345b9f429a218dd49bb85d3a9fb837cfe 0001-unbundle-snappy.patch" -sha512sums="647c7942249fd08d402538da5442bbbbd6a3fc2d6173999253ebcf270e8dea5135a2c702c12ea1f170e3e187f0092270d9d7db28593c438c58a7eb9dd2ca157c java-snappy-1.1.2.6.tar.gz -23aa84f1bee4f2a419402912e17ee04259f37a41a2eac9a6cc271d7a87899778a196b9bbcced856335bb56ea905bd6448f4ef39da9cbd8c83882506651e13a9c 0001-unbundle-snappy.patch" |