Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (40f7b4f6c21777048b4e90b5fe4d60924ac0b229)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jeremy Blosser <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (40f7b4f6c21777048b4e90b5fe4d60924ac0b229)
  • Date: Tue, 27 Oct 2009 04:07:30 -0500

GIT changes to master grimoire by Jeremy Blosser <jblosser-smgl AT firinn.org>:

net/trickle/HISTORY | 2 -
net/trickle/PRE_BUILD | 4 ++
net/trickle/trickle-1.06-configure.in.patch | 38
++++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 1 deletion(-)

New commits:
commit 40f7b4f6c21777048b4e90b5fe4d60924ac0b229
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

net/trickle: patch to fix building with gcc 4.x

commit 08a2df04dcf79abce02c0573657fab1c3bd1e7c0
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

Revert "net/trickle: patch to fix building with gcc 4.x"

This reverts commit 93b1c79592add49abd8a1280c871e56e2d410350.

diff --git a/net/trickle/HISTORY b/net/trickle/HISTORY
index 65feb7b..4119ae5 100644
--- a/net/trickle/HISTORY
+++ b/net/trickle/HISTORY
@@ -1,5 +1,5 @@
2009-10-27 Jeremy Blosser <jblosser-smgl AT firinn.org>
- * PRE_BUILD, trickle-1.06-configure.in.patch: Added, fix gcc 4.x build
+ * PRE_BUILD, trickle-1.06-configure.in.patch: Added, fix gcc 4.x
build

2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/net/trickle/PRE_BUILD b/net/trickle/PRE_BUILD
new file mode 100755
index 0000000..3d8a1e3
--- /dev/null
+++ b/net/trickle/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/trickle-1.06-configure.in.patch &&
+autoconf
diff --git a/net/trickle/trickle-1.06-configure.in.patch
b/net/trickle/trickle-1.06-configure.in.patch
new file mode 100644
index 0000000..549f3cb
--- /dev/null
+++ b/net/trickle/trickle-1.06-configure.in.patch
@@ -0,0 +1,38 @@
+Common subdirectories: trickle-1.06/compat and trickle-1.06-patched/compat
+diff -u trickle-1.06/configure.in trickle-1.06-patched/configure.in
+--- trickle-1.06/configure.in 2003-06-02 07:45:45.000000000 -0400
++++ trickle-1.06-patched/configure.in 2006-04-11 22:52:00.000000000 -0400
+@@ -67,7 +67,20 @@
+ AC_CHECK_TYPE(u_int32_t, unsigned int)
+ AC_CHECK_TYPE(u_int16_t, unsigned short)
+ AC_CHECK_TYPE(u_int8_t, unsigned char)
+-AC_CHECK_TYPE(in_addr_t, unsigned long)
++dnl in_addr_t might be defined in <sys/types.h> or, on newer
++dnl glibc versions, in <netinet/in.h>
++AC_CHECK_TYPE([in_addr_t ],,
++ [AC_DEFINE([in_addr_t], [unsigned long],
++ [Define to ‘unsigned long’ if
++ <sys/types.h> and <netinet/in.h>
++ do not define.])],
++ [#include <stdio.h>
++ #if HAVE_SYS_TYPES_H
++ # include <sys/types.h>
++ #endif
++ #if HAVE_NETINET_IN_H
++ # include <netinet/in.h>
++ #endif])
+
+ dnl Checks for library functions.
+ AC_PROG_GCC_TRADITIONAL
+@@ -214,11 +227,4 @@
+ AC_DEFINE_UNQUOTED(SYSCONFDIR, "$csysconfdir")
+ AC_DEFINE_UNQUOTED(LIBDIR, "$clibdir")
+
+-
+-# This is necessary so that .o files in LIBOBJS are also built via
+-# the ANSI2KNR-filtering rules.
+-LIBOBJS=`echo "$LIBOBJS" | sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
+-LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/\.lo/g'`
+-AC_SUBST(LTLIBOBJS)
+-
+ AC_OUTPUT(Makefile)



  • [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (40f7b4f6c21777048b4e90b5fe4d60924ac0b229), Jeremy Blosser, 10/27/2009

Archive powered by MHonArc 2.6.24.

Top of Page