From 27a9da09ec6df2c86dcbc013121e58167739e9aa Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 13 Apr 2018 02:39:09 +0100 Subject: [PATCH] Import lz4_1.8.1.2-1.debian.tar.xz [dgit import tarball lz4 1.8.1.2-1 lz4_1.8.1.2-1.debian.tar.xz] --- changelog | 235 +++++++++++++++++++++++++++++ compat | 1 + control | 68 +++++++++ copyright | 105 +++++++++++++ liblz4-1.install | 1 + liblz4-1.symbols | 89 +++++++++++ liblz4-dev.install | 4 + lz4.install | 1 + lz4.manpages | 1 + patches/0001-show-build-info.patch | 73 +++++++++ patches/0002-Fix-static-link.patch | 57 +++++++ patches/series | 2 + rules | 48 ++++++ source/format | 1 + 14 files changed, 686 insertions(+) create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 liblz4-1.install create mode 100644 liblz4-1.symbols create mode 100644 liblz4-dev.install create mode 100644 lz4.install create mode 100644 lz4.manpages create mode 100644 patches/0001-show-build-info.patch create mode 100644 patches/0002-Fix-static-link.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format diff --git a/changelog b/changelog new file mode 100644 index 0000000..e5cdf04 --- /dev/null +++ b/changelog @@ -0,0 +1,235 @@ +lz4 (1.8.1.2-1) unstable; urgency=medium + + * New upstream release. + * Update static link problem fix. + In this fix, add LZ4F_PUBLISH_STATIC_FUNCTIONS to compile option. + This makes the following API available for reference to the library. + - LZ4F_compressBegin_usingCDict@Base + - LZ4F_compressFrame_usingCDict@Base + - LZ4F_createCDict@Base + - LZ4F_decompress_usingDict@Base + - LZ4F_freeCDict@Base + - LZ4F_getErrorCode@Base + + -- Nobuhiro Iwamatsu Fri, 13 Apr 2018 10:39:09 +0900 + +lz4 (1.8.0-5) unstable; urgency=medium + + * Upload to unstable. + + -- Nobuhiro Iwamatsu Thu, 12 Apr 2018 11:46:55 +0900 + +lz4 (1.8.0-4) experimental; urgency=medium + + * Add liblz4-tool transitional package (Closes: #894279) + + -- Nobuhiro Iwamatsu Thu, 12 Apr 2018 08:31:07 +0900 + +lz4 (1.8.0-3) experimental; urgency=medium + + * Change package name to liblz4-1. + Do not need to change SONAME, so revert it. + + -- Nobuhiro Iwamatsu Wed, 11 Apr 2018 09:02:37 +0900 + +lz4 (1.8.0-2) experimental; urgency=medium + + * Change package name to liblz4-1a. + From 1.8.0, lz4 removed some API in 1.8.0, but upstream dose not bump + the SONAME. We changed to -1a to maintain compatibility. + * Fix Static link. (#882974) + * Update debian/copyright. + - Fix insecure copyright format URI. + - Update copyright information. + * Update Vcs-Browser and Vcs-Git to use salsa. + + -- Nobuhiro Iwamatsu Wed, 08 Nov 2017 13:26:35 +0900 + +lz4 (1.8.0-1) experimental; urgency=medium + + * New upstream release. (Closes: #860168, #821740) + * Bump Standards-Version to 4.1.0. + * Remove patches/ignore_rm_fail.patch. + * Update symbols file. + * Rename liblz4-tool to lz4. (Closes: #781234) + * Change Priority to optional. (Closes: #816620) + + -- Nobuhiro Iwamatsu Thu, 31 Aug 2017 08:07:55 +0900 + +lz4 (1.7.5-1) UNRELEASED; urgency=medium + + * New upstream release. + * Bump Standards-Version to 3.9.8. + * Update symbols file. + * Add patches/ignore_rm_fail.patch. + + -- Nobuhiro Iwamatsu Mon, 19 Jun 2017 09:09:28 +0900 + +lz4 (0.0~r131-2) unstable; urgency=medium + + * Add support cross compile. (Closes: #814687) + Thanks to Helmut Grohne . + * Change URL of homepage to https://github.com/Cyan4973/lz4. + + -- Nobuhiro Iwamatsu Thu, 18 Feb 2016 00:27:54 +0900 + +lz4 (0.0~r131-1) unstable; urgency=medium + + * Snapshot, taken from the trunk (r131). + * Update and enable atches/0001-Disable-valgrind.patch. + + -- Nobuhiro Iwamatsu Sun, 16 Aug 2015 20:46:09 +0900 + +lz4 (0.0~r130-1) unstable; urgency=medium + + * Snapshot, taken from the trunk (r130). + + -- Nobuhiro Iwamatsu Mon, 01 Jun 2015 09:35:45 +0900 + +lz4 (0.0~r127-1) experimental; urgency=low + + * Snapshot, taken from the trunk (r127). + * Update debian/docs. + Add lz4_block_format.txt and LZ4_Frame_Format.html. + * Update liblz4-1.symbols. + * Bump Standards-Version to 3.9.6. + * Update copyright. + Add more infomation of copyright. + + -- Nobuhiro Iwamatsu Sat, 07 Mar 2015 17:21:34 +0900 + +lz4 (0.0~r122-2) unstable; urgency=medium + + * Install pkgconfig file into liblz4-dev. (Closes: #761906) + + -- Nobuhiro Iwamatsu Wed, 17 Sep 2014 08:55:01 +0900 + +lz4 (0.0~r122-1) unstable; urgency=high + + * Snapshot, taken from the trunk (r122). + * Fix test on s390x. (Closes: #757581) + Add patches/0001-Add-support-s390x-architecture.patch. + * Remove patches. + - add-support-kfreebsd.patch, add-support-hurd.patch and Add-LDFLAGS.patch + were applied to upstream. + - Makefile of upstream was updated. + Remove 0001-Remove-test-32-from-test-target.patch. + * Update patches/0001-Disable-valgrind.patch. + * Update debian/rules. + - Re-enable test on s390x. + * Update symbols file. + + -- Nobuhiro Iwamatsu Wed, 17 Sep 2014 01:57:08 +0900 + +lz4 (0.0~r119-2) unstable; urgency=medium + + * Disable test on s390x and sparc. (Closes: #755170) + + -- Nobuhiro Iwamatsu Tue, 29 Jul 2014 01:43:36 +0900 + +lz4 (0.0~r119-1) unstable; urgency=medium + + * Snapshot, taken from the trunk (r119) (Closes: #751256). + * The r119 fixed CVE-2014-4715, and r118 fixed CVE-2014-4611. + * Disable valgrind test. + Add patches/0001-Disable-valgrind.patch. + * Disable test with -m32 option. + Add patches/0001-Remove-test-32-from-test-target.patch. + * Update liblz4-1.symbols. + + -- Nobuhiro Iwamatsu Tue, 15 Jul 2014 10:25:02 +0900 + +lz4 (0.0~r117-1) unstable; urgency=medium + + * Snapshot, taken from the trunk (r117). + * Remove patches/add-ldflags.patch and patches/fix-install.patch. + * Update patches/add-support-kfreebsd.patch. + * Add patches/add-support-hurd.patch (Closes: #749901). + * Add patches/Remove-32bit-test-program-from-target.patch. + * Add patches/Add-LDFLAGS.patch. + + -- Nobuhiro Iwamatsu Mon, 09 Jun 2014 14:57:21 +0900 + +lz4 (0.0~r114-2) unstable; urgency=low + + * Update patches/add-support-kfreebsd.patch. + Support programs.Makefile too. + + -- Nobuhiro Iwamatsu Sat, 22 Mar 2014 14:23:35 +0900 + +lz4 (0.0~r114-1) unstable; urgency=low + + * Snapshot, taken from the trunk (r113). + * Remove support-library-version.patch + Applied to upstream. + * Update add-ldflags.patch. + * Add patches/fix-install.patch. + Fix install library. + * Update symbols file. + * Add patches/add-support-kfreebsd.patch. + Support install on kFreeBSD. + + -- Nobuhiro Iwamatsu Sat, 22 Mar 2014 01:53:20 +0900 + +lz4 (0.0~r113-2) unstable; urgency=low + + * Update debian/control. + - Add Conflict and Replaces field of libz4-1-dbg (Closes: #741003). + - Update package description (Closes: #741001). + + -- Nobuhiro Iwamatsu Mon, 10 Mar 2014 08:34:29 +0900 + +lz4 (0.0~r113-1) unstable; urgency=low + + * Snapshot, taken from the trunk (r113). + * Update debian/rules. + - Change build tool from cmake to GNU make. + * Update debian/control. + - cmake from Build-Depends + - Update Standards-Version to 3.9.5 + * Update symbols file. + * Add patches/add-dlflags.patch. + * Add patches/support-library-version.patch. + * Remove old patches. + * Change package name and install script name. + * Add manpage of lz4. + + -- Nobuhiro Iwamatsu Wed, 05 Mar 2014 10:50:41 +0900 + +lz4 (0.0~r109-1) unstable; urgency=low + + * Snapshot, taken from the trunk (r109). + + -- Nobuhiro Iwamatsu Wed, 25 Dec 2013 07:26:12 +0900 + +lz4 (0.0~r107-1) unstable; urgency=low + + * Snapshot, taken from the trunk (r107). + * Update patches. + * Update symbol file. + + -- Nobuhiro Iwamatsu Wed, 23 Oct 2013 19:51:48 +0900 + +lz4 (0.0~r99-1) unstable; urgency=low + + * New upstream released. + * Add symbols file. + * Update debian/control. + - Update Vcs-Git and Vcs-Browser field. + + -- Nobuhiro Iwamatsu Wed, 31 Jul 2013 12:28:38 +0900 + +lz4 (0.0~r94-2) unstable; urgency=low + + * Fix install path on 32bit build. (Closes: #710458) + Update patches/0001-Fix-install-path.patch. + * Remove unrecognized command line option '-march=native'. (Closes: #710459) + Add patches/remove_optimize. + + -- Nobuhiro Iwamatsu Fri, 31 May 2013 14:05:43 +0900 + +lz4 (0.0~r94-1) unstable; urgency=low + + * Initial release. (Closes: #698256) + + -- Nobuhiro Iwamatsu Sat, 04 May 2013 08:31:31 +0900 diff --git a/compat b/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/control b/control new file mode 100644 index 0000000..937eeaf --- /dev/null +++ b/control @@ -0,0 +1,68 @@ +Source: lz4 +Priority: optional +Maintainer: Nobuhiro Iwamatsu +Build-Depends: debhelper (>= 9.0.0) +Standards-Version: 4.1.0 +Section: utils +Homepage: https://github.com/Cyan4973/lz4 +Vcs-Browser: https://salsa.debian.org/debian/lz4 +Vcs-Git: https://salsa.debian.org/debian/lz4.git + +Package: liblz4-dev +Section: libdevel +Architecture: any +Depends: liblz4-1 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same +Description: Fast LZ compression algorithm library - development files + LZ4 is a very fast lossless compression algorithm, providing compression speed + at 400 MB/s per core, scalable with multi-cores CPU. It also features an + extremely fast decoder, with speed in multiple GB/s per core, typically + reaching RAM speed limits on multi-core systems. + . + This package contains files that are needed to build applications. + +Package: liblz4-1 +Section: libs +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: liblz4-1a +Breaks: liblz4-1a +Multi-Arch: same +Description: Fast LZ compression algorithm library - runtime + LZ4 is a very fast lossless compression algorithm, providing compression speed + at 400 MB/s per core, scalable with multi-cores CPU. It also features an + extremely fast decoder, with speed in multiple GB/s per core, typically + reaching RAM speed limits on multi-core systems. + . + This package includes the shared library. + +Package: lz4 +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, liblz4-1 (= ${binary:Version}) +Multi-Arch: foreign +Provides: liblz4-tool +Replaces: liblz4-tool (<< 1.8.0-1) +Conflicts: liblz4-tool (<< 1.8.0-1) +Description: Fast LZ compression algorithm library - tool + LZ4 is a very fast lossless compression algorithm, providing compression speed + at 400 MB/s per core, scalable with multi-cores CPU. It also features an + extremely fast decoder, with speed in multiple GB/s per core, typically + reaching RAM speed limits on multi-core systems. + . + This package contains files that is tool using liblz4. + +Package: liblz4-tool +Architecture: all +Section: oldlibs +Depends: + lz4, + ${misc:Depends}, +Description: Fast LZ compression algorithm library - transitional package + LZ4 is a very fast lossless compression algorithm, providing compression speed + at 400 MB/s per core, scalable with multi-cores CPU. It also features an + extremely fast decoder, with speed in multiple GB/s per core, typically + reaching RAM speed limits on multi-core systems. + . + This is a transitional package. It can be safely removed. diff --git a/copyright b/copyright new file mode 100644 index 0000000..a7de5c3 --- /dev/null +++ b/copyright @@ -0,0 +1,105 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: lz4 +Source: https://github.com/Cyan4973/lz4 + +Files: * +Copyright: Copyright (C) 2011-2017, Yann Collet. +License: BSD-2-clause + +Files: lib/* +Copyright: Copyright (C) 2011-2017, Yann Collet. +License: BSD-2-clause + +Files: lib/liblz4.pc.in +Copyright: Copyright (C) 2011-2014, Yann Collet. +License: BSD-2-clause + +Files: lib/lz4frame.c + lib/lz4frame_static.h + lib/xxhash.c + lib/xxhash.h +Copyright: Copyright (C) 2011-2016, Yann Collet. +License: BSD-2-clause + +Files: lib/lz4opt.h +Copyright: 2015-2017 Przemyslaw Skibinski +License: BSD-2-clause + +Files: programs/* +Copyright: Copyright (C) 2011-2016, Yann Collet. +License: GPL-2+ + +Files: programs/lz4io.c +Copyright: Copyright (C) 2011-2017, Yann Collet. +License: GPL-2+ + +Files: programs/platform.h +Copyright: Copyright (C) 2016 -present, Przemyslaw Skibinski, Yann Collet +License: GPL-2+ + +Files: programs/util.h +Copyright: Copyright (C) 2016 -present, Przemyslaw Skibinski, Yann Collet +License: GPL-2+ + +Files: ./examples/printVersion.c +Copyright: Takayuki Matsuoka & Yann Collet +License: GPL-2 + +Files: ./examples/blockStreaming_lineByLine.c + ./examples/blockStreaming_doubleBuffer.c +Copyright: Takayuki Matsuoka +License: GPL-2 + +Files: ./examples/HCStreaming_ringBuffer.c + ./examples/blockStreaming_ringBuffer.c +Copyright: Yann Collet +License: GPL-2 + +Files: ./examples/compress_functions.c + ./examples/simple_buffer.c +Copyright: Kyle Harper +License: BSD-2-clause + + +Files: debian/* +Copyright: 2013 Nobuhiro Iwamatsu +License: GPL-2+ + +License: GPL-2 + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + . + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-2'. + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991, or (at + your option) any later version. + . + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-2'. + +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/liblz4-1.install b/liblz4-1.install new file mode 100644 index 0000000..3ddde58 --- /dev/null +++ b/liblz4-1.install @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff --git a/liblz4-1.symbols b/liblz4-1.symbols new file mode 100644 index 0000000..ccab235 --- /dev/null +++ b/liblz4-1.symbols @@ -0,0 +1,89 @@ +liblz4.so.1 liblz4-1 #MINVER# + LZ4F_compressBegin@Base 0.0~r127 + LZ4F_compressBegin_usingCDict@Base 1.8.1.2 + LZ4F_compressBound@Base 0.0~r127 + LZ4F_compressEnd@Base 0.0~r127 + LZ4F_compressFrame@Base 0.0~r127 + LZ4F_compressFrameBound@Base 0.0~r127 + LZ4F_compressFrame_usingCDict@Base 1.8.1.2 + LZ4F_compressUpdate@Base 0.0~r127 + LZ4F_compressionLevel_max@Base 1.8.0 + LZ4F_createCDict@Base 1.8.1.2 + LZ4F_createCompressionContext@Base 0.0~r127 + LZ4F_createDecompressionContext@Base 0.0~r127 + LZ4F_decompress@Base 0.0~r127 + LZ4F_decompress_usingDict@Base 1.8.1.2 + LZ4F_flush@Base 0.0~r127 + LZ4F_freeCDict@Base 1.8.1.2 + LZ4F_freeCompressionContext@Base 0.0~r127 + LZ4F_freeDecompressionContext@Base 0.0~r127 + LZ4F_getErrorCode@Base 1.8.1.2 + LZ4F_getErrorName@Base 0.0~r127 + LZ4F_getFrameInfo@Base 0.0~r127 + LZ4F_getVersion@Base 1.7.5 + LZ4F_isError@Base 0.0~r127 + LZ4F_resetDecompressionContext@Base 1.8.0 + LZ4_compress@Base 0.0~r113 + LZ4_compressBound@Base 0.0~r114 + LZ4_compressHC2@Base 0.0~r113 + LZ4_compressHC2_continue@Base 0.0~r113 + LZ4_compressHC2_limitedOutput@Base 0.0~r113 + LZ4_compressHC2_limitedOutput_continue@Base 0.0~r113 + LZ4_compressHC2_limitedOutput_withStateHC@Base 0.0~r113 + LZ4_compressHC2_withStateHC@Base 0.0~r113 + LZ4_compressHC@Base 0.0~r113 + LZ4_compressHC_continue@Base 0.0~r113 + LZ4_compressHC_limitedOutput@Base 0.0~r113 + LZ4_compressHC_limitedOutput_continue@Base 0.0~r113 + LZ4_compressHC_limitedOutput_withStateHC@Base 0.0~r113 + LZ4_compressHC_withStateHC@Base 0.0~r113 + LZ4_compress_HC@Base 0.0~r130 + LZ4_compress_HC_continue@Base 0.0~r130 + LZ4_compress_HC_extStateHC@Base 0.0~r130 + LZ4_compress_continue@Base 0.0~r113 + LZ4_compress_default@Base 0.0~r130 + LZ4_compress_destSize@Base 0.0~r130 + LZ4_compress_fast@Base 0.0~r130 + LZ4_compress_fast_continue@Base 0.0~r130 + LZ4_compress_fast_extState@Base 0.0~r130 + LZ4_compress_limitedOutput@Base 0.0~r113 + LZ4_compress_limitedOutput_continue@Base 0.0~r113 + LZ4_compress_limitedOutput_withState@Base 0.0~r113 + LZ4_compress_withState@Base 0.0~r113 + LZ4_create@Base 0.0~r113 + LZ4_createHC@Base 0.0~r113 + LZ4_createStream@Base 0.0~r119 + LZ4_createStreamDecode@Base 0.0~r119 + LZ4_createStreamHC@Base 0.0~r127 + LZ4_decompress_fast@Base 0.0~r113 + LZ4_decompress_fast_continue@Base 0.0~r119 + LZ4_decompress_fast_usingDict@Base 0.0~r119 + LZ4_decompress_fast_withPrefix64k@Base 0.0~r113 + LZ4_decompress_safe@Base 0.0~r113 + LZ4_decompress_safe_continue@Base 0.0~r119 + LZ4_decompress_safe_partial@Base 0.0~r113 + LZ4_decompress_safe_usingDict@Base 0.0~r119 + LZ4_decompress_safe_withPrefix64k@Base 0.0~r113 + LZ4_freeHC@Base 0.0~r113 + LZ4_freeStream@Base 0.0~r122 + LZ4_freeStreamDecode@Base 0.0~r122 + LZ4_freeStreamHC@Base 0.0~r127 + LZ4_loadDict@Base 0.0~r119 + LZ4_loadDictHC@Base 0.0~r127 + LZ4_resetStream@Base 0.0~r122 + LZ4_resetStreamHC@Base 0.0~r127 + LZ4_resetStreamState@Base 0.0~r113 + LZ4_resetStreamStateHC@Base 0.0~r113 + LZ4_saveDict@Base 0.0~r119 + LZ4_saveDictHC@Base 0.0~r127 + LZ4_setStreamDecode@Base 0.0~r122 + LZ4_sizeofState@Base 0.0~r113 + LZ4_sizeofStateHC@Base 0.0~r113 + LZ4_sizeofStreamState@Base 0.0~r113 + LZ4_sizeofStreamStateHC@Base 0.0~r113 + LZ4_slideInputBuffer@Base 0.0~r113 + LZ4_slideInputBufferHC@Base 0.0~r113 + LZ4_uncompress@Base 0.0~r114 + LZ4_uncompress_unknownOutputSize@Base 0.0~r114 + LZ4_versionNumber@Base 0.0~r122 + LZ4_versionString@Base 1.8.0 diff --git a/liblz4-dev.install b/liblz4-dev.install new file mode 100644 index 0000000..76f28fa --- /dev/null +++ b/liblz4-dev.install @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* diff --git a/lz4.install b/lz4.install new file mode 100644 index 0000000..1df36c6 --- /dev/null +++ b/lz4.install @@ -0,0 +1 @@ +usr/bin/* diff --git a/lz4.manpages b/lz4.manpages new file mode 100644 index 0000000..4450a71 --- /dev/null +++ b/lz4.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/*.1 diff --git a/patches/0001-show-build-info.patch b/patches/0001-show-build-info.patch new file mode 100644 index 0000000..061dbe5 --- /dev/null +++ b/patches/0001-show-build-info.patch @@ -0,0 +1,73 @@ +From b2ed4e3d9adda50dca2a951ec663bf0a401e9b51 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Tue, 10 Apr 2018 14:35:49 +0900 +Subject: [PATCH 1/2] show build info + +Signed-off-by: Nobuhiro Iwamatsu +--- + lib/Makefile | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/lib/Makefile b/lib/Makefile +index dd33f50..7c8975e 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -87,8 +87,8 @@ all32: all + liblz4.a: $(SRCFILES) + ifeq ($(BUILD_STATIC),yes) # can be disabled on command line + @echo compiling static library +- @$(CC) $(CPPFLAGS) $(CFLAGS) -c $^ +- @$(AR) rcs $@ *.o ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $^ ++ $(AR) rcs $@ *.o + endif + + $(LIBLZ4): $(SRCFILES) +@@ -97,10 +97,10 @@ ifneq (,$(filter Windows%,$(OS))) + @$(CC) $(FLAGS) -DLZ4_DLL_EXPORT=1 -shared $^ -o dll\$@.dll + dlltool -D dll\liblz4.dll -d dll\liblz4.def -l dll\liblz4.lib + else +- @$(CC) $(FLAGS) -shared $^ -fPIC -fvisibility=hidden $(SONAME_FLAGS) -o $@ ++ $(CC) $(FLAGS) -shared $^ -fPIC -fvisibility=hidden $(SONAME_FLAGS) -o $@ + @echo creating versioned links +- @ln -sf $@ liblz4.$(SHARED_EXT_MAJOR) +- @ln -sf $@ liblz4.$(SHARED_EXT) ++ ln -sf $@ liblz4.$(SHARED_EXT_MAJOR) ++ ln -sf $@ liblz4.$(SHARED_EXT) + endif + + liblz4: $(LIBLZ4) +@@ -152,20 +152,20 @@ liblz4.pc: liblz4.pc.in Makefile + $< >$@ + + install: lib liblz4.pc +- @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ $(DESTDIR)$(LIBDIR)/ +- @$(INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/ ++ $(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/ + @echo Installing libraries + ifeq ($(BUILD_STATIC),yes) +- @$(INSTALL_DATA) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a +- @$(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(INCLUDEDIR)/lz4frame_static.h ++ $(INSTALL_DATA) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a ++ $(INSTALL_DATA) lz4frame_static.h $(DESTDIR)$(INCLUDEDIR)/lz4frame_static.h + endif +- @$(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) +- @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR) +- @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT) ++ $(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) ++ ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR) ++ ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT) + @echo Installing headers in $(INCLUDEDIR) +- @$(INSTALL_DATA) lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h +- @$(INSTALL_DATA) lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h +- @$(INSTALL_DATA) lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ++ $(INSTALL_DATA) lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h ++ $(INSTALL_DATA) lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ++ $(INSTALL_DATA) lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h + @echo lz4 libraries installed + + uninstall: +-- +2.16.2 + diff --git a/patches/0002-Fix-static-link.patch b/patches/0002-Fix-static-link.patch new file mode 100644 index 0000000..5ae3b27 --- /dev/null +++ b/patches/0002-Fix-static-link.patch @@ -0,0 +1,57 @@ +From ea463dc95b678b3fc808c201fd1cb23f37241a4c Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu +Date: Tue, 10 Apr 2018 14:36:20 +0900 +Subject: [PATCH 2/2] Fix static link + +Signed-off-by: Nobuhiro Iwamatsu +--- + programs/Makefile | 4 ++-- + tests/Makefile | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/programs/Makefile b/programs/Makefile +index a51bd4b..bd6829b 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -41,7 +41,7 @@ LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT)) + LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT)) + LIBVER := $(shell echo $(LIBVER_SCRIPT)) + +-SRCFILES := $(sort $(wildcard $(LZ4DIR)/*.c) $(wildcard *.c)) ++SRCFILES := $(sort $(wildcard $(LZ4DIR)/xxhash.c) $(wildcard *.c)) + OBJFILES := $(SRCFILES:.c=.o) + + CPPFLAGS += -I$(LZ4DIR) -DXXH_NAMESPACE=LZ4_ +@@ -76,7 +76,7 @@ all32: CFLAGS+=-m32 + all32: all + + lz4: $(OBJFILES) +- $(CC) $(FLAGS) $^ -o $@$(EXT) ++ $(CC) $(FLAGS) $^ -o $@$(EXT) -L ../lib -llz4 + + lz4-release: DEBUGFLAGS= + lz4-release: lz4 +diff --git a/tests/Makefile b/tests/Makefile +index 819ba43..c960202 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -44,6 +44,7 @@ CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) + CPPFLAGS:= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ + FLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) + ++export LD_LIBRARY_PATH += $(LZ4DIR) + + # Define *.exe as extension for Windows systems + ifneq (,$(filter Windows%,$(OS))) +@@ -70,7 +71,7 @@ all32: CFLAGS+=-m32 + all32: all + + lz4: +- $(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)" ++ #$(MAKE) -C $(PRGDIR) $@ CFLAGS="$(CFLAGS)" + + lz4c unlz4 lz4cat: lz4 + ln -sf $(LZ4) $(PRGDIR)/$@ +-- +2.16.2 + diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..f24586d --- /dev/null +++ b/patches/series @@ -0,0 +1,2 @@ +0001-show-build-info.patch +0002-Fix-static-link.patch diff --git a/rules b/rules new file mode 100755 index 0000000..ac14280 --- /dev/null +++ b/rules @@ -0,0 +1,48 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CPPFLAGS:= $(shell dpkg-buildflags --get CPPFLAGS) -DLZ4F_PUBLISH_STATIC_FUNCTIONS +CFLAGS:= $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) +CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) +LDFLAGS:= $(shell dpkg-buildflags --get LDFLAGS) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +PREFIX:= /usr + +ifeq ($(origin CC),default) +CC := $(DEB_HOST_GNU_TYPE)-gcc +endif + +export CFLAGS +export CPPFLAGS +export LDFLAGS +export PREFIX + +disable_test=0 +# BTS: #755170 +# sparc: out of memory +ifneq (,$(findstring $(DEB_HOST_ARCH),sparc)) +disable_test=1 +endif +ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +disable_test=1 +endif + +%: + dh $@ + +override_dh_auto_build: + dh_auto_build -- CC=$(CC) + +override_dh_auto_install: + dh_auto_install -- CC=$(CC) + +override_dh_install: + make install DESTDIR=$$(pwd)/debian/tmp LIBDIR=$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH) CC=$(CC) + dh_install + +override_dh_auto_test: +ifeq "$(disable_test)" "0" + make test +endif diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 2.30.2