summaryrefslogtreecommitdiff
path: root/package/bzip2/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2020-04-02 19:34:31 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2020-04-02 19:34:31 +0200
commitd065563ae2822bbd1d7d20f3481eac995aed63ea (patch)
treec744233746bc5f151623e1dfbd4378680c8b184d /package/bzip2/patches
parent0622694e7f85401bff7d72bc653770e6cd99f182 (diff)
bzip2: update to 1.0.8
Diffstat (limited to 'package/bzip2/patches')
-rw-r--r--package/bzip2/patches/patch-Makefile6
-rw-r--r--package/bzip2/patches/patch-Makefile-libbz2_so24
2 files changed, 7 insertions, 23 deletions
diff --git a/package/bzip2/patches/patch-Makefile b/package/bzip2/patches/patch-Makefile
index 0d15eab68..3fbb45234 100644
--- a/package/bzip2/patches/patch-Makefile
+++ b/package/bzip2/patches/patch-Makefile
@@ -1,5 +1,5 @@
---- bzip2-1.0.5.orig/Makefile 2008-02-14 13:39:18.000000000 +0100
-+++ bzip2-1.0.5/Makefile 2009-08-23 20:18:12.000000000 +0200
+--- bzip2-1.0.8.orig/Makefile 2019-07-13 19:50:05.000000000 +0200
++++ bzip2-1.0.8/Makefile 2020-04-02 00:14:59.333485383 +0200
@@ -15,16 +15,16 @@
SHELL=/bin/sh
@@ -19,7 +19,7 @@
# Where you want it installed when you do 'make install'
-PREFIX=/usr/local
-+PREFIX?=/usr
++PREFIX=/usr
OBJS= blocksort.o \
diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so
index 148c7562a..9d901f6bc 100644
--- a/package/bzip2/patches/patch-Makefile-libbz2_so
+++ b/package/bzip2/patches/patch-Makefile-libbz2_so
@@ -1,6 +1,6 @@
---- bzip2-1.0.6.orig/Makefile-libbz2_so 2010-09-11 01:07:52.000000000 +0200
-+++ bzip2-1.0.6/Makefile-libbz2_so 2014-01-13 21:51:20.000000000 +0100
-@@ -21,10 +21,18 @@
+--- bzip2-1.0.8.orig/Makefile-libbz2_so 2019-07-13 19:50:05.000000000 +0200
++++ bzip2-1.0.8/Makefile-libbz2_so 2020-04-02 00:16:39.699887764 +0200
+@@ -21,10 +21,11 @@
# ------------------------------------------------------------------
@@ -11,23 +11,7 @@
BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
+CFLAGS?=
-+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES)
-+OS=$(shell uname)
-+LDOPT=-soname
-+ifneq ($(CROSS_COMPILE),1)
-+ifeq ($(OS),Darwin)
-+LDOPT=-install_name
-+endif
-+endif
++CFLAGS+=-fpic -fPIC -Wall -Winline -g $(BIGFILES)
OBJS= blocksort.o \
huffman.o \
-@@ -35,7 +43,7 @@ OBJS= blocksort.o \
- bzlib.o
-
- all: $(OBJS)
-- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
-+ $(CC) -shared -Wl,$(LDOPT) -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
- rm -f libbz2.so.1.0
- ln -s libbz2.so.1.0.6 libbz2.so.1.0