diff options
author | Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2018-01-02 11:22:12 +0100 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2018-01-03 18:27:23 -0500 |
commit | d0fd3f425b6dd4d7fe71943967996ab6ab223021 (patch) | |
tree | c28e9669c18d65baa423805d7ae25c2a58952c8d /app-arch/zip | |
parent | dev-python/flake8: keyworded 3.5.0 for sparc, bug #643236 (diff) | |
download | gentoo-d0fd3f425b6dd4d7fe71943967996ab6ab223021.tar.gz gentoo-d0fd3f425b6dd4d7fe71943967996ab6ab223021.tar.bz2 gentoo-d0fd3f425b6dd4d7fe71943967996ab6ab223021.zip |
app-arch/zip: remove unused patches
Diffstat (limited to 'app-arch/zip')
-rw-r--r-- | app-arch/zip/files/zip-2.3-unix_configure-pic.patch | 12 | ||||
-rw-r--r-- | app-arch/zip/files/zip-2.31-exec-stack.patch | 20 | ||||
-rw-r--r-- | app-arch/zip/files/zip-2.32-build.patch | 89 |
3 files changed, 0 insertions, 121 deletions
diff --git a/app-arch/zip/files/zip-2.3-unix_configure-pic.patch b/app-arch/zip/files/zip-2.3-unix_configure-pic.patch deleted file mode 100644 index 45b137b0ed85..000000000000 --- a/app-arch/zip/files/zip-2.3-unix_configure-pic.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- unix/configure.orig 2004-09-28 06:45:33.000000000 +0000 -+++ unix/configure 2004-09-28 06:54:53.000000000 +0000 -@@ -29,6 +29,9 @@ - - echo Check if we can use asm code - OBJA="" -+piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)" -+echo "Checking if compiler wants to create pic code" -+[ "$piclib" == "" ] && \ - if eval "$CPP match.S > _match.s 2>/dev/null"; then - if test ! -s _match.s || grep error < _match.s > /dev/null; then - : diff --git a/app-arch/zip/files/zip-2.31-exec-stack.patch b/app-arch/zip/files/zip-2.31-exec-stack.patch deleted file mode 100644 index d3efbd902cb1..000000000000 --- a/app-arch/zip/files/zip-2.31-exec-stack.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- zip-2.31/crc_i386.S -+++ zip-2.31/crc_i386.S -@@ -238,3 +238,7 @@ - #endif /* i386 || _i386 || _I386 || __i386 */ - - #endif /* !USE_ZLIB */ -+ -+#ifdef __ELF__ -+.section .note.GNU-stack,"",@progbits -+#endif ---- zip-2.31/match.S -+++ zip-2.31/match.S -@@ -405,3 +405,7 @@ - #endif /* i386 || _I386 || _i386 || __i386 */ - - #endif /* !USE_ZLIB */ -+ -+#ifdef __ELF__ -+.section .note.GNU-stack,"",@progbits -+#endif diff --git a/app-arch/zip/files/zip-2.32-build.patch b/app-arch/zip/files/zip-2.32-build.patch deleted file mode 100644 index 61a2bae34b3f..000000000000 --- a/app-arch/zip/files/zip-2.32-build.patch +++ /dev/null @@ -1,89 +0,0 @@ -respect build environment settings - ---- zip/unix/Makefile -+++ zip/unix/Makefile -@@ -12,15 +12,15 @@ - - list: all - --MAKE = make -f unix/Makefile -+MAKE := $(MAKE) -f unix/Makefile - SHELL = /bin/sh - LN = ln -s - - # (to use the Gnu compiler, change cc to gcc in CC) --CC = cc -+CC ?= gcc - BIND = $(CC) - AS = $(CC) -c --CPP = /lib/cpp -+CPP ?= $(CC) - EXE = - - # probably can change this to 'install' if you have it -@@ -47,7 +47,7 @@ - # LFLAGS1 flags after output file spec, before obj file list - # LFLAGS2 flags after obj file list (libraries, etc) - CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP) --CFLAGS = -O2 $(CFLAGS_NOOPT) -+CFLAGS ?= -O2 $(CFLAGS_NOOPT) - LFLAGS1 = - LFLAGS2 = -s - ---- zip/unix/configure -+++ zip/unix/configure -@@ -13,52 +13,13 @@ - - CC=${1-cc} --CFLAGS=${2-"-I. -DUNIX"} --LFLAGS1="" -+CFLAGS="${2--I. -DUNIX} ${CFLAGS} ${CPPFLAGS}" -+LFLAGS1="${LDFLAGS}" - LN="ln -s" --echo "Check C compiler type (optimization option)" --cat > conftest.c << _EOF_ --int main() --{ --#ifndef __SUNPRO_C -- bad code --#endif -- return 0; --} --_EOF_ --$CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null --if test $? -eq 0; then -- echo ' Sun C (-xO3)' -- CFLAGS="${CFLAGS} -xO3" --else -- cat > conftest.c << _EOF_ --int main() --{ --#ifndef __DECC -- bad code --#endif -- return 0; --} --_EOF_ -- $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null -- if test $? -eq 0; then -- echo ' DEC C (-O3)' -- CFLAGS="${CFLAGS} -O3" -- else -- echo ' Other (gcc?) (-O2)' -- CFLAGS="${CFLAGS} -O2" -- fi --fi - - echo Check for the C preprocessor - # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp. - CPP="${CC} -E" - # solaris as(1) needs -P, maybe others as well ? --[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" --[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp --[ -f /lib/cpp ] && CPP=/lib/cpp --[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp --[ -f /xenix ] && CPP="${CC} -E" --[ -f /lynx.os ] && CPP="${CC} -E" - - echo "#include <stdio.h>" > conftest.c - $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E" |