haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 20:20:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

lz4: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2015-06-01 16:49:00 +00:00
parent a12d46a2d5
commit d46686a990
2 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app-arch/lz4/lz4-r127.recipe → app-arch/lz4/lz4-r130.recipe
View File

@@ -10,7 +10,7 @@ LICENSE="BSD (2-clause)"
COPYRIGHT="2011-2014, Yann Collet"
SRC_URI="https://github.com/Cyan4973/lz4/archive/$portVersion.tar.gz"
SRC_FILENAME="lz4-$portVersion.tar.gz"
CHECKSUM_SHA256="5209bf7a2231b41222b0cea4229700bae459b523bc13db488f0e1279405e6b43"
CHECKSUM_SHA256="c48450d27524c2e5856997133e059e3cf9909241110a6e21ad278890ac425afc"
REVISION="1"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
@@ -19,7 +19,7 @@ PATCHES="lz4-$portVersion.patchset"
PROVIDES="
lz4${secondaryArchSuffix} = $portVersion
lib:liblz4${secondaryArchSuffix} = 1.5.0 compat >= 1
lib:liblz4${secondaryArchSuffix} = 1.7.0 compat >= 1
"
if [ -z "$secondaryArchSuffix" ]; then
@@ -63,7 +63,7 @@ INSTALL()
PROVIDES_devel="
lz4${secondaryArchSuffix}_devel = $portVersion
devel:liblz4$secondaryArchSuffix = 1.5.0 compat >= 1
devel:liblz4$secondaryArchSuffix = 1.7.0 compat >= 1
"
REQUIRES_devel="
lz4${secondaryArchSuffix} == $portVersion base

60
app-arch/lz4/patches/lz4-r127.patchset → app-arch/lz4/patches/lz4-r130.patchset
View File

@@ -1,14 +1,14 @@
From 5457d98c559c63e5243ab98ab3c96f0f611e4c0c Mon Sep 17 00:00:00 2001
From 3b8ba3c0dd4e03b68b2ad16e9f4a72ecf72a50a8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 5 Aug 2014 17:14:07 +0000
Subject: haiku patch
diff --git a/Makefile b/Makefile
index c486239..fd2e870 100644
index 88c4016..0dfd802 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ clean:
@@ -76,7 +76,7 @@ clean:
#------------------------------------------------------------------------
#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
@@ -18,19 +18,19 @@ index c486239..fd2e870 100644
install:
@cd $(LZ4DIR); $(MAKE) -e install
diff --git a/lib/Makefile b/lib/Makefile
index faffb39..ddb9d3a 100644
index 4be1499..25a731d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -41,7 +41,7 @@ LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
@@ -40,7 +40,7 @@ LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
DESTDIR?=
PREFIX ?= /usr
PREFIX ?= /usr/local
CFLAGS ?= -O3
-CFLAGS += -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -pedantic
-CFLAGS += -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wcast-qual -Wstrict-prototypes -pedantic
+CFLAGS += -I. -Wall -Wundef -Wshadow -Wstrict-prototypes -pedantic
LIBDIR?= $(PREFIX)/lib
INCLUDEDIR=$(PREFIX)/include
@@ -82,7 +82,7 @@ clean:
@@ -81,7 +81,7 @@ clean:
#------------------------------------------------------------------------
#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
@@ -39,47 +39,35 @@ index faffb39..ddb9d3a 100644
liblz4.pc: liblz4.pc.in Makefile
@echo creating pkgconfig
diff --git a/lib/xxhash.c b/lib/xxhash.c
index 093564c..ad6083a 100644
--- a/lib/xxhash.c
+++ b/lib/xxhash.c
@@ -118,6 +118,7 @@ typedef signed int S32;
typedef unsigned long long U64;
#endif
+#undef _PACKED
#if defined(__GNUC__) && !defined(XXH_USE_UNALIGNED_ACCESS)
# define _PACKED __attribute__ ((packed))
#else
diff --git a/programs/Makefile b/programs/Makefile
index 543eb7c..4f0cf3e 100644
index 39335db..d346edf 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -36,11 +36,11 @@ RELEASE?= r126
@@ -39,11 +39,11 @@ RELEASE?= r129
DESTDIR?=
PREFIX ?= /usr
PREFIX ?= /usr/local
CFLAGS ?= -O3
-CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\"
-CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\"
+CFLAGS += -Wall -Wundef -Wshadow -Wstrict-prototypes -pedantic -DLZ4_VERSION=\"$(RELEASE)\"
FLAGS = -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
FLAGS := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-BINDIR=$(PREFIX)/bin
-MANDIR=$(PREFIX)/share/man/man1
+#BINDIR=$(PREFIX)/bin
+#MANDIR=$(PREFIX)/share/man/man1
LZ4DIR=../lib
-BINDIR := $(PREFIX)/bin
-MANDIR := $(PREFIX)/share/man/man1
+#BINDIR := $(PREFIX)/bin
+#MANDIR := $(PREFIX)/share/man/man1
LZ4DIR := ../lib
TEST_FILES = COPYING
@@ -63,7 +63,7 @@ TRAVIS_TARGET=$(LZ4_TRAVIS_CI_ENV)
default: lz4 lz4c
@@ -70,7 +70,7 @@ m32: lz4c32 fullbench32 fuzzer32 frametest32
-all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 frametest frametest32 datagen
+all: lz4 lz4c fullbench fuzzer frametest datagen
bins: lz4 lz4c fullbench fuzzer frametest datagen
-all: bins m32
+all: bins
lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/lz4frame.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
$(CC) $(FLAGS) $^ -o $@$(EXT)
@@ -108,7 +108,7 @@ clean:
@@ -114,7 +114,7 @@ clean:
#------------------------------------------------------------------------
#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets