upgrading package: lz4 131 -> 1.9.2

6 years ago · 4247f2b0d8
2 changed files with 37 additions and 114 deletions
--- a/lz4/lz4.patch
+++ b/lz4/lz4.patch
@ -1,109 +1,27 @@
-Index: Makefile
--- Makefile.orig	2015-06-29 11:48:37.000000000 +0200
-+++ Makefile	2016-03-27 14:59:46.147399246 +0200
-@@ -81,7 +81,6 @@
- 
- #------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
- 
- install:
- 	@cd $(LZ4DIR); $(MAKE) -e install
-@@ -129,4 +128,3 @@
- prg-travis:
- 	@cd $(PRGDIR); $(MAKE) -e test-travis
- 
-endif
 Index: lib/Makefile
--- lib/Makefile.orig	2015-06-29 11:48:37.000000000 +0200
-+++ lib/Makefile	2016-03-27 14:59:46.147399246 +0200
-@@ -60,19 +60,13 @@
- 	SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
- endif
- 
-default: liblz4
-+default: all
- 
-all: liblz4
-+all: liblz4 liblz4.pc
- 
- liblz4: lz4.c lz4hc.c lz4frame.c xxhash.c
-	@echo compiling static library
-	@$(CC) $(CPPFLAGS) $(CFLAGS) -c $^
-	@$(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o
-	@echo compiling dynamic library $(LIBVER)
-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
-	@echo creating versioned links
-	@ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
-	@ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $^
-+	$(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o
- 
- clean:
- 	@rm -f core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* liblz4.pc
-@@ -81,7 +75,6 @@
- 
- #------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
+--- lib/Makefile.orig	2019-08-15 13:59:59.000000000 +0200
+++ lib/Makefile	2020-01-05 10:17:37.565039000 +0100
+@@ -155,11 +155,7 @@
+ INCLUDEDIR  ?= $(prefix)/include
+ includedir  ?= $(INCLUDEDIR)
+ 
+-  ifneq (,$(filter $(TARGET_OS),OpenBSD FreeBSD NetBSD DragonFly MidnightBSD))
+-PKGCONFIGDIR ?= $(prefix)/libdata/pkgconfig
+-  else
+ PKGCONFIGDIR ?= $(libdir)/pkgconfig
+-  endif
+ pkgconfigdir ?= $(PKGCONFIGDIR)
 
 liblz4.pc: liblz4.pc.in Makefile
- 	@echo creating pkgconfig
-@@ -91,11 +84,8 @@
-             -e 's|@VERSION@|$(VERSION)|' \
-              $< >$@
- 
-install: liblz4 liblz4.pc
-+install:
- 	@install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-	@install -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_VER)
-	@cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
-	@cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
- 	@cp -a liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
- 	@install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
- 	@install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
-@@ -114,4 +104,3 @@
- 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
- 	@echo lz4 libraries successfully uninstalled
- 
-endif
 Index: programs/Makefile
--- programs/Makefile.orig	2015-06-29 11:48:37.000000000 +0200
-+++ programs/Makefile	2016-03-27 15:00:35.487812971 +0200
-@@ -43,7 +43,7 @@
- FLAGS  := -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
- 
- BINDIR := $(PREFIX)/bin
-MANDIR := $(PREFIX)/share/man/man1
-+MANDIR := $(PREFIX)/man/man1
- LZ4DIR := ../lib
- 
- 
-@@ -68,9 +68,9 @@
- 
- m32: lz4c32 fullbench32 fuzzer32 frametest32
- 
-bins: lz4 lz4c fullbench fuzzer frametest datagen
-+bins: lz4 lz4c
- 
-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)
-@@ -114,9 +114,8 @@
- 
- #------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
- 
-install: lz4 lz4c
-+install:
- 	@echo Installing binaries
- 	@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
- 	@install -m 755 lz4 $(DESTDIR)$(BINDIR)/lz4
-@@ -307,4 +306,3 @@
- test-mem32: lz4c32 datagen
- # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system...
- 
-endif
+--- programs/Makefile.orig	2019-08-15 13:59:59.000000000 +0200
+++ programs/Makefile	2020-01-05 10:18:54.026976000 +0100
+@@ -138,7 +138,7 @@
+ exec_prefix ?= $(EXEC_PREFIX)
+ BINDIR      ?= $(exec_prefix)/bin
+ bindir      ?= $(BINDIR)
+-DATAROOTDIR ?= $(prefix)/share
+DATAROOTDIR ?= $(prefix)
+ datarootdir ?= $(DATAROOTDIR)
+ MANDIR      ?= $(datarootdir)/man
+ mandir      ?= $(MANDIR)
--- a/lz4/lz4.spec
+++ b/lz4/lz4.spec
@ -31,11 +31,11 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Compression
 License:      BSD
-Version:      131
-Release:      20160327
+Version:      1.9.2
+Release:      20200105

 #   list of sources
-Source0:      https://github.com/Cyan4973/lz4/archive/r%{version}.tar.gz
+Source0:      https://github.com/lz4/lz4/archive/v%{version}.tar.gz
 Patch0:       lz4.patch

 #   build information
@ -53,23 +53,28 @@ PreReq:       OpenPKG, openpkg >= 20160101
 %track
    prog lz4 = {
        version   = %{version}
-        url       = https://github.com/Cyan4973/lz4/releases
-        regex     = r(\d+)\.tar\.gz
+        url       = https://github.com/lz4/lz4/releases
+        regex     = v(\d+\.\d+\.\d+)\.tar\.gz
    }

 %prep
-    %setup -q -n lz4-r%{version}
+    %setup -q -n lz4-%{version}
    %patch -p0

 %build
-    %{l_make} %{l_mflags} all \
+    %{l_make} %{l_mflags} \
        CC="%{l_cc}" \
-        CFLAGS="%{l_cflags -O}"
+        CFLAGS="%{l_cflags -O}" \
+        BUILD_SHARED=no \
+        BUILD_STATIC=yes \
+        V=1

 %install
    %{l_make} %{l_mflags} install \
        DESTDIR=$RPM_BUILD_ROOT \
-        PREFIX=%{l_prefix}
+        PREFIX=%{l_prefix} \
+        BUILD_SHARED=no \
+        BUILD_STATIC=yes
    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}