Mercurial > hg > aboriginal
changeset 1073:9f62cd761498
Teach static-tools.sh to look in its own patch directory.
author | Rob Landley <rob@landley.net> |
---|---|
date | Fri, 14 May 2010 01:34:59 -0500 |
parents | 94b0b4ef1157 |
children | dd5be60a2794 |
files | sources/native-builds/static-tools-patches/strace-arm-eabi.patch sources/native-builds/static-tools-patches/strace-fixnet.patch sources/native-builds/static-tools.sh sources/patches/strace-arm-eabi.patch sources/patches/strace-fixnet.patch |
diffstat | 5 files changed, 42 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sources/native-builds/static-tools-patches/strace-arm-eabi.patch Fri May 14 01:34:59 2010 -0500 @@ -0,0 +1,11 @@ +--- a/linux/arm/syscallent.h ++++ b/linux/arm/syscallent.h +@@ -453,7 +453,7 @@ + { 5, TN, sys_recvmsg, "recvmsg" }, /* 417 */ + { 4, TN, sys_accept4, "accept4" }, /* 418 */ + +-#if SYS_ipc_subcall != 419 ++#if defined(SYS_ipc_subcall) && (SYS_ipc_subcall != 419) + #error fix me + #endif + { 4, 0, printargs, "ipc_subcall" }, /* 419 */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sources/native-builds/static-tools-patches/strace-fixnet.patch Fri May 14 01:34:59 2010 -0500 @@ -0,0 +1,24 @@ +diff -ru strace/configure strace.new/configure +--- strace/configure 2009-10-21 12:41:11.000000000 -0500 ++++ strace.new/configure 2010-02-05 01:30:15.000000000 -0600 +@@ -5880,7 +5880,7 @@ + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h> +-#include <linux/socket.h> ++#include <sys/socket.h> + " + eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : +diff -ru strace/configure.ac strace.new/configure.ac +--- strace/configure.ac 2009-10-12 14:54:43.000000000 -0500 ++++ strace.new/configure.ac 2010-02-05 01:30:35.000000000 -0600 +@@ -258,7 +258,7 @@ + ], [], []) + AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], + [], [], [#include <stddef.h> +-#include <linux/socket.h>]) ++#include <sys/socket.h>]) + AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>]) + AC_CHECK_TYPES([struct sigcontext_struct, + struct sigcontext],,, [#include <signal.h>])
--- a/sources/native-builds/static-tools.sh Fri May 14 01:28:02 2010 -0500 +++ b/sources/native-builds/static-tools.sh Fri May 14 01:34:59 2010 -0500 @@ -10,6 +10,8 @@ [ $# -ne 1 ] && echo "usage: $0 FILENAME" >&2 && exit 1 [ -e "$1" ] && echo "$1" exists && exit 0 +PATCHDIR="$SOURCES/native-builds/static-tools-patches" +ls $PATCHDIR SRCDIR="$SRCDIR/native" && mkdir -p "$SRCDIR" || dienow WORK="$WORK"/sub && blank_tempdir "$WORK" @@ -41,7 +43,7 @@ upload_result() { - ftpput 10.0.2.2 -P $OUTPORT "$1-$ARCH" "$1" + ftpput $FTP_SERVER -P $FTP_PORT "$1-$HOST" "$1" } echo Started second stage init @@ -54,7 +56,7 @@ make -j $CPUS && cd .. || exit 1 -echo === $ARCH Native build static dropbear +echo === $HOST Native build static dropbear cp -sfR /mnt/dropbear dropbear && cd dropbear && @@ -65,7 +67,7 @@ cd .. && rm -rf dropbear || exit 1 -echo === $ARCH Native build static strace +echo === $HOST native build static strace cp -sfR /mnt/strace strace && cd strace && @@ -76,6 +78,8 @@ cd .. && rm -rf strace || dienow +echo === $HOST native build rsync + sync EOF
--- a/sources/patches/strace-arm-eabi.patch Fri May 14 01:28:02 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- a/linux/arm/syscallent.h -+++ b/linux/arm/syscallent.h -@@ -453,7 +453,7 @@ - { 5, TN, sys_recvmsg, "recvmsg" }, /* 417 */ - { 4, TN, sys_accept4, "accept4" }, /* 418 */ - --#if SYS_ipc_subcall != 419 -+#if defined(SYS_ipc_subcall) && (SYS_ipc_subcall != 419) - #error fix me - #endif - { 4, 0, printargs, "ipc_subcall" }, /* 419 */
--- a/sources/patches/strace-fixnet.patch Fri May 14 01:28:02 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -diff -ru strace/configure strace.new/configure ---- strace/configure 2009-10-21 12:41:11.000000000 -0500 -+++ strace.new/configure 2010-02-05 01:30:15.000000000 -0600 -@@ -5880,7 +5880,7 @@ - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h> --#include <linux/socket.h> -+#include <sys/socket.h> - " - eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : -diff -ru strace/configure.ac strace.new/configure.ac ---- strace/configure.ac 2009-10-12 14:54:43.000000000 -0500 -+++ strace.new/configure.ac 2010-02-05 01:30:35.000000000 -0600 -@@ -258,7 +258,7 @@ - ], [], []) - AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], - [], [], [#include <stddef.h> --#include <linux/socket.h>]) -+#include <sys/socket.h>]) - AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>]) - AC_CHECK_TYPES([struct sigcontext_struct, - struct sigcontext],,, [#include <signal.h>])