Archives
Archives
| From: | "Michael Weber (xmw)" <xmw@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-ftp/linksys-tftp/files: linksys-tftp-1.2.1-r1-header.patch linksys-tftp-1.2.1-r1-Makefile.patch |
| Date: | Mon, 04 Oct 2010 15:57:26 |
| Message-Id: | 20101004155722.489AD20054@flycatcher.gentoo.org |
| 1 | xmw 10/10/04 15:57:22 |
| 2 | |
| 3 | Added: linksys-tftp-1.2.1-r1-header.patch |
| 4 | linksys-tftp-1.2.1-r1-Makefile.patch |
| 5 | Log: |
| 6 | Revbump to fix CFLAGS (bug 240894) and LDFLAGS (bug 336956) |
| 7 | (Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-header.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-header.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-header.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: linksys-tftp-1.2.1-r1-header.patch |
| 16 | =================================================================== |
| 17 | --- linksys-tftp-1.2.1/main.c |
| 18 | +++ linksys-tftp-1.2.1/main.c |
| 19 | @@ -40,6 +40,8 @@ |
| 20 | #include <setjmp.h> |
| 21 | #include <ctype.h> |
| 22 | #include <netdb.h> |
| 23 | +#include <stdlib.h> |
| 24 | +#include <strings.h> |
| 25 | |
| 26 | #define TIMEOUT 5 /* secs between rexmt's */ |
| 27 | |
| 28 | @@ -110,7 +112,7 @@ |
| 29 | char *index(); |
| 30 | char *rindex(); |
| 31 | |
| 32 | -main(argc, argv) |
| 33 | +int main(argc, argv) |
| 34 | char *argv[]; |
| 35 | { |
| 36 | struct sockaddr_in sin; |
| 37 | |
| 38 | |
| 39 | |
| 40 | 1.1 net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-Makefile.patch |
| 41 | |
| 42 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-Makefile.patch?rev=1.1&view=markup |
| 43 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-Makefile.patch?rev=1.1&content-type=text/plain |
| 44 | |
| 45 | Index: linksys-tftp-1.2.1-r1-Makefile.patch |
| 46 | =================================================================== |
| 47 | Fix LDFLAGS (bug http://bugs.gentoo.org/336956 ) and |
| 48 | CFLAGS (bug http://bugs.gentoo.org/240894 ) by |
| 49 | Michael Weber <xmw@g.o> |
| 50 | |
| 51 | --- linksys-tftp-1.2.1/Makefile |
| 52 | +++ linksys-tftp-1.2.1/Makefile |
| 53 | @@ -19,18 +19,18 @@ |
| 54 | # We override /usr/include/arpa/tftp.h with our own because |
| 55 | # we want tu_block to be unsigned short, not short as on most platforms |
| 56 | # |
| 57 | -CFLAGS= -I. -O2 -Dsin=sin_x |
| 58 | +CFLAGS += -I. -Dsin=sin_x |
| 59 | #DEBUG |
| 60 | # CFLAGS= -I. -Wall -ggdb -Dsin=sin_x |
| 61 | SRCS= main.c tftp.c tftpsubs.c |
| 62 | OBJS= main.o tftp.o tftpsubs.o |
| 63 | DOBJS= tftpsubs.o |
| 64 | -CC= gcc |
| 65 | +CC?= gcc |
| 66 | |
| 67 | all: linksys-tftp |
| 68 | |
| 69 | linksys-tftp: ${OBJS} |
| 70 | - ${CC} -o $@ ${CFLAGS} ${OBJS} |
| 71 | + ${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS} |
| 72 | |
| 73 | clean: |
| 74 | rm -f ${OBJS} ${DOBJS} *core linksys-tftp |