Mercurial > mxe-octave

comparison src/bzip2.mk @ 4179:6409a12147fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bzip2: use aff patch * src/bzip2.mk: remove SED mods to source * src/bzip2-1-fixes.patch: new file * dist-files.mk: add bzip2-1-fixes.patch
author John Donoghue <john.donoghue@ieee.org>
date Tue, 26 Jul 2016 05:59:06 -0400
parents 13be64f9f16d
children 7914e218df3e
comparison
equal deleted inserted replaced
4178:a7e6025bcb39 4179:6409a12147fd
17 head -1 17 head -1
18 endef 18 endef
19 19
20 ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),) 20 ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),)
21 define $(PKG)_BUILD 21 define $(PKG)_BUILD
22 $(SED) -i 's,sys\\stat\.h,sys/stat.h,g' '$(1)/bzip2.c' 22 #$(SED) -i 's,sys\\stat\.h,sys/stat.h,g' '$(1)/bzip2.c'
23 $(SED) -i 's,WINAPI,,g' '$(1)/bzlib.h' 23 #$(SED) -i 's,WINAPI,,g' '$(1)/bzlib.h'
24 $(MAKE) -C '$(1)' -j '$(JOBS)' libbz2.a bzip2 \ 24 $(MAKE) -C '$(1)' -j '$(JOBS)' libbz2.a bzip2 \
25 PREFIX='$(HOST_PREFIX)' \ 25 PREFIX='$(HOST_PREFIX)' \
26 CC='$(MXE_CC)' \ 26 CC='$(MXE_CC)' \
27 AR='$(MXE_AR)' \ 27 AR='$(MXE_AR)' \
28 RANLIB='$(MXE_RANLIB)' 28 RANLIB='$(MXE_RANLIB)'
41 $(INSTALL) '$(1)/bzip2' '$(3)$(HOST_BINDIR)/bzip2.exe' 41 $(INSTALL) '$(1)/bzip2' '$(3)$(HOST_BINDIR)/bzip2.exe'
42 42
43 endef 43 endef
44 else 44 else
45 define $(PKG)_BUILD 45 define $(PKG)_BUILD
46 $(SED) -i 's,sys\\stat\.h,sys/stat.h,g' '$(1)/bzip2.c' 46 #$(SED) -i 's,sys\\stat\.h,sys/stat.h,g' '$(1)/bzip2.c'
47 $(SED) -i 's,WINAPI,,g' '$(1)/bzlib.h' 47 #$(SED) -i 's,WINAPI,,g' '$(1)/bzlib.h'
48 $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile-libbz2_so \ 48 $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile-libbz2_so \
49 PREFIX='$(HOST_PREFIX)' \ 49 PREFIX='$(HOST_PREFIX)' \
50 CC='$(MXE_CC)' \ 50 CC='$(MXE_CC)' \
51 AR='$(MXE_AR)' \ 51 AR='$(MXE_AR)' \
52 RANLIB='$(MXE_RANLIB)' 52 RANLIB='$(MXE_RANLIB)'