From 671ddcd2a3bc41f02451b27fbe350d912d75baec Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 17 Nov 2006 11:52:58 +0000 Subject: [PATCH] - that version didn't build for me. Update version and make it compile.. --- package/strace/strace-undef-CTL_PROC.patch | 12 ++++++++++++ .../strace/strace-undef-PACKET_MEMBERSHIP.patch | 15 +++++++++++++++ package/strace/strace.mk | 7 ++++--- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 package/strace/strace-undef-CTL_PROC.patch create mode 100644 package/strace/strace-undef-PACKET_MEMBERSHIP.patch diff --git a/package/strace/strace-undef-CTL_PROC.patch b/package/strace/strace-undef-CTL_PROC.patch new file mode 100644 index 0000000000..c3eccb7d66 --- /dev/null +++ b/package/strace/strace-undef-CTL_PROC.patch @@ -0,0 +1,12 @@ +--- strace-4.5.12/system.c.oorig 2005-06-01 21:22:06.000000000 +0200 ++++ strace-4.5.12/system.c 2006-09-28 18:18:31.000000000 +0200 +@@ -1572,7 +1572,9 @@ + { CTL_KERN, "CTL_KERN" }, + { CTL_VM, "CTL_VM" }, + { CTL_NET, "CTL_NET" }, ++#ifdef CTL_PROC + { CTL_PROC, "CTL_PROC" }, ++#endif + { CTL_FS, "CTL_FS" }, + { CTL_DEBUG, "CTL_DEBUG" }, + { CTL_DEV, "CTL_DEV" }, diff --git a/package/strace/strace-undef-PACKET_MEMBERSHIP.patch b/package/strace/strace-undef-PACKET_MEMBERSHIP.patch new file mode 100644 index 0000000000..cdc9e640b7 --- /dev/null +++ b/package/strace/strace-undef-PACKET_MEMBERSHIP.patch @@ -0,0 +1,15 @@ +--- strace-4.5.14/net.c.oorig 2005-07-05 01:33:38.000000000 +0200 ++++ strace-4.5.14/net.c 2006-10-09 16:35:02.000000000 +0200 +@@ -800,8 +800,12 @@ + + #ifdef SOL_PACKET + static const struct xlat sockpacketoptions[] = { ++#if defined(PACKET_ADD_MEMBERSHIP) + { PACKET_ADD_MEMBERSHIP, "PACKET_ADD_MEMBERSHIP" }, ++#endif ++#if defined(PACKET_DROP_MEMBERSHIP) + { PACKET_DROP_MEMBERSHIP, "PACKET_DROP_MEMBERSHIP"}, ++#endif + #if defined(PACKET_RECV_OUTPUT) + { PACKET_RECV_OUTPUT, "PACKET_RECV_OUTPUT" }, + #endif diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 996f4edd36..1c5f4383fb 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -3,7 +3,7 @@ # strace # ############################################################# -STRACE_VER:=4.5.12 +STRACE_VER:=4.5.14 STRACE_SOURCE:=strace-$(STRACE_VER).tar.bz2 STRACE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/strace STRACE_CAT:=bzcat @@ -24,9 +24,10 @@ $(STRACE_DIR)/.configured: $(STRACE_DIR)/.unpacked (cd $(STRACE_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ + aaa_ac_cv_header_linux_if_packet_h=yes \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ + --target=$(REAL_GNU_TARGET_NAME) \ + --host=$(REAL_GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --exec-prefix=/usr \ -- 2.30.2