diff --git a/app-arch/lz4/patches/lz4-r117.patchset b/app-arch/lz4/patches/lz4-r117.patchset index 5d35fabec..4ec483daf 100644 --- a/app-arch/lz4/patches/lz4-r117.patchset +++ b/app-arch/lz4/patches/lz4-r117.patchset @@ -1,4 +1,4 @@ -From 7952c86f270994ebb54ba766f611a1b85ff05c7a Mon Sep 17 00:00:00 2001 +From 9c137ea48247801d309d867244820833685e2477 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 15 May 2014 16:14:06 +0000 Subject: undef _PACKED (defined in Bebuild.h) @@ -44,7 +44,7 @@ index 8304ec2..d4aa50e 100644 1.8.3.4 -From 1bc6acd83324a60c2de33dacb134735a65dba2bc Mon Sep 17 00:00:00 2001 +From 83f35b4005aa62773f52a843d3f515854baaf787 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 15 May 2014 16:18:40 +0000 Subject: PAGE_SIZE is already defined on Haiku @@ -66,7 +66,7 @@ index ba4f960..fa84aec 100644 1.8.3.4 -From ea21664533a79e4e3b58e0562a2c69233ec6fdc5 Mon Sep 17 00:00:00 2001 +From fbc8cf911a39fa5d64db09f5a3cf3d54f8614a24 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 15 May 2014 16:20:36 +0000 Subject: Haiku install support @@ -112,3 +112,62 @@ index 8ec0b85..aa5926b 100644 -- 1.8.3.4 + +From 52f22e57e55cc5f4dbaab5dc9acae3491916b306 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 16 May 2014 14:16:07 +0000 +Subject: gcc2 doesn't know std=c99 + + +diff --git a/Makefile b/Makefile +index c976c95..4964a59 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,7 +39,7 @@ LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH) + DESTDIR= + PREFIX=/usr + CC:=$(CC) +-CFLAGS+= -I. -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" ++CFLAGS+= -I. -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" + + LIBDIR=$(PREFIX)/lib + INCLUDEDIR=$(PREFIX)/include +diff --git a/programs/Makefile b/programs/Makefile +index aa5926b..e380c35 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -34,7 +34,7 @@ RELEASE=r116 + DESTDIR= + PREFIX=/usr + CC:=$(CC) +-CFLAGS+= -std=c99 -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" ++CFLAGS+= -O3 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\" + FLAGS= -I.. $(CFLAGS) + + #BINDIR=$(PREFIX)/bin +-- +1.8.3.4 + + +From bf73e35f83ed099523193493e77dd3b342937d89 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 16 May 2014 14:20:25 +0000 +Subject: we don't want 32-bit versions + + +diff --git a/programs/Makefile b/programs/Makefile +index e380c35..b89410f 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -53,7 +53,7 @@ endif + + default: lz4 lz4c + +-all: lz4 lz4c lz4c32 fuzzer fuzzer32 fullbench fullbench32 ++all: lz4 lz4c fuzzer fullbench + + lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c + $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) +-- +1.8.3.4 +