diff options
Diffstat (limited to 'meta/recipes-extended/unzip')
-rw-r--r-- | meta/recipes-extended/unzip/unzip/avoid-strip.patch | 50 | ||||
-rw-r--r-- | meta/recipes-extended/unzip/unzip/define-ldflags.patch | 18 | ||||
-rw-r--r-- | meta/recipes-extended/unzip/unzip_6.0.bb | 38 |
3 files changed, 106 insertions, 0 deletions
diff --git a/meta/recipes-extended/unzip/unzip/avoid-strip.patch b/meta/recipes-extended/unzip/unzip/avoid-strip.patch new file mode 100644 index 0000000000..8f30e42674 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/avoid-strip.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | unix/Makefile: remove hard coded strip commands | ||
4 | |||
5 | Remove the hard coded strip commands, both LF2 (used in linking) and | ||
6 | STRIP used alone. | ||
7 | |||
8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
9 | |||
10 | diff -ur unzip60.orig/unix/configure unzip60/unix/configure | ||
11 | --- unzip60.orig/unix/configure 2009-04-16 14:25:12.000000000 -0500 | ||
12 | +++ unzip60/unix/configure 2011-06-21 11:23:36.822849960 -0500 | ||
13 | @@ -17,7 +17,7 @@ | ||
14 | IZ_BZIP2=${3} | ||
15 | CFLAGS="${CFLAGS} -I. -DUNIX" | ||
16 | LFLAGS1="" | ||
17 | -LFLAGS2="-s" | ||
18 | +LFLAGS2="" | ||
19 | LN="ln -s" | ||
20 | |||
21 | CFLAGS_OPT='' | ||
22 | diff -ur unzip60.orig/unix/Makefile unzip60/unix/Makefile | ||
23 | --- unzip60.orig/unix/Makefile 2009-01-18 16:41:18.000000000 -0600 | ||
24 | +++ unzip60/unix/Makefile 2011-06-21 11:12:22.900003388 -0500 | ||
25 | @@ -52,7 +52,7 @@ | ||
26 | CF = $(CFLAGS) $(CF_NOOPT) | ||
27 | LFLAGS1 = | ||
28 | LF = -o unzip$E $(LFLAGS1) | ||
29 | -LF2 = -s | ||
30 | +LF2 = | ||
31 | |||
32 | # UnZipSFX flags | ||
33 | SL = -o unzipsfx$E $(LFLAGS1) | ||
34 | @@ -70,7 +70,7 @@ | ||
35 | CHMOD = chmod | ||
36 | BINPERMS = 755 | ||
37 | MANPERMS = 644 | ||
38 | -STRIP = strip | ||
39 | +STRIP = | ||
40 | E = | ||
41 | O = .o | ||
42 | M = unix | ||
43 | @@ -776,7 +776,6 @@ | ||
44 | # | ||
45 | gcc: unix_make | ||
46 | $(MAKE) unzips CC=gcc LD=gcc CFLAGS="-O3" LF2="" | ||
47 | - $(STRIP) $(UNZIPS) | ||
48 | |||
49 | # Heurikon HK68 (68010), UniPlus+ System V 5.0, Green Hills C-68000 | ||
50 | hk68: unix_make | ||
diff --git a/meta/recipes-extended/unzip/unzip/define-ldflags.patch b/meta/recipes-extended/unzip/unzip/define-ldflags.patch new file mode 100644 index 0000000000..659c6e3315 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/define-ldflags.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Pass LDFLAGS to the linker | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Mikhail Durnev <Mikhail_Durnev@mentor.com> | ||
6 | |||
7 | diff -Naur old/unix/configure new/unix/configure | ||
8 | --- old/unix/configure 2014-01-13 21:59:27.000000000 +1100 | ||
9 | +++ new/unix/configure 2014-01-14 16:36:02.000000000 +1100 | ||
10 | @@ -16,7 +16,7 @@ | ||
11 | CFLAGSR=${CFLAGS} | ||
12 | IZ_BZIP2=${3} | ||
13 | CFLAGS="${CFLAGS} -I. -DUNIX" | ||
14 | -LFLAGS1="" | ||
15 | +LFLAGS1=${LDFLAGS} | ||
16 | LFLAGS2="" | ||
17 | LN="ln -s" | ||
18 | |||
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb new file mode 100644 index 0000000000..33c20f8b4c --- /dev/null +++ b/meta/recipes-extended/unzip/unzip_6.0.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | SUMMARY = "Utilities for extracting and viewing files in .zip archives" | ||
2 | HOMEPAGE = "http://www.info-zip.org" | ||
3 | SECTION = "console/utils" | ||
4 | LICENSE = "BSD-3-Clause" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29" | ||
6 | PE = "1" | ||
7 | PR = "r5" | ||
8 | |||
9 | SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz \ | ||
10 | file://avoid-strip.patch \ | ||
11 | file://define-ldflags.patch" | ||
12 | |||
13 | SRC_URI[md5sum] = "62b490407489521db863b523a7f86375" | ||
14 | SRC_URI[sha256sum] = "036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37" | ||
15 | S = "${WORKDIR}/unzip60" | ||
16 | |||
17 | # Makefile uses CF_NOOPT instead of CFLAGS. We lifted the values from | ||
18 | # Makefile and add CFLAGS. Optimization will be overriden by unzip | ||
19 | # configure to be -O3. | ||
20 | # | ||
21 | EXTRA_OEMAKE += "STRIP=true LF2='' \ | ||
22 | 'CF_NOOPT=-I. -Ibzip2 -DUNIX ${CFLAGS}'" | ||
23 | |||
24 | export LD = "${CC}" | ||
25 | LD_class-native = "${CC}" | ||
26 | |||
27 | do_compile() { | ||
28 | oe_runmake -f unix/Makefile generic | ||
29 | } | ||
30 | |||
31 | do_install() { | ||
32 | oe_runmake -f unix/Makefile install prefix=${D}${prefix} | ||
33 | install -d ${D}${mandir} | ||
34 | mv ${D}${prefix}/man/* ${D}${mandir} | ||
35 | rmdir ${D}${prefix}/man/ | ||
36 | } | ||
37 | |||
38 | BBCLASSEXTEND = "native" | ||