Leonid Plyushch
6 years ago
4 changed files with 34 additions and 33 deletions
@ -0,0 +1,20 @@ |
|||||
|
diff -uNr bzip2-1.0.8/bzdiff bzip2-1.0.8.mod/bzdiff
|
||||
|
--- bzip2-1.0.8/bzdiff 2019-07-13 20:50:05.000000000 +0300
|
||||
|
+++ bzip2-1.0.8.mod/bzdiff 2019-07-20 11:46:36.090211623 +0300
|
||||
|
@@ -49,14 +49,14 @@
|
||||
|
case "$2" in |
||||
|
*.bz2) |
||||
|
F=`echo "$2" | sed 's|.*/||;s|.bz2$||'` |
||||
|
- tmp=`mktemp "${TMPDIR:-/tmp}"/bzdiff.XXXXXXXXXX` || {
|
||||
|
+ tmp=`mktemp "${TMPDIR:-@TERMUX_PREFIX@/tmp}"/bzdiff.XXXXXXXXXX` || {
|
||||
|
echo 'cannot create a temporary file' >&2 |
||||
|
exit 1 |
||||
|
} |
||||
|
bzip2 -cdfq "$2" > "$tmp" |
||||
|
bzip2 -cdfq "$1" | $comp $OPTIONS - "$tmp" |
||||
|
STAT="$?" |
||||
|
- /bin/rm -f "$tmp";;
|
||||
|
+ rm -f "$tmp";;
|
||||
|
|
||||
|
*) bzip2 -cdfq "$1" | $comp $OPTIONS - "$2" |
||||
|
STAT="$?";; |
@ -1,21 +0,0 @@ |
|||||
diff -uNr bzip2-1.0.6/bzdiff bzip2-1.0.6.mod/bzdiff
|
|
||||
--- bzip2-1.0.6/bzdiff 2007-01-03 04:00:55.000000000 +0200
|
|
||||
+++ bzip2-1.0.6.mod/bzdiff 2019-03-01 20:44:12.401418675 +0200
|
|
||||
@@ -37,7 +37,7 @@
|
|
||||
echo "Usage: $prog [${comp}_options] file [file]" |
|
||||
exit 1 |
|
||||
fi |
|
||||
-tmp=`mktemp ${TMPDIR:-/tmp}/bzdiff.XXXXXXXXXX` || {
|
|
||||
+tmp=`mktemp ${TMPDIR:-@TERMUX_PREFIX@/tmp}/bzdiff.XXXXXXXXXX` || {
|
|
||||
echo 'cannot create a temporary file' >&2 |
|
||||
exit 1 |
|
||||
} |
|
||||
@@ -56,7 +56,7 @@
|
|
||||
bzip2 -cdfq "$2" > $tmp |
|
||||
bzip2 -cdfq "$1" | $comp $OPTIONS - $tmp |
|
||||
STAT="$?" |
|
||||
- /bin/rm -f $tmp;;
|
|
||||
+ rm -f $tmp;;
|
|
||||
|
|
||||
*) bzip2 -cdfq "$1" | $comp $OPTIONS - "$2" |
|
||||
STAT="$?";; |
|
@ -1,24 +1,26 @@ |
|||||
diff -uNr bzip2-1.0.7/Makefile-libbz2_so bzip2-1.0.7.mod/Makefile-libbz2_so
|
diff -uNr bzip2-1.0.8/Makefile-libbz2_so bzip2-1.0.8.mod/Makefile-libbz2_so
|
||||
--- bzip2-1.0.7/Makefile-libbz2_so 2019-06-27 21:15:39.000000000 +0300
|
--- bzip2-1.0.8/Makefile-libbz2_so 2019-07-13 20:50:05.000000000 +0300
|
||||
+++ bzip2-1.0.7.mod/Makefile-libbz2_so 2019-07-07 14:27:21.338209706 +0300
|
+++ bzip2-1.0.8.mod/Makefile-libbz2_so 2019-07-20 11:51:36.370015038 +0300
|
||||
@@ -22,9 +22,7 @@
|
@@ -22,9 +22,9 @@
|
||||
|
|
||||
|
|
||||
SHELL=/bin/sh |
SHELL=/bin/sh |
||||
-CC=gcc
|
-CC=gcc
|
||||
|
+CC ?= gcc
|
||||
BIGFILES=-D_FILE_OFFSET_BITS=64 |
BIGFILES=-D_FILE_OFFSET_BITS=64 |
||||
-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
|
-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
|
||||
|
+CFLAGS ?= -fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
|
||||
|
|
||||
OBJS= blocksort.o \ |
OBJS= blocksort.o \ |
||||
huffman.o \ |
huffman.o \ |
||||
@@ -35,8 +33,8 @@
|
@@ -35,8 +35,8 @@
|
||||
bzlib.o |
bzlib.o |
||||
|
|
||||
all: $(OBJS) |
all: $(OBJS) |
||||
- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
|
- $(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.7
|
- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
|
||||
+ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
|
+ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
|
||||
rm -f libbz2.so.1.0 |
rm -f libbz2.so.1.0 |
||||
ln -s libbz2.so.1.0.7 libbz2.so.1.0 |
ln -s libbz2.so.1.0.8 libbz2.so.1.0 |
||||
|
|
||||
|
Loading…
Reference in new issue