From dc2fde8d3ce9cecd32f401262c500109389558cb8a8509c616f4903a73fdc4c2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 16 Jul 2014 14:42:40 +0000 Subject: [PATCH] Add lz4-use-shlib.diff OBS-URL: https://build.opensuse.org/package/show/Archiving/lz4?expand=0&rev=10 --- lz4-use-shlib.diff | 24 ++++++++++++++++++++++++ lz4.changes | 1 + lz4.spec | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 lz4-use-shlib.diff diff --git a/lz4-use-shlib.diff b/lz4-use-shlib.diff new file mode 100644 index 0000000..fa13ab9 --- /dev/null +++ b/lz4-use-shlib.diff @@ -0,0 +1,24 @@ +--- + programs/Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: trunk/programs/Makefile +=================================================================== +--- trunk.orig/programs/Makefile ++++ trunk/programs/Makefile +@@ -69,11 +69,11 @@ default: lz4 lz4c + + all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 datagen + +-lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c +- $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) ++lz4: bench.c xxhash.c lz4io.c lz4cli.c ++ $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -L${LZ4DIR} -llz4 + +-lz4c : $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c +- $(CC) $(FLAGS) $^ -o $@$(EXT) ++lz4c: bench.c xxhash.c lz4io.c lz4cli.c ++ $(CC) $(FLAGS) $^ -o $@$(EXT) -L${LZ4DIR} -llz4 + + lz4c32: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c bench.c xxhash.c lz4io.c lz4cli.c + $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) diff --git a/lz4.changes b/lz4.changes index 8f92c3e..7ea8f83 100644 --- a/lz4.changes +++ b/lz4.changes @@ -5,6 +5,7 @@ Wed Jul 16 14:34:44 UTC 2014 - jengelh@inai.de Makefile contents; it's still odd to see the 1.4 Windows release) * Provide LZ4 as a shared library - Remove lz4-automake.diff (no longer deemed necessary) +- Add lz4-use-shlib.diff ------------------------------------------------------------------- Mon Nov 25 23:07:48 UTC 2013 - dsterba@suse.com diff --git a/lz4.spec b/lz4.spec index 297ce10..fc9ba16 100644 --- a/lz4.spec +++ b/lz4.spec @@ -29,6 +29,7 @@ Url: http://code.google.com/p/lz4/ #SVN-Clone: http://lz4.googlecode.com/svn/trunk # Project offers no source tarballs. Source: %name-svn119.tar.lz +Patch1: lz4-use-shlib.diff Patch2: lz4-killdate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -72,7 +73,7 @@ applications that want to make use of liblz4. %prep %setup -qn trunk -%patch -P 2 -p1 +%patch -P 1 -P 2 -p1 %build make %{?_smp_mflags} CFLAGS="%optflags"