summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/zip/zip.inc26
-rw-r--r--meta/recipes-extended/zip/zip_3.0.bb39
2 files changed, 31 insertions, 34 deletions
diff --git a/meta/recipes-extended/zip/zip.inc b/meta/recipes-extended/zip/zip.inc
deleted file mode 100644
index 6221c5e139..0000000000
--- a/meta/recipes-extended/zip/zip.inc
+++ /dev/null
@@ -1,26 +0,0 @@
1SUMMARY = "Compressor/archiver for creating and modifying .zip files"
2HOMEPAGE = "http://www.info-zip.org"
3SECTION = "console/utils"
4
5LICENSE = "BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d"
7
8SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@d.getVar('PV',1).replace('.', '')}.tgz"
9
10EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
11 'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
12 'BINFLAGS=0755' 'INSTALL_D=install -d'"
13
14do_compile() {
15 oe_runmake -f unix/Makefile flags IZ_BZIP2=no_such_directory
16 sed -i 's#LFLAGS1=""#LFLAGS1="${LDFLAGS}"#' flags
17 oe_runmake -f unix/Makefile generic IZ_BZIP2=no_such_directory
18}
19
20do_install() {
21 oe_runmake -f unix/Makefile prefix=${D}${prefix} \
22 BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
23 install
24}
25
26BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb
index 383da4b89e..5079b69208 100644
--- a/meta/recipes-extended/zip/zip_3.0.bb
+++ b/meta/recipes-extended/zip/zip_3.0.bb
@@ -1,18 +1,41 @@
1require zip.inc 1SUMMARY = "Compressor/archiver for creating and modifying .zip files"
2HOMEPAGE = "http://www.info-zip.org"
3SECTION = "console/utils"
2 4
3PR="r2" 5LICENSE = "BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=04d43c5d70b496c032308106e26ae17d"
7
8PR = "r2"
4 9
5# zip-2.32 still uses directory name of zip-2.30
6S = "${WORKDIR}/zip30" 10S = "${WORKDIR}/zip30"
7 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz"
13
8SRC_URI[md5sum] = "7b74551e63f8ee6aab6fbc86676c0d37" 14SRC_URI[md5sum] = "7b74551e63f8ee6aab6fbc86676c0d37"
9SRC_URI[sha256sum] = "f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369" 15SRC_URI[sha256sum] = "f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369"
10 16
11# exclude version 2.3.2 which triggers a false positive
12UPSTREAM_CHECK_REGEX = "^zip(?P<pver>(?!232).+)\.tgz"
13
14# zip.inc sets CFLAGS, but what Makefile actually uses is 17# zip.inc sets CFLAGS, but what Makefile actually uses is
15# CFLAGS_NOOPT. It will also force -O3 optimization, overriding 18# CFLAGS_NOOPT. It will also force -O3 optimization, overriding
16# whatever we set. 19# whatever we set.
17# 20EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
18EXTRA_OEMAKE_append = " 'CFLAGS_NOOPT=-I. -DUNIX ${CFLAGS}'" 21 'CFLAGS=-I. -DUNIX ${CFLAGS}' \
22 'CFLAGS_NOOPT=-I. -DUNIX ${CFLAGS}' \
23 'INSTALL=install' 'INSTALL_D=install -d' \
24 'BINFLAGS=0755'"
25
26do_compile() {
27 oe_runmake -f unix/Makefile flags IZ_BZIP2=no_such_directory
28 sed -i 's#LFLAGS1=""#LFLAGS1="${LDFLAGS}"#' flags
29 oe_runmake -f unix/Makefile generic IZ_BZIP2=no_such_directory
30}
31
32do_install() {
33 oe_runmake -f unix/Makefile prefix=${D}${prefix} \
34 BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
35 install
36}
37
38BBCLASSEXTEND = "native"
39
40# exclude version 2.3.2 which triggers a false positive
41UPSTREAM_CHECK_REGEX = "^zip(?P<pver>(?!232).+)\.tgz"