diff options
| author | Edward Hervey <edward@centricular.com> | 2018-03-05 13:51:25 +0100 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2018-03-05 13:51:25 +0100 |
| commit | f0d8a53690166557d2a35f65768926490fb5a644 (patch) | |
| tree | cfb12a56a0319f9c88739fb4d90c0b936464cfea /recipes/bzip2 | |
| parent | 2f7119c7d2c6b44fbe8053de7a453cfa66420b85 (diff) | |
recipes/bzip2: Fix custom Makefile patch
If LDFLAGS are available use them (and not the CFFLAGS :) )
Diffstat (limited to 'recipes/bzip2')
| -rw-r--r-- | recipes/bzip2/0001-Fix-Makefiles-and-add-support-for-Windows-and-OS-X.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 index c6daa924..f767660c 100644 --- 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 @@ -1,5 +1,5 @@ -From f0063f7e3c8178eb1cfb5d913b3fbec3262295d5 Mon Sep 17 00:00:00 2001 -From: Andoni Morales Alastruey <ylatuya@gmail.com> +From 9c2bf1de021e082c62c781a25a71406404d548c1 Mon Sep 17 00:00:00 2001 +From: Edward Hervey <edward@centricular.com> Date: Sat, 10 Mar 2012 19:00:14 +0100 Subject: [PATCH] Fix Makefiles and add support for Windows and OS X @@ -282,7 +282,7 @@ index 0000000..cd77e3a +bzlib.o: bzlib.c + $(CC) $(BZIP2_CFLAGS) -c bzlib.c diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so -index e58791b..78e5291 100644 +index e58791b..bb0dca5 100644 --- a/Makefile-libbz2_so +++ b/Makefile-libbz2_so @@ -22,9 +22,22 @@ @@ -304,7 +304,7 @@ index e58791b..78e5291 100644 +endif + +ifdef LDFLAGS -+BZIP2_LDFLAGS+=$(CFLAGS) ++BZIP2_LDFLAGS+=$(LDFLAGS) +endif OBJS= blocksort.o \ @@ -362,5 +362,5 @@ index 6de9d1d..dc626a4 100644 # define NORETURN /**/ # define PATH_SEP '\\' -- -1.8.1.2 +2.14.3 |