diff options
Diffstat (limited to 'recipes/bzip2')
15 files changed, 366 insertions, 784 deletions
diff --git a/recipes/bzip2/0001-Add-makefiles-for-all-platforms-with-install-step.patch b/recipes/bzip2/0001-Add-makefiles-for-all-platforms-with-install-step.patch deleted file mode 100644 index 9185b71a..00000000 --- a/recipes/bzip2/0001-Add-makefiles-for-all-platforms-with-install-step.patch +++ /dev/null @@ -1,161 +0,0 @@ -From a887bc5c3475968fd844ef3b4e59a0bb5d0b853d Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Sat, 10 Mar 2012 19:00:14 +0100 -Subject: [PATCH 01/14] Add makefiles for all platforms with install step - ---- - Makefile-libbz2_dll | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile-libbz2_dylib | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile-libbz2_so | 4 ++++ - 3 files changed, 122 insertions(+) - create mode 100644 Makefile-libbz2_dll - create mode 100644 Makefile-libbz2_dylib - -diff --git a/Makefile-libbz2_dll b/Makefile-libbz2_dll -new file mode 100644 -index 0000000..c753f42 ---- /dev/null -+++ b/Makefile-libbz2_dll -@@ -0,0 +1,59 @@ -+ -+# This Makefile builds a shared version of the library, -+# libbz2.so.1.0.6, 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 -+# about building the library like this. -+ -+# ------------------------------------------------------------------ -+# 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> -+# -+# Please read the WARNING, DISCLAIMER and PATENTS sections in the -+# README file. -+# -+# This program is released under the terms of the license contained -+# in the file LICENSE. -+# ------------------------------------------------------------------ -+ -+ -+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 -no-undefined -o libbz2.dll $(OBJS) -+ -+clean: -+ rm -f $(OBJS) libbz2.dll -+ -+install: -+ cp -f libbz2.dll $(PREFIX)/lib -+ -+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 -diff --git a/Makefile-libbz2_dylib b/Makefile-libbz2_dylib -new file mode 100644 -index 0000000..270f303 ---- /dev/null -+++ b/Makefile-libbz2_dylib -@@ -0,0 +1,59 @@ -+ -+# This Makefile builds a shared version of the library, -+# libbz2.so.1.0.6, 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 -+# about building the library like this. -+ -+# ------------------------------------------------------------------ -+# 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> -+# -+# Please read the WARNING, DISCLAIMER and PATENTS sections in the -+# README file. -+# -+# This program is released under the terms of the license contained -+# in the file LICENSE. -+# ------------------------------------------------------------------ -+ -+ -+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 -o libbz2.dylib $(OBJS) -+ -+clean: -+ rm -f $(OBJS) libbz2.dylib -+ -+install: -+ cp -f libbz2.dylib $(PREFIX)/lib -+ -+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 -diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so -index e58791b..99c7d38 100644 ---- a/Makefile-libbz2_so -+++ b/Makefile-libbz2_so -@@ -43,6 +43,10 @@ all: $(OBJS) - clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared - -+install: -+ cp -f libbz2.so.1.0.6 $(PREFIX)/lib -+ ln -s $(PREFIX)/lib/libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0 -+ - blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c - huffman.o: huffman.c --- -1.8.3.1 - diff --git a/recipes/bzip2/0001-Fix-Makefiles-and-add-support-for-Windows-and-OS-X.patch b/recipes/bzip2/0001-Fix-Makefiles-and-add-support-for-Windows-and-OS-X.patch new file mode 100644 index 00000000..c6daa924 --- /dev/null +++ b/recipes/bzip2/0001-Fix-Makefiles-and-add-support-for-Windows-and-OS-X.patch @@ -0,0 +1,366 @@ +From f0063f7e3c8178eb1cfb5d913b3fbec3262295d5 Mon Sep 17 00:00:00 2001 +From: Andoni Morales Alastruey <ylatuya@gmail.com> +Date: Sat, 10 Mar 2012 19:00:14 +0100 +Subject: [PATCH] Fix Makefiles and add support for Windows and OS X + +--- + Makefile | 64 +++++++++++++++++++++++++----------------- + Makefile-libbz2_dll | 68 ++++++++++++++++++++++++++++++++++++++++++++ + Makefile-libbz2_dylib | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile-libbz2_so | 37 +++++++++++++++++------- + bzip2.c | 2 +- + 5 files changed, 213 insertions(+), 36 deletions(-) + create mode 100644 Makefile-libbz2_dll + create mode 100644 Makefile-libbz2_dylib + +diff --git a/Makefile b/Makefile +index 9754ddf..72dad60 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,13 +15,27 @@ + SHELL=/bin/sh + + # To assist in cross-compiling +-CC=gcc +-AR=ar +-RANLIB=ranlib +-LDFLAGS= ++ifndef CC ++ CC=gcc ++endif ++ifndef RANLIB ++ RANLIB=ranlib ++endif ++ifndef AR ++ AR=ar ++endif ++BZIP2_LDFLAGS= + + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ++BZIP2_CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ++ ++ifdef CFLAGS ++BZIP2_CFLAGS+=$(CFLAGS) ++endif ++ ++ifdef LDFLAGS ++BZIP2_LDFLAGS+=$(LDFLAGS) ++endif + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local +@@ -35,13 +49,13 @@ OBJS= blocksort.o \ + decompress.o \ + bzlib.o + +-all: libbz2.a bzip2 bzip2recover test ++all: libbz2.a bzip2 bzip2recover + + bzip2: libbz2.a bzip2.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 ++ $(CC) $(BZIP2_CFLAGS) $(BZIP2_LDFLAGS) -o bzip2$(EXT) bzip2.o -L. -lbz2 + + bzip2recover: bzip2recover.o +- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o ++ $(CC) $(BZIP2_CFLAGS) $(BZIP2_LDFLAGS) -o bzip2recover$(EXT) bzip2recover.o + + libbz2.a: $(OBJS) + rm -f libbz2.a +@@ -75,14 +89,14 @@ install: bzip2 bzip2recover + if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi + if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi + if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi +- cp -f bzip2 $(PREFIX)/bin/bzip2 +- cp -f bzip2 $(PREFIX)/bin/bunzip2 +- cp -f bzip2 $(PREFIX)/bin/bzcat +- cp -f bzip2recover $(PREFIX)/bin/bzip2recover +- chmod a+x $(PREFIX)/bin/bzip2 +- chmod a+x $(PREFIX)/bin/bunzip2 +- chmod a+x $(PREFIX)/bin/bzcat +- chmod a+x $(PREFIX)/bin/bzip2recover ++ cp -f bzip2$(EXT) $(PREFIX)/bin/bzip2$(EXT) ++ cp -f bzip2$(EXT) $(PREFIX)/bin/bunzip2$(EXT) ++ cp -f bzip2$(EXT) $(PREFIX)/bin/bzcat$(EXT) ++ cp -f bzip2recover$(EXT) $(PREFIX)/bin/bzip2recover$(EXT) ++ chmod a+x $(PREFIX)/bin/bzip2$(EXT) ++ chmod a+x $(PREFIX)/bin/bunzip2$(EXT) ++ chmod a+x $(PREFIX)/bin/bzcat$(EXT) ++ chmod a+x $(PREFIX)/bin/bzip2recover$(EXT) + cp -f bzip2.1 $(PREFIX)/man/man1 + chmod a+r $(PREFIX)/man/man1/bzip2.1 + cp -f bzlib.h $(PREFIX)/include +@@ -115,23 +129,23 @@ clean: + + blocksort.o: blocksort.c + @cat words0 +- $(CC) $(CFLAGS) -c blocksort.c ++ $(CC) $(BZIP2_CFLAGS) -c blocksort.c + huffman.o: huffman.c +- $(CC) $(CFLAGS) -c huffman.c ++ $(CC) $(BZIP2_CFLAGS) -c huffman.c + crctable.o: crctable.c +- $(CC) $(CFLAGS) -c crctable.c ++ $(CC) $(BZIP2_CFLAGS) -c crctable.c + randtable.o: randtable.c +- $(CC) $(CFLAGS) -c randtable.c ++ $(CC) $(BZIP2_CFLAGS) -c randtable.c + compress.o: compress.c +- $(CC) $(CFLAGS) -c compress.c ++ $(CC) $(BZIP2_CFLAGS) -c compress.c + decompress.o: decompress.c +- $(CC) $(CFLAGS) -c decompress.c ++ $(CC) $(BZIP2_CFLAGS) -c decompress.c + bzlib.o: bzlib.c +- $(CC) $(CFLAGS) -c bzlib.c ++ $(CC) $(BZIP2_CFLAGS) -c bzlib.c + bzip2.o: bzip2.c +- $(CC) $(CFLAGS) -c bzip2.c ++ $(CC) $(BZIP2_CFLAGS) -c bzip2.c + bzip2recover.o: bzip2recover.c +- $(CC) $(CFLAGS) -c bzip2recover.c ++ $(CC) $(BZIP2_CFLAGS) -c bzip2recover.c + + + distclean: clean +diff --git a/Makefile-libbz2_dll b/Makefile-libbz2_dll +new file mode 100644 +index 0000000..e021d31 +--- /dev/null ++++ b/Makefile-libbz2_dll +@@ -0,0 +1,68 @@ ++ ++# This Makefile builds a shared version of the library, ++# libbz2.so.1.0.6, 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 ++# about building the library like this. ++ ++# ------------------------------------------------------------------ ++# 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> ++# ++# Please read the WARNING, DISCLAIMER and PATENTS sections in the ++# README file. ++# ++# This program is released under the terms of the license contained ++# in the file LICENSE. ++# ------------------------------------------------------------------ ++ ++ ++SHELL=/bin/sh ++BIGFILES=-D_FILE_OFFSET_BITS=64 ++BZIP2_CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++BZIP2_LDFLAGS= ++ ++ifdef CFLAGS ++BZIP2_CFLAGS+=$(CFLAGS) ++endif ++ ++ifdef LDFLAGS ++BZIP2_LDFLAGS+=$(LDFLAGS) ++endif ++ ++OBJS= blocksort.o \ ++ huffman.o \ ++ crctable.o \ ++ randtable.o \ ++ compress.o \ ++ decompress.o \ ++ bzlib.o ++ ++all: $(OBJS) ++ $(CC) $(BZIP2_LDFLAGS) -shared -o libbz2.dll -Wl,--out-implib,libbz2.dll.a $(OBJS) ++ ++clean: ++ rm -f $(OBJS) libbz2.dll ++ ++install: ++ cp -f libbz2.dll $(PREFIX)/bin ++ cp -f libbz2.dll.a $(PREFIX)/lib ++ ++blocksort.o: blocksort.c ++ $(CC) $(BZIP2_CFLAGS) -c blocksort.c ++huffman.o: huffman.c ++ $(CC) $(BZIP2_CFLAGS) -c huffman.c ++crctable.o: crctable.c ++ $(CC) $(BZIP2_CFLAGS) -c crctable.c ++randtable.o: randtable.c ++ $(CC) $(BZIP2_CFLAGS) -c randtable.c ++compress.o: compress.c ++ $(CC) $(BZIP2_CFLAGS) -c compress.c ++decompress.o: decompress.c ++ $(CC) $(BZIP2_CFLAGS) -c decompress.c ++bzlib.o: bzlib.c ++ $(CC) $(BZIP2_CFLAGS) -c bzlib.c +diff --git a/Makefile-libbz2_dylib b/Makefile-libbz2_dylib +new file mode 100644 +index 0000000..cd77e3a +--- /dev/null ++++ b/Makefile-libbz2_dylib +@@ -0,0 +1,78 @@ ++ ++# This Makefile builds a shared version of the library, ++# libbz2.so.1.0.6, 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 ++# about building the library like this. ++ ++# ------------------------------------------------------------------ ++# 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> ++# ++# Please read the WARNING, DISCLAIMER and PATENTS sections in the ++# README file. ++# ++# This program is released under the terms of the license contained ++# in the file LICENSE. ++# ------------------------------------------------------------------ ++ ++ ++SHELL=/bin/sh ++ifndef CC ++CC=gcc ++endif ++BIGFILES=-D_FILE_OFFSET_BITS=64 ++BZIP2_CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++BZIP2_LDFLAGS= ++ ++ifdef CFLAGS ++BZIP2_CFLAGS+=$(CFLAGS) ++endif ++ ++ifdef LDFLAGS ++BZIP2_LDFLAGS+=$(LDFLAGS) ++endif ++ ++OBJS= blocksort.o \ ++ huffman.o \ ++ crctable.o \ ++ randtable.o \ ++ compress.o \ ++ decompress.o \ ++ bzlib.o ++ ++all: $(OBJS) ++ $(CC) $(BZIP2_LDFLAGS) -shared -Wl,-install_name -Wl,libbz2.1.0.dylib -o libbz2.1.0.6.dylib $(OBJS) ++ rm -f libbz2.1.0.dylib ++ rm -f libbz2.dylib ++ ln -s libbz2.1.0.6.dylib libbz2.1.0.dylib ++ ln -s libbz2.1.0.6.dylib libbz2.dylib ++ ++clean: ++ rm -f $(OBJS) libbz2.1.0.6.dylib libbz2.1.0.dylib libbz2.dylib ++ ++install: ++ cp -f libbz2.1.0.6.dylib $(PREFIX)/lib ++ rm -f $(PREFIX)/lib/libbz2.1.0.dylib ++ rm -f $(PREFIX)/lib/libbz2.dylib ++ cp -R libbz2.1.0.dylib $(PREFIX)/lib/ ++ cp -R libbz2.dylib $(PREFIX)/lib/ ++ ++blocksort.o: blocksort.c ++ $(CC) $(BZIP2_CFLAGS) -c blocksort.c ++huffman.o: huffman.c ++ $(CC) $(BZIP2_CFLAGS) -c huffman.c ++crctable.o: crctable.c ++ $(CC) $(BZIP2_CFLAGS) -c crctable.c ++randtable.o: randtable.c ++ $(CC) $(BZIP2_CFLAGS) -c randtable.c ++compress.o: compress.c ++ $(CC) $(BZIP2_CFLAGS) -c compress.c ++decompress.o: decompress.c ++ $(CC) $(BZIP2_CFLAGS) -c decompress.c ++bzlib.o: bzlib.c ++ $(CC) $(BZIP2_CFLAGS) -c bzlib.c +diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so +index e58791b..78e5291 100644 +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so +@@ -22,9 +22,22 @@ + + + SHELL=/bin/sh ++ ++ifndef CC + CC=gcc ++endif ++ + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++BZIP2_CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++BZIP2_LDFLAGS= ++ ++ifdef CFLAGS ++BZIP2_CFLAGS+=$(CFLAGS) ++endif ++ ++ifdef LDFLAGS ++BZIP2_LDFLAGS+=$(CFLAGS) ++endif + + OBJS= blocksort.o \ + huffman.o \ +@@ -35,25 +48,29 @@ 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) $(BZIP2_LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) ++ $(CC) $(BZIP2_CFLAGS) $(BZIP2_LDFLAGS) -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 + + clean: + rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared + ++install: ++ cp -f libbz2.so.1.0.6 $(PREFIX)/lib ++ ln -s $(PREFIX)/lib/libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0 ++ + blocksort.o: blocksort.c +- $(CC) $(CFLAGS) -c blocksort.c ++ $(CC) $(BZIP2_CFLAGS) -c blocksort.c + huffman.o: huffman.c +- $(CC) $(CFLAGS) -c huffman.c ++ $(CC) $(BZIP2_CFLAGS) -c huffman.c + crctable.o: crctable.c +- $(CC) $(CFLAGS) -c crctable.c ++ $(CC) $(BZIP2_CFLAGS) -c crctable.c + randtable.o: randtable.c +- $(CC) $(CFLAGS) -c randtable.c ++ $(CC) $(BZIP2_CFLAGS) -c randtable.c + compress.o: compress.c +- $(CC) $(CFLAGS) -c compress.c ++ $(CC) $(BZIP2_CFLAGS) -c compress.c + decompress.o: decompress.c +- $(CC) $(CFLAGS) -c decompress.c ++ $(CC) $(BZIP2_CFLAGS) -c decompress.c + bzlib.o: bzlib.c +- $(CC) $(CFLAGS) -c bzlib.c ++ $(CC) $(BZIP2_CFLAGS) -c bzlib.c +diff --git a/bzip2.c b/bzip2.c +index 6de9d1d..dc626a4 100644 +--- a/bzip2.c ++++ b/bzip2.c +@@ -128,7 +128,7 @@ + #if BZ_LCCWIN32 + # include <io.h> + # include <fcntl.h> +-# include <sys\stat.h> ++# include <sys/stat.h> + + # define NORETURN /**/ + # define PATH_SEP '\\' +-- +1.8.1.2 + diff --git a/recipes/bzip2/0002-Fix-windows-build.patch b/recipes/bzip2/0002-Fix-windows-build.patch deleted file mode 100644 index 508c7218..00000000 --- a/recipes/bzip2/0002-Fix-windows-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f7cd2ec69e523e309be57a8975630d775b705fe5 Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Wed, 14 Mar 2012 17:29:18 +0100 -Subject: [PATCH 02/14] Fix windows build - ---- - Makefile-libbz2_dll | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile-libbz2_dll b/Makefile-libbz2_dll -index c753f42..1707a90 100644 ---- a/Makefile-libbz2_dll -+++ b/Makefile-libbz2_dll -@@ -35,7 +35,7 @@ OBJS= blocksort.o \ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -no-undefined -o libbz2.dll $(OBJS) -+ $(CC) -shared -o libbz2.dll $(OBJS) - - clean: - rm -f $(OBJS) libbz2.dll --- -1.8.3.1 - diff --git a/recipes/bzip2/0003-Use-env-tools-if-they-are-set.patch b/recipes/bzip2/0003-Use-env-tools-if-they-are-set.patch deleted file mode 100644 index 8424d1ff..00000000 --- a/recipes/bzip2/0003-Use-env-tools-if-they-are-set.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ce8af2e8bff54809de0d2217d91d3f61e52bd06b Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Sat, 14 Apr 2012 06:06:05 +0200 -Subject: [PATCH 03/14] Use env tools if they are set - ---- - Makefile | 12 +++++++++--- - Makefile-libbz2_dll | 1 - - 2 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 9754ddf..dac6c72 100644 ---- a/Makefile -+++ b/Makefile -@@ -15,9 +15,15 @@ - SHELL=/bin/sh - - # To assist in cross-compiling --CC=gcc --AR=ar --RANLIB=ranlib -+ifndef CC -+ CC=gcc -+endif -+ifndef RANLIB -+ RANLIB=ranlib -+endif -+ifndef AR -+ AR=ar -+endif - LDFLAGS= - - BIGFILES=-D_FILE_OFFSET_BITS=64 -diff --git a/Makefile-libbz2_dll b/Makefile-libbz2_dll -index 1707a90..805ccb0 100644 ---- a/Makefile-libbz2_dll -+++ b/Makefile-libbz2_dll -@@ -22,7 +22,6 @@ - - - SHELL=/bin/sh --CC=gcc - BIGFILES=-D_FILE_OFFSET_BITS=64 - CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) - --- -1.8.3.1 - diff --git a/recipes/bzip2/0004-Fix-path-separator.patch b/recipes/bzip2/0004-Fix-path-separator.patch deleted file mode 100644 index 4eccd2b9..00000000 --- a/recipes/bzip2/0004-Fix-path-separator.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 63fd5079aa2b04363b5bfd58d3be7226c9d96fc1 Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Sun, 15 Apr 2012 23:34:26 +0200 -Subject: [PATCH 04/14] Fix path separator - ---- - bzip2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bzip2.c b/bzip2.c -index 6de9d1d..dc626a4 100644 ---- a/bzip2.c -+++ b/bzip2.c -@@ -128,7 +128,7 @@ - #if BZ_LCCWIN32 - # include <io.h> - # include <fcntl.h> --# include <sys\stat.h> -+# include <sys/stat.h> - - # define NORETURN /**/ - # define PATH_SEP '\\' --- -1.8.3.1 - diff --git a/recipes/bzip2/0005-Install-dll-in-the-bin-dir.patch b/recipes/bzip2/0005-Install-dll-in-the-bin-dir.patch deleted file mode 100644 index 0b27c3ed..00000000 --- a/recipes/bzip2/0005-Install-dll-in-the-bin-dir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 34dee02fe8ff3b5d533ccb3def418bb407e6f8dd Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Mon, 16 Apr 2012 00:06:20 +0200 -Subject: [PATCH 05/14] Install dll in the bin dir - ---- - Makefile-libbz2_dll | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile-libbz2_dll b/Makefile-libbz2_dll -index 805ccb0..2810af4 100644 ---- a/Makefile-libbz2_dll -+++ b/Makefile-libbz2_dll -@@ -40,7 +40,7 @@ clean: - rm -f $(OBJS) libbz2.dll - - install: -- cp -f libbz2.dll $(PREFIX)/lib -+ cp -f libbz2.dll $(PREFIX)/bin - - blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c --- -1.8.3.1 - diff --git a/recipes/bzip2/0006-Remove-tests-from-the-all-target.patch b/recipes/bzip2/0006-Remove-tests-from-the-all-target.patch deleted file mode 100644 index 6db7df23..00000000 --- a/recipes/bzip2/0006-Remove-tests-from-the-all-target.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2eae9ff285d041e9200b9136279c497d1c6ad6eb Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Fri, 20 Apr 2012 06:03:56 +0200 -Subject: [PATCH 06/14] Remove tests from the all target - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index dac6c72..f692a3e 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,7 +41,7 @@ OBJS= blocksort.o \ - decompress.o \ - bzlib.o - --all: libbz2.a bzip2 bzip2recover test -+all: libbz2.a bzip2 bzip2recover - - bzip2: libbz2.a bzip2.o - $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 --- -1.8.3.1 - diff --git a/recipes/bzip2/0007-Add-variable-for-executable-extansions-on-Windows.patch b/recipes/bzip2/0007-Add-variable-for-executable-extansions-on-Windows.patch deleted file mode 100644 index f3d362ff..00000000 --- a/recipes/bzip2/0007-Add-variable-for-executable-extansions-on-Windows.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a15ee210c1325c8cf0325a7ade907a63de0c12a9 Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Fri, 20 Apr 2012 20:06:18 +0200 -Subject: [PATCH 07/14] Add variable for executable extansions on Windows - ---- - Makefile | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index f692a3e..36ede3d 100644 ---- a/Makefile -+++ b/Makefile -@@ -81,14 +81,14 @@ install: bzip2 bzip2recover - if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi - if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi - if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi -- cp -f bzip2 $(PREFIX)/bin/bzip2 -- cp -f bzip2 $(PREFIX)/bin/bunzip2 -- cp -f bzip2 $(PREFIX)/bin/bzcat -- cp -f bzip2recover $(PREFIX)/bin/bzip2recover -- chmod a+x $(PREFIX)/bin/bzip2 -- chmod a+x $(PREFIX)/bin/bunzip2 -- chmod a+x $(PREFIX)/bin/bzcat -- chmod a+x $(PREFIX)/bin/bzip2recover -+ cp -f bzip2$(EXT) $(PREFIX)/bin/bzip2$(EXT) -+ cp -f bzip2$(EXT) $(PREFIX)/bin/bunzip2$(EXT) -+ cp -f bzip2$(EXT) $(PREFIX)/bin/bzcat$(EXT) -+ cp -f bzip2recover$(EXT) $(PREFIX)/bin/bzip2recover$(EXT) -+ chmod a+x $(PREFIX)/bin/bzip2$(EXT) -+ chmod a+x $(PREFIX)/bin/bunzip2$(EXT) -+ chmod a+x $(PREFIX)/bin/bzcat$(EXT) -+ chmod a+x $(PREFIX)/bin/bzip2recover$(EXT) - cp -f bzip2.1 $(PREFIX)/man/man1 - chmod a+r $(PREFIX)/man/man1/bzip2.1 - cp -f bzlib.h $(PREFIX)/include --- -1.8.3.1 - diff --git a/recipes/bzip2/0008-Add-extension-to-binaries-too.patch b/recipes/bzip2/0008-Add-extension-to-binaries-too.patch deleted file mode 100644 index 7a6c593c..00000000 --- a/recipes/bzip2/0008-Add-extension-to-binaries-too.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0d65525b2e69d6f8f37cf3b4e1620281925bebbb Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Thu, 26 Apr 2012 15:24:22 +0200 -Subject: [PATCH 08/14] Add extension to binaries too - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 36ede3d..be0abfd 100644 ---- a/Makefile -+++ b/Makefile -@@ -44,10 +44,10 @@ OBJS= blocksort.o \ - all: libbz2.a bzip2 bzip2recover - - bzip2: libbz2.a bzip2.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2$(EXT) bzip2.o -L. -lbz2 - - bzip2recover: bzip2recover.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover$(EXT) bzip2recover.o - - libbz2.a: $(OBJS) - rm -f libbz2.a --- -1.8.3.1 - diff --git a/recipes/bzip2/0009-Fix-build-on-OSX.patch b/recipes/bzip2/0009-Fix-build-on-OSX.patch deleted file mode 100644 index 658669ea..00000000 --- a/recipes/bzip2/0009-Fix-build-on-OSX.patch +++ /dev/null @@ -1,253 +0,0 @@ -From 1e41a9bfddd92a9646084bdb37a82da8cea418d9 Mon Sep 17 00:00:00 2001 -From: Josep Torra <josep@fluendo.com> -Date: Thu, 24 May 2012 17:07:15 +0200 -Subject: [PATCH 09/14] Fix build on OSX - ---- - Makefile | 34 +++++++++++++++++++++------------- - Makefile-libbz2_dll | 27 ++++++++++++++++++--------- - Makefile-libbz2_dylib | 27 ++++++++++++++++++--------- - Makefile-libbz2_so | 29 +++++++++++++++++++---------- - 4 files changed, 76 insertions(+), 41 deletions(-) - -diff --git a/Makefile b/Makefile -index be0abfd..72dad60 100644 ---- a/Makefile -+++ b/Makefile -@@ -24,10 +24,18 @@ endif - ifndef AR - AR=ar - endif --LDFLAGS= -+BZIP2_LDFLAGS= - - BIGFILES=-D_FILE_OFFSET_BITS=64 --CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) -+BZIP2_CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) -+ -+ifdef CFLAGS -+BZIP2_CFLAGS+=$(CFLAGS) -+endif -+ -+ifdef LDFLAGS -+BZIP2_LDFLAGS+=$(LDFLAGS) -+endif - - # Where you want it installed when you do 'make install' - PREFIX=/usr/local -@@ -44,10 +52,10 @@ OBJS= blocksort.o \ - all: libbz2.a bzip2 bzip2recover - - bzip2: libbz2.a bzip2.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2$(EXT) bzip2.o -L. -lbz2 -+ $(CC) $(BZIP2_CFLAGS) $(BZIP2_LDFLAGS) -o bzip2$(EXT) bzip2.o -L. -lbz2 - - bzip2recover: bzip2recover.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover$(EXT) bzip2recover.o -+ $(CC) $(BZIP2_CFLAGS) $(BZIP2_LDFLAGS) -o bzip2recover$(EXT) bzip2recover.o - - libbz2.a: $(OBJS) - rm -f libbz2.a -@@ -121,23 +129,23 @@ clean: - - blocksort.o: blocksort.c - @cat words0 -- $(CC) $(CFLAGS) -c blocksort.c -+ $(CC) $(BZIP2_CFLAGS) -c blocksort.c - huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c -+ $(CC) $(BZIP2_CFLAGS) -c huffman.c - crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c -+ $(CC) $(BZIP2_CFLAGS) -c crctable.c - randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c -+ $(CC) $(BZIP2_CFLAGS) -c randtable.c - compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c -+ $(CC) $(BZIP2_CFLAGS) -c compress.c - decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c -+ $(CC) $(BZIP2_CFLAGS) -c decompress.c - bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c -+ $(CC) $(BZIP2_CFLAGS) -c bzlib.c - bzip2.o: bzip2.c -- $(CC) $(CFLAGS) -c bzip2.c -+ $(CC) $(BZIP2_CFLAGS) -c bzip2.c - bzip2recover.o: bzip2recover.c -- $(CC) $(CFLAGS) -c bzip2recover.c -+ $(CC) $(BZIP2_CFLAGS) -c bzip2recover.c - - - distclean: clean -diff --git a/Makefile-libbz2_dll b/Makefile-libbz2_dll -index 2810af4..bd15a84 100644 ---- a/Makefile-libbz2_dll -+++ b/Makefile-libbz2_dll -@@ -23,7 +23,16 @@ - - SHELL=/bin/sh - BIGFILES=-D_FILE_OFFSET_BITS=64 --CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -+BZIP2_CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -+BZIP2_LDFLAGS= -+ -+ifdef CFLAGS -+BZIP2_CFLAGS+=$(CFLAGS) -+endif -+ -+ifdef LDFLAGS -+BZIP2_LDFLAGS+=$(LDFLAGS) -+endif - - OBJS= blocksort.o \ - huffman.o \ -@@ -34,7 +43,7 @@ OBJS= blocksort.o \ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -o libbz2.dll $(OBJS) -+ $(CC) $(BZIP2_LDFLAGS) -shared -o libbz2.dll $(OBJS) - - clean: - rm -f $(OBJS) libbz2.dll -@@ -43,16 +52,16 @@ install: - cp -f libbz2.dll $(PREFIX)/bin - - blocksort.o: blocksort.c -- $(CC) $(CFLAGS) -c blocksort.c -+ $(CC) $(BZIP2_CFLAGS) -c blocksort.c - huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c -+ $(CC) $(BZIP2_CFLAGS) -c huffman.c - crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c -+ $(CC) $(BZIP2_CFLAGS) -c crctable.c - randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c -+ $(CC) $(BZIP2_CFLAGS) -c randtable.c - compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c -+ $(CC) $(BZIP2_CFLAGS) -c compress.c - decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c -+ $(CC) $(BZIP2_CFLAGS) -c decompress.c - bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c -+ $(CC) $(BZIP2_CFLAGS) -c bzlib.c -diff --git a/Makefile-libbz2_dylib b/Makefile-libbz2_dylib -index 270f303..06f9bd4 100644 ---- a/Makefile-libbz2_dylib -+++ b/Makefile-libbz2_dylib -@@ -24,7 +24,16 @@ - SHELL=/bin/sh - CC=gcc - BIGFILES=-D_FILE_OFFSET_BITS=64 --CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -+BZIP2_CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -+BZIP2_LDFLAGS= -+ -+ifdef CFLAGS -+BZIP2_CFLAGS+=$(CFLAGS) -+endif -+ -+ifdef LDFLAGS -+BZIP2_LDFLAGS+=$(LDFLAGS) -+endif - - OBJS= blocksort.o \ - huffman.o \ -@@ -35,7 +44,7 @@ OBJS= blocksort.o \ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -o libbz2.dylib $(OBJS) -+ $(CC) -shared -o libbz2.dylib $(OBJS) $(BZIP2_LDFLAGS) - - clean: - rm -f $(OBJS) libbz2.dylib -@@ -44,16 +53,16 @@ install: - cp -f libbz2.dylib $(PREFIX)/lib - - blocksort.o: blocksort.c -- $(CC) $(CFLAGS) -c blocksort.c -+ $(CC) $(BZIP2_CFLAGS) -c blocksort.c - huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c -+ $(CC) $(BZIP2_CFLAGS) -c huffman.c - crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c -+ $(CC) $(BZIP2_CFLAGS) -c crctable.c - randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c -+ $(CC) $(BZIP2_CFLAGS) -c randtable.c - compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c -+ $(CC) $(BZIP2_CFLAGS) -c compress.c - decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c -+ $(CC) $(BZIP2_CFLAGS) -c decompress.c - bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c -+ $(CC) $(BZIP2_CFLAGS) -c bzlib.c -diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so -index 99c7d38..f100429 100644 ---- a/Makefile-libbz2_so -+++ b/Makefile-libbz2_so -@@ -24,7 +24,16 @@ - SHELL=/bin/sh - CC=gcc - BIGFILES=-D_FILE_OFFSET_BITS=64 --CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -+BZIP2_CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -+BZIP2_LDFLAGS= -+ -+ifdef CFLAGS -+BZIP2_CFLAGS+=$(CFLAGS) -+endif -+ -+ifdef LDFLAGS -+BZIP2_LDFLAGS+=$(CFLAGS) -+endif - - OBJS= blocksort.o \ - huffman.o \ -@@ -35,8 +44,8 @@ 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) $(BZIP2_LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) $(BZIP2_CFLAGS) $(BZIP2_LDFLAGS) -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 - -@@ -48,16 +57,16 @@ install: - ln -s $(PREFIX)/lib/libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0 - - blocksort.o: blocksort.c -- $(CC) $(CFLAGS) -c blocksort.c -+ $(CC) $(BZIP2_CFLAGS) -c blocksort.c - huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c -+ $(CC) $(BZIP2_CFLAGS) -c huffman.c - crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c -+ $(CC) $(BZIP2_CFLAGS) -c crctable.c - randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c -+ $(CC) $(BZIP2_CFLAGS) -c randtable.c - compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c -+ $(CC) $(BZIP2_CFLAGS) -c compress.c - decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c -+ $(CC) $(BZIP2_CFLAGS) -c decompress.c - bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c -+ $(CC) $(BZIP2_CFLAGS) -c bzlib.c --- -1.8.3.1 - diff --git a/recipes/bzip2/0010-Use-the-environment-CC.patch b/recipes/bzip2/0010-Use-the-environment-CC.patch deleted file mode 100644 index d461b8c1..00000000 --- a/recipes/bzip2/0010-Use-the-environment-CC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 390c58a83ca597b16e17cacb7d7910f37fe0a430 Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Thu, 11 Oct 2012 15:01:41 +0200 -Subject: [PATCH 10/14] Use the environment CC - ---- - Makefile-libbz2_so | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so -index f100429..78e5291 100644 ---- a/Makefile-libbz2_so -+++ b/Makefile-libbz2_so -@@ -22,7 +22,11 @@ - - - SHELL=/bin/sh -+ -+ifndef CC - CC=gcc -+endif -+ - BIGFILES=-D_FILE_OFFSET_BITS=64 - BZIP2_CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) - BZIP2_LDFLAGS= --- -1.8.3.1 - diff --git a/recipes/bzip2/0011-create-libbz2.dll.a-for-linking-on-windows.patch b/recipes/bzip2/0011-create-libbz2.dll.a-for-linking-on-windows.patch deleted file mode 100644 index 7d8849c2..00000000 --- a/recipes/bzip2/0011-create-libbz2.dll.a-for-linking-on-windows.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 88e643e446a88523e1cd5eb333b707a6d36ab7c9 Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Thu, 18 Oct 2012 16:49:38 +0200 -Subject: [PATCH 11/14] create libbz2.dll.a for linking on windows - ---- - Makefile-libbz2_dll | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile-libbz2_dll b/Makefile-libbz2_dll -index bd15a84..e021d31 100644 ---- a/Makefile-libbz2_dll -+++ b/Makefile-libbz2_dll -@@ -43,13 +43,14 @@ OBJS= blocksort.o \ - bzlib.o - - all: $(OBJS) -- $(CC) $(BZIP2_LDFLAGS) -shared -o libbz2.dll $(OBJS) -+ $(CC) $(BZIP2_LDFLAGS) -shared -o libbz2.dll -Wl,--out-implib,libbz2.dll.a $(OBJS) - - clean: - rm -f $(OBJS) libbz2.dll - - install: - cp -f libbz2.dll $(PREFIX)/bin -+ cp -f libbz2.dll.a $(PREFIX)/lib - - blocksort.o: blocksort.c - $(CC) $(BZIP2_CFLAGS) -c blocksort.c --- -1.8.3.1 - diff --git a/recipes/bzip2/0012-Do-not-hardcode-CC-so-it-can-be-cross-compiled-for-i.patch b/recipes/bzip2/0012-Do-not-hardcode-CC-so-it-can-be-cross-compiled-for-i.patch deleted file mode 100644 index d00f922a..00000000 --- a/recipes/bzip2/0012-Do-not-hardcode-CC-so-it-can-be-cross-compiled-for-i.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f1eb77b885520ad46f7258f57bbb8b4e8418a381 Mon Sep 17 00:00:00 2001 -From: Thibault Saunier <thibault.saunier@collabora.com> -Date: Fri, 25 Jan 2013 09:15:17 -0300 -Subject: [PATCH 12/14] Do not hardcode CC so it can be cross compiled for iOS - ---- - Makefile-libbz2_dylib | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile-libbz2_dylib b/Makefile-libbz2_dylib -index 06f9bd4..9fec33d 100644 ---- a/Makefile-libbz2_dylib -+++ b/Makefile-libbz2_dylib -@@ -22,7 +22,9 @@ - - - SHELL=/bin/sh -+ifndef CC - CC=gcc -+endif - BIGFILES=-D_FILE_OFFSET_BITS=64 - BZIP2_CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) - BZIP2_LDFLAGS= --- -1.8.3.1 - diff --git a/recipes/bzip2/0013-Build-a-versioned-library-in-os-x.patch b/recipes/bzip2/0013-Build-a-versioned-library-in-os-x.patch deleted file mode 100644 index 551f1600..00000000 --- a/recipes/bzip2/0013-Build-a-versioned-library-in-os-x.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0b80d660d61ebf5d15418edcb313b121ccbcd310 Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Sat, 13 Apr 2013 23:33:50 +0200 -Subject: [PATCH 13/14] Build a versioned library in os x - ---- - Makefile-libbz2_dylib | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/Makefile-libbz2_dylib b/Makefile-libbz2_dylib -index 9fec33d..135a816 100644 ---- a/Makefile-libbz2_dylib -+++ b/Makefile-libbz2_dylib -@@ -46,13 +46,21 @@ OBJS= blocksort.o \ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -o libbz2.dylib $(OBJS) $(BZIP2_LDFLAGS) -+ $(CC) $(BZIP2_LDFLAGS) -shared -Wl,-install_name -Wl,libbz2.1.0.dylib -o libbz2.1.0.6.dylib $(OBJS) -+ rm -f libbz2.1.0.dylib -+ rm -f libbz2.dylib -+ ln -s libbz2.1.0.6.dylib libbz2.1.0.dylib -+ ln -s libbz2.1.0.6.dylib libbz2.dylib - - clean: -- rm -f $(OBJS) libbz2.dylib -+ rm -f $(OBJS) libbz2.1.0.6.dylib libbz2.1.0.dylib libbz2.dylib - - install: -- cp -f libbz2.dylib $(PREFIX)/lib -+ cp -f libbz2.1.0.6.dylib $(PREFIX)/lib -+ rm -f $(PREFIX)/lib/libbz2.1.0.dylib -+ rm -f $(PREFIX)/lib/libbz2.dylib -+ ln -s $(PREFIX)/lib/libbz2.1.0.6.dylib $(PREFIX)/lib/libbz2.1.0.dylib -+ ln -s $(PREFIX)/lib/libbz2.1.0.6.dylib $(PREFIX)/lib/libbz2.dylib - - blocksort.o: blocksort.c - $(CC) $(BZIP2_CFLAGS) -c blocksort.c --- -1.8.3.1 - diff --git a/recipes/bzip2/0014-dylib-install-symlinks-with-relative-paths.patch b/recipes/bzip2/0014-dylib-install-symlinks-with-relative-paths.patch deleted file mode 100644 index 36477617..00000000 --- a/recipes/bzip2/0014-dylib-install-symlinks-with-relative-paths.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4eb55670cefcc86a2e1ae30b6cbd1f9741c6f4c5 Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> -Date: Tue, 23 Apr 2013 19:00:38 +0200 -Subject: [PATCH 14/14] dylib: install symlinks with relative paths - ---- - Makefile-libbz2_dylib | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile-libbz2_dylib b/Makefile-libbz2_dylib -index 135a816..cd77e3a 100644 ---- a/Makefile-libbz2_dylib -+++ b/Makefile-libbz2_dylib -@@ -59,8 +59,8 @@ install: - cp -f libbz2.1.0.6.dylib $(PREFIX)/lib - rm -f $(PREFIX)/lib/libbz2.1.0.dylib - rm -f $(PREFIX)/lib/libbz2.dylib -- ln -s $(PREFIX)/lib/libbz2.1.0.6.dylib $(PREFIX)/lib/libbz2.1.0.dylib -- ln -s $(PREFIX)/lib/libbz2.1.0.6.dylib $(PREFIX)/lib/libbz2.dylib -+ cp -R libbz2.1.0.dylib $(PREFIX)/lib/ -+ cp -R libbz2.dylib $(PREFIX)/lib/ - - blocksort.o: blocksort.c - $(CC) $(BZIP2_CFLAGS) -c blocksort.c --- -1.8.3.1 - |