diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-27 14:27:45 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-27 14:27:45 +0200 |
| commit | e750323c87c297897ba2c3d3b307c66286a1168c (patch) | |
| tree | 4271b9ad1e30643e5259531900799f43f13ea0d9 /package/unzip/patches | |
| parent | 883823056de84e3ee5288ccf39818db887f25f79 (diff) | |
xbmc checks for unzip/zip
Diffstat (limited to 'package/unzip/patches')
| -rw-r--r-- | package/unzip/patches/patch-unix_Makefile | 28 | ||||
| -rw-r--r-- | package/unzip/patches/patch-unix_configure | 26 |
2 files changed, 54 insertions, 0 deletions
diff --git a/package/unzip/patches/patch-unix_Makefile b/package/unzip/patches/patch-unix_Makefile new file mode 100644 index 000000000..842ef5493 --- /dev/null +++ b/package/unzip/patches/patch-unix_Makefile @@ -0,0 +1,28 @@ +--- unzip60.orig/unix/Makefile 2009-01-18 23:41:18.000000000 +0100 ++++ unzip60/unix/Makefile 2014-05-27 14:22:34.624111366 +0200 +@@ -42,13 +42,13 @@ + # such as -DDOSWILD). + + # UnZip flags +-CC = cc# try using "gcc" target rather than changing this (CC and LD ++CC ?= cc# try using "gcc" target rather than changing this (CC and LD + LD = $(CC)# must match, else "unresolved symbol: ___main" is possible) + AS = as + LOC = $(D_USE_BZ2) $(LOCAL_UNZIP) + AF = $(LOC) +-CFLAGS = -O +-CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC) ++CFLAGS ?= ++CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(CFLAGS) + CF = $(CFLAGS) $(CF_NOOPT) + LFLAGS1 = + LF = -o unzip$E $(LFLAGS1) +@@ -545,7 +545,7 @@ generic: flags # now try autoconfigur + # make $(MAKEF) unzips CF="${CF} `cat flags`" + + generic_gcc: +- $(MAKE) $(MAKEF) generic CC=gcc IZ_BZIP2="$(IZ_BZIP2)" ++ $(MAKE) $(MAKEF) generic CC=$(CC) IZ_BZIP2="$(IZ_BZIP2)" + + # extensions to perform SVR4 package-creation after compilation + generic_pkg: generic svr4package diff --git a/package/unzip/patches/patch-unix_configure b/package/unzip/patches/patch-unix_configure new file mode 100644 index 000000000..9f8809651 --- /dev/null +++ b/package/unzip/patches/patch-unix_configure @@ -0,0 +1,26 @@ +--- unzip60.orig/unix/configure 2009-04-16 21:25:12.000000000 +0200 ++++ unzip60/unix/configure 2014-05-27 14:26:43.375494965 +0200 +@@ -130,11 +130,9 @@ _EOF_ + fi + fi + +-# optimization flags +-if test -n "${CFLAGS_OPT}"; then +- CFLAGSR="${CFLAGSR} ${CFLAGS_OPT}" +- CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}" +-fi ++CFLAGSR="${CFLAGSR}" ++CFLAGS_BZ="${CFLAGS_BZ}" ++ + + echo Check for the C preprocessor + # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp. +@@ -433,7 +431,7 @@ if [ $? -ne 0 ]; then + if [ ${OPT} ]; then + LFLAGS2="${LFLAGS2} ${OPT}" + else +- CFLAGSR="${CFLAGSR} -DNO_DIR" ++ CFLAGSR="${CFLAGSR}" + fi + fi + |