From 9705e8e3c9f99a3abb5f0555d7699f725f9e96e7 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Wed, 7 Dec 2022 16:40:31 -0400 Subject: [PATCH] fix bzip2 --- .../bzip2/Makefile-libbz2_dylib | 44 ------------------- projects/sourceware.org/bzip2/package.yml | 13 +++--- 2 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 projects/sourceware.org/bzip2/Makefile-libbz2_dylib diff --git a/projects/sourceware.org/bzip2/Makefile-libbz2_dylib b/projects/sourceware.org/bzip2/Makefile-libbz2_dylib deleted file mode 100644 index 2d031703..00000000 --- a/projects/sourceware.org/bzip2/Makefile-libbz2_dylib +++ /dev/null @@ -1,44 +0,0 @@ -# This Makefile builds a shared version of the library, -# libbz2.dylib for MacOSX x86 (10.13.4 or higher), -# It is a custom Makefile. Use at own risk. -# Run in your MacOS terminal with the following command: -# make -f Makefile-libbz2_dylib - -PKG_VERSION?=1.0.8 -PREFIX?=/usr/local - -# SHELL=/bin/sh -# CC=gcc -BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) - -OBJS= blocksort.o \ - huffman.o \ - crctable.o \ - randtable.o \ - compress.o \ - decompress.o \ - bzlib.o - -all: $(OBJS) - $(CC) -shared -Wl,-install_name -Wl,libbz2.dylib -o libbz2.${PKG_VERSION}.dylib $(OBJS) - cp libbz2.${PKG_VERSION}.dylib ${PREFIX}/lib/ - ln -s libbz2.${PKG_VERSION}.dylib ${PREFIX}/lib/libbz2.dylib - -clean: - rm -f libbz2.dylib libbz2.${PKG_VERSION}.dylib - -blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c -huffman.o: huffman.c - $(CC) $(CFLAGS) -c huffman.c -crctable.o: crctable.c - $(CC) $(CFLAGS) -c crctable.c -randtable.o: randtable.c - $(CC) $(CFLAGS) -c randtable.c -compress.o: compress.c - $(CC) $(CFLAGS) -c compress.c -decompress.o: decompress.c - $(CC) $(CFLAGS) -c decompress.c -bzlib.o: bzlib.c - $(CC) $(CFLAGS) -c bzlib.c \ No newline at end of file diff --git a/projects/sourceware.org/bzip2/package.yml b/projects/sourceware.org/bzip2/package.yml index 1a4cbf2b..e5cc0dd8 100644 --- a/projects/sourceware.org/bzip2/package.yml +++ b/projects/sourceware.org/bzip2/package.yml @@ -38,17 +38,14 @@ build: mv libbz2.*.1.* {{ prefix }}/lib cd {{ prefix }}/lib - ln -s libbz2.so.{{ version }} libbz2.so - ln -s libbz2.so.{{ version }} libbz2.so.{{ version.major }} + test -e libbz2.so || ln -s libbz2.so.{{ version }} libbz2.so + test -e libbz2.so.{{ version.major }} || ln -s libbz2.so.{{ version }} libbz2.so.{{ version.major }} ;; darwin) - make \ - --file props/Makefile-libbz2_dylib \ - --environment-overrides \ - --jobs {{ hw.concurrency }} \ - cd {{ prefix }}/lib - ln -s libbz2.{{ version }}.dylib libbz2.{{ version.major }}.dylib + test -e libbz2.dylib + test -e libbz2.{{version}}.dylib + test -e libbz2.{{version.major}}.dylib ;; esac