diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-03-27 23:07:36 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-03-27 23:07:36 (GMT) |
| commit | 983b08c1018fdfb9614734bb19d869edd04eeb3a (patch) | |
| tree | 6eca2efb059ccc0da75cf693570667401cf085ee | |
| parent | dbed610cc72e3f45eeef27a6df792bbec7016786 (diff) | |
| download | mxe-983b08c1018fdfb9614734bb19d869edd04eeb3a.zip mxe-983b08c1018fdfb9614734bb19d869edd04eeb3a.tar.gz mxe-983b08c1018fdfb9614734bb19d869edd04eeb3a.tar.bz2 | |
don't remove the "-mno-cygwin" flag, but provide clean bugfixes instead for package winpcap
| -rw-r--r-- | src/winpcap-1-fixes.patch | 27 | ||||
| -rw-r--r-- | src/winpcap.mk | 1 |
2 files changed, 27 insertions, 1 deletions
diff --git a/src/winpcap-1-fixes.patch b/src/winpcap-1-fixes.patch new file mode 100644 index 0000000..e261044 --- /dev/null +++ b/src/winpcap-1-fixes.patch @@ -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 + diff --git a/src/winpcap.mk b/src/winpcap.mk index 5391aec..2416a46 100644 --- a/src/winpcap.mk +++ b/src/winpcap.mk @@ -36,7 +36,6 @@ define $(PKG)_BUILD $(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' |