diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-06-20 13:23:49 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-23 12:07:32 +0100 |
commit | d905e910c1d35e873a553296643c143202e7c1bf (patch) | |
tree | 9af32976a53724d15db4703eb309057404afe528 /meta | |
parent | da7a1b4e08eb70ea43bb8638bb9d255f6ff82836 (diff) | |
download | poky-d905e910c1d35e873a553296643c143202e7c1bf.tar.gz |
unzip: Avoid stripping binaries
Not only do we have to override things on the make line, but we
need to hack on configure as well to avoid certain behavior.
(From OE-Core rev: 97a6bf1787995f15c8033bd26bdbe50c7efbbcfd)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/unzip/unzip/avoid-strip.patch | 48 | ||||
-rw-r--r-- | meta/recipes-extended/unzip/unzip_6.0.bb | 7 |
2 files changed, 53 insertions, 2 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..0ef6363e4f --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/avoid-strip.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | unix/Makefile: remove hard coded strip commands | ||
2 | |||
3 | Remove the hard coded strip commands, both LF2 (used in linking) and | ||
4 | STRIP used alone. | ||
5 | |||
6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
7 | |||
8 | diff -ur unzip60.orig/unix/configure unzip60/unix/configure | ||
9 | --- unzip60.orig/unix/configure 2009-04-16 14:25:12.000000000 -0500 | ||
10 | +++ unzip60/unix/configure 2011-06-21 11:23:36.822849960 -0500 | ||
11 | @@ -17,7 +17,7 @@ | ||
12 | IZ_BZIP2=${3} | ||
13 | CFLAGS="${CFLAGS} -I. -DUNIX" | ||
14 | LFLAGS1="" | ||
15 | -LFLAGS2="-s" | ||
16 | +LFLAGS2="" | ||
17 | LN="ln -s" | ||
18 | |||
19 | CFLAGS_OPT='' | ||
20 | diff -ur unzip60.orig/unix/Makefile unzip60/unix/Makefile | ||
21 | --- unzip60.orig/unix/Makefile 2009-01-18 16:41:18.000000000 -0600 | ||
22 | +++ unzip60/unix/Makefile 2011-06-21 11:12:22.900003388 -0500 | ||
23 | @@ -52,7 +52,7 @@ | ||
24 | CF = $(CFLAGS) $(CF_NOOPT) | ||
25 | LFLAGS1 = | ||
26 | LF = -o unzip$E $(LFLAGS1) | ||
27 | -LF2 = -s | ||
28 | +LF2 = | ||
29 | |||
30 | # UnZipSFX flags | ||
31 | SL = -o unzipsfx$E $(LFLAGS1) | ||
32 | @@ -70,7 +70,7 @@ | ||
33 | CHMOD = chmod | ||
34 | BINPERMS = 755 | ||
35 | MANPERMS = 644 | ||
36 | -STRIP = strip | ||
37 | +STRIP = | ||
38 | E = | ||
39 | O = .o | ||
40 | M = unix | ||
41 | @@ -776,7 +776,6 @@ | ||
42 | # | ||
43 | gcc: unix_make | ||
44 | $(MAKE) unzips CC=gcc LD=gcc CFLAGS="-O3" LF2="" | ||
45 | - $(STRIP) $(UNZIPS) | ||
46 | |||
47 | # Heurikon HK68 (68010), UniPlus+ System V 5.0, Green Hills C-68000 | ||
48 | hk68: unix_make | ||
diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index ccdd372cc4..b9eff435b1 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb | |||
@@ -4,14 +4,17 @@ SECTION = "console/utils" | |||
4 | LICENSE = "Info-ZIP" | 4 | LICENSE = "Info-ZIP" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=94caec5a51ef55ef711ee4e8b1c69e29" |
6 | PE = "1" | 6 | PE = "1" |
7 | PR = "r0" | 7 | PR = "r1" |
8 | 8 | ||
9 | SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz" | 9 | SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/unzip60.tgz \ |
10 | file://avoid-strip.patch" | ||
10 | 11 | ||
11 | SRC_URI[md5sum] = "62b490407489521db863b523a7f86375" | 12 | SRC_URI[md5sum] = "62b490407489521db863b523a7f86375" |
12 | SRC_URI[sha256sum] = "036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37" | 13 | SRC_URI[sha256sum] = "036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37" |
13 | S = "${WORKDIR}/unzip60" | 14 | S = "${WORKDIR}/unzip60" |
14 | 15 | ||
16 | EXTRA_OEMAKE += "STRIP=true LF2=''" | ||
17 | |||
15 | export LD = "${CC}" | 18 | export LD = "${CC}" |
16 | LD_virtclass-native = "${CC}" | 19 | LD_virtclass-native = "${CC}" |
17 | 20 | ||