diff options
| author | Elliott Hughes <enh@google.com> | 2021-12-08 15:07:46 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2021-12-08 15:07:46 -0800 |
| commit | 8645cf6c0da81fb958450394f463ff7c66edb49b (patch) | |
| tree | c025e10d17e7a75839680f1c89e2576718cf53e3 /Makefile-libbz2_so | |
| parent | af4fb9fa8f24e111103a8101d85b660c90d1e2e4 (diff) | |
| download | bzip2-8645cf6c0da81fb958450394f463ff7c66edb49b.tar.gz | |
Really sync with bzip1.0.8.
The previous git update seems to have gone horribly wrong. Try to dig
ourselves out of that hole (at least temporarily; the next merge might
be painful too?) by unpacking the current release tarball and checking
in the difference.
As a double-check, `git diff bzip2-1.0.8` looks good after this change,
only showing expected changes like "there's an Android.bp file here that
isn't upstream".
Bug: http://b/179636234
Test: treehugger
Change-Id: Ia9612913e319a1cfa29f0c370f0a3775d8ecb496
Diffstat (limited to 'Makefile-libbz2_so')
| -rw-r--r-- | Makefile-libbz2_so | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so index e58791b..fb0f230 100644 --- a/Makefile-libbz2_so +++ b/Makefile-libbz2_so @@ -1,6 +1,6 @@ # This Makefile builds a shared version of the library, -# libbz2.so.1.0.6, with soname libbz2.so.1.0, +# libbz2.so.1.0.8, with soname libbz2.so.1.0, # at least on x86-Linux (RedHat 7.2), # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98). # Please see the README file for some important info @@ -10,8 +10,8 @@ # This file is part of bzip2/libbzip2, a program and library for # lossless, block-sorting data compression. # -# bzip2/libbzip2 version 1.0.6 of 6 September 2010 -# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org> +# bzip2/libbzip2 version 1.0.8 of 13 July 2019 +# Copyright (C) 1996-2019 Julian Seward <jseward@acm.org> # # Please read the WARNING, DISCLAIMER and PATENTS sections in the # README file. @@ -35,13 +35,13 @@ OBJS= blocksort.o \ bzlib.o all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.6 libbz2.so.1.0 + ln -s libbz2.so.1.0.8 libbz2.so.1.0 clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared blocksort.o: blocksort.c $(CC) $(CFLAGS) -c blocksort.c |