diff options
author | Juergen Beisert <j.beisert@pengutronix.de> | 2009-03-30 14:52:02 +0000 |
---|---|---|
committer | Juergen Beisert <j.beisert@pengutronix.de> | 2009-03-30 14:52:02 +0000 |
commit | 0f20aa710bdcf04e2579fd5ce5176db5640cbacb (patch) | |
tree | b62a06af566d9346ebbea0fdd86dc3ef9b670ea9 /patches/hping3-20051105 | |
parent | 9358c70fe9026a93f1b597383ad21b5f7de53864 (diff) | |
download | ptxdist-0f20aa710bdcf04e2579fd5ce5176db5640cbacb.tar.gz ptxdist-0f20aa710bdcf04e2579fd5ce5176db5640cbacb.tar.xz |
* hping: Do endianess detection based on the cross compiler and its header files
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10183 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/hping3-20051105')
-rw-r--r-- | patches/hping3-20051105/generic/host_vs_target.diff | 75 | ||||
-rw-r--r-- | patches/hping3-20051105/generic/series | 1 |
2 files changed, 76 insertions, 0 deletions
diff --git a/patches/hping3-20051105/generic/host_vs_target.diff b/patches/hping3-20051105/generic/host_vs_target.diff new file mode 100644 index 000000000..59092f5b9 --- /dev/null +++ b/patches/hping3-20051105/generic/host_vs_target.diff @@ -0,0 +1,75 @@ +Subject: Endianess detection should not happen at host side... +From: Juergen Beisert <jbe@pengutronix.de> + +Signed-off-by: Juergen Beisert <jbe@pengutronix.de> + +--- + bytesex.h | 3 ++- + configure | 20 ++------------------ + hping2.h | 2 +- + 3 files changed, 5 insertions(+), 20 deletions(-) + +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -15,30 +15,14 @@ fi + + CC=${CC:=cc} + +-echo build byteorder.c... +-$CC byteorder.c -o byteorder || exit 1 +- + INSTALL_MANPATH=`echo $MANPATH|cut -f1 -d:` + if [ "$INSTALL_MANPATH" = "" ]; then + INSTALL_MANPATH="/usr/local/man" + fi +-BYTEORDER=`./byteorder -m` +- +-echo create byteorder.h... +-cat > byteorder.h <<EOF +-#ifndef __BYTEORDER_H +-#define __BYTEORDER_H + +-EOF +-echo \#ifndef $BYTEORDER >> byteorder.h +-echo \#define $BYTEORDER >> byteorder.h +-echo \#endif /\* $BYTEORDER \*/ >> byteorder.h +-cat >> byteorder.h <<EOF +- +-#endif /* __BYTEORDER_H */ +-EOF ++# CONFIGOSTYPE=`uname -s | tr [a-z] [A-Z]` ++CONFIGOSTYPE=LINUX + +-CONFIGOSTYPE=`uname -s | tr [a-z] [A-Z]` + if [ ! "$CONFIGOSTYPE" ]; then + CONFIGOSTYPE=UNKNOWN + fi +Index: hping2.h +=================================================================== +--- hping2.h.orig ++++ hping2.h +@@ -17,7 +17,7 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <limits.h> +-#include "byteorder.h" ++#include <asm/byteorder.h> + #include "systype.h" + #include "fixtypes.h" + +Index: bytesex.h +=================================================================== +--- bytesex.h.orig ++++ bytesex.h +@@ -9,7 +9,8 @@ + + #if defined(__i386__) \ + || defined(__alpha__) \ +- || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) ++ || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) \ ++ || defined(__ARMEL__) + #define BYTE_ORDER_LITTLE_ENDIAN + #elif defined(__mc68000__) \ + || defined (__sparc__) \ diff --git a/patches/hping3-20051105/generic/series b/patches/hping3-20051105/generic/series index 1a6453311..d639ae763 100644 --- a/patches/hping3-20051105/generic/series +++ b/patches/hping3-20051105/generic/series @@ -1,2 +1,3 @@ clean_makefile.diff -p0 remove_pcap_header.diff -p0 +host_vs_target.diff -p0 |