Mercurial > mxe-octave
changeset 1715:5c96fd471117
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Mon, 28 Mar 2011 01:07:36 +0200 |
| parents | 8aba3acd6389 |
| children | d9063b46f9dc |
| files | src/winpcap-1-fixes.patch src/winpcap.mk |
| diffstat | 2 files changed, 27 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/winpcap-1-fixes.patch Mon Mar 28 01:07:36 2011 +0200 @@ -0,0 +1,27 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From ae2d9b90df55a6c1ba801675a81723ceb8377e62 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Sun, 27 Mar 2011 23:49:46 +0200 +Subject: [PATCH] remove obsolete -mno-cygwin + + +diff --git a/wpcap/PRJ/GNUmakefile b/wpcap/PRJ/GNUmakefile +index ccf3677..8313b4c 100644 +--- a/wpcap/PRJ/GNUmakefile ++++ b/wpcap/PRJ/GNUmakefile +@@ -32,7 +32,7 @@ CFLAGS = -I ../libpcap -I ../libpcap/bpf -I ../libpcap/lbl \ + -DHAVE_REMOTE -DHAVE_AIRPCAP_API \ + -DHAVE_TC_API \ + -DHAVE_ADDRINFO \ +- -mno-cygwin -shared ${OPTFLAGS} ++ -shared ${OPTFLAGS} + LDFLAGS = -Wl,--out-implib,../lib/libwpcap.a + LIBS = -L ../../${PACKET_DIR}/DLL/Project -lPacket -lws2_32 + OBJS = ../libpcap/bpf/net/bpf_filter.o \ +-- +1.7.4.1 +
--- a/src/winpcap.mk Mon Mar 28 00:13:53 2011 +0200 +++ b/src/winpcap.mk Mon Mar 28 01:07:36 2011 +0200 @@ -36,7 +36,6 @@ $(SED) -i 's,(char\*)tUstr +=,tUstr +=,' '$(1)/wpcap/libpcap/inet.c' $(SED) -i 's,-DHAVE_AIRPCAP_API,,' '$(1)/wpcap/PRJ/GNUmakefile' $(SED) -i 's,/common,/Common,' '$(1)/wpcap/PRJ/GNUmakefile' - $(SED) -i 's,-mno-cygwin,,' '$(1)/wpcap/PRJ/GNUmakefile' echo -e 'libwpcap.a: $${OBJS}' >> '$(1)/wpcap/PRJ/GNUmakefile' echo -e '\t$${AR} rc $$@ $${OBJS}' >> '$(1)/wpcap/PRJ/GNUmakefile' echo -e '\t$${RANLIB} $$@' >> '$(1)/wpcap/PRJ/GNUmakefile'