topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- bzip2: bump version to 1.0.7

master
vanhofen 6 years ago
parent
b9aadf3054
commit
e266e59f3d
2 changed files with 18 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      make/target-libs-unused.mk
  2. 18
      patches/bzip2.patch

16
make/target-libs-unused.mk
View File

@ -84,25 +84,27 @@ $(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGET_DIR)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
BZIP2_VER = 1.0.6 BZIP2_VER = 1.0.7
BZIP2 = bzip2-$(BZIP2_VER)
BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz
BZIP2_URL = https://sourceware.org/pub/bzip2
$(ARCHIVE)/$(BZIP2_SOURCE): $(ARCHIVE)/$(BZIP2_SOURCE):
$(DOWNLOAD) http://sources.buildroot.net/$(BZIP2_SOURCE) $(DOWNLOAD) $(BZIP2_URL)/$(BZIP2_SOURCE)
BZIP2_Patch = bzip2-$(BZIP2_VER).patch BZIP2_PATCH = bzip2.patch
$(D)/bzip2: $(ARCHIVE)/$(BZIP2_SOURCE) | $(TARGET_DIR) $(D)/bzip2: $(ARCHIVE)/$(BZIP2_SOURCE) | $(TARGET_DIR)
$(REMOVE)/bzip2-$(BZIP2_VER) $(REMOVE)/$(BZIP2)
$(UNTAR)/$(BZIP2_SOURCE) $(UNTAR)/$(BZIP2_SOURCE)
$(CHDIR)/bzip2-$(BZIP2_VER); \ $(CHDIR)/$(BZIP2); \
$(call apply_patches, $(BZIP2_Patch)); \ $(call apply_patches, $(BZIP2_PATCH)); \
mv Makefile-libbz2_so Makefile; \ mv Makefile-libbz2_so Makefile; \
$(BUILDENV) \ $(BUILDENV) \
$(MAKE) all; \ $(MAKE) all; \
$(MAKE) install PREFIX=$(TARGET_DIR) $(MAKE) install PREFIX=$(TARGET_DIR)
rm -f $(TARGET_DIR)/bin/bzip2 rm -f $(TARGET_DIR)/bin/bzip2
$(REMOVE)/bzip2-$(BZIP2_VER) $(REMOVE)/$(BZIP2)
$(TOUCH) $(TOUCH)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

18
patches/bzip2-1.0.6.patch → patches/bzip2.patch
View File

@ -15,11 +15,11 @@
bzlib.o bzlib.o
all: $(OBJS) all: $(OBJS)
- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
+ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) + $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
rm -f libbz2.so.1.0 rm -f libbz2.so.1.0
ln -s libbz2.so.1.0.6 libbz2.so.1.0 ln -s libbz2.so.1.0.7 libbz2.so.1.0
@@ -57,3 +56,17 @@ @@ -57,3 +56,17 @@
$(CC) $(CFLAGS) -c decompress.c $(CC) $(CFLAGS) -c decompress.c
bzlib.o: bzlib.c bzlib.o: bzlib.c
@ -33,8 +33,8 @@
+ cp -f bzlib.h $(PREFIX)/include + cp -f bzlib.h $(PREFIX)/include
+ chmod a+r $(PREFIX)/include/bzlib.h + chmod a+r $(PREFIX)/include/bzlib.h
+ if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi + if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+ cp -f libbz2.so.1.0.6 $(PREFIX)/lib + cp -f libbz2.so.1.0.7 $(PREFIX)/lib
+ chmod a+r $(PREFIX)/lib/libbz2.so.1.0.6 + chmod a+r $(PREFIX)/lib/libbz2.so.1.0.7
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0 + ln -sf libbz2.so.1.0.7 $(PREFIX)/lib/libbz2.so.1.0
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1 + ln -sf libbz2.so.1.0.7 $(PREFIX)/lib/libbz2.so.1
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so + ln -sf libbz2.so.1.0.7 $(PREFIX)/lib/libbz2.so
Write Preview
Loading…
Cancel
Save