From 44fd98578f85d229c4c3a5b03d438dff339ae809 Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Thu, 20 Oct 2011 18:20:47 +0200
Subject: [PATCH] [wip/urbi] Moved from robotpkg because of overwhelming
configure issues
If someone wants to have a look...
---
urbi/DESCR | 11 ++
urbi/Makefile | 48 ++++++
urbi/PLIST | 370 ++++++++++++++++++++++++++++++++++++++++++
urbi/distinfo | 9 +
urbi/patches/patch-aa | 20 +++
urbi/patches/patch-ab | 20 +++
urbi/patches/patch-ac | 20 +++
urbi/patches/patch-ad | 22 +++
urbi/patches/patch-ae | 11 ++
urbi/patches/patch-af | 15 ++
10 files changed, 546 insertions(+)
create mode 100644 urbi/DESCR
create mode 100644 urbi/Makefile
create mode 100644 urbi/PLIST
create mode 100644 urbi/distinfo
create mode 100644 urbi/patches/patch-aa
create mode 100644 urbi/patches/patch-ab
create mode 100644 urbi/patches/patch-ac
create mode 100644 urbi/patches/patch-ad
create mode 100644 urbi/patches/patch-ae
create mode 100644 urbi/patches/patch-af
diff --git a/urbi/DESCR b/urbi/DESCR
new file mode 100644
index 00000000..b3e151f7
--- /dev/null
+++ b/urbi/DESCR
@@ -0,0 +1,11 @@
+Urbi includes a C++ component library called UObject that comes with a
+robot standard API to describe motors, sensors and algorithms. Next to
+UObject, you can use the urbiscript orchestration script language to
+glue the components together and describe high level behaviors, a bit
+like python or LUA, but with embedded parallel and event-driven
+semantics to make the job easier. The goal of Urbi is to help making
+robots compatible, and simplify the process of writing programs and
+behaviors for those robots. The range of potential applications of
+Urbi goes beyond robotics, since it has been successfully used in
+generic complex systems, where parallel and event-driven orchestration
+on multiple agents is the rule
\ No newline at end of file
diff --git a/urbi/Makefile b/urbi/Makefile
new file mode 100644
index 00000000..d367bb1f
--- /dev/null
+++ b/urbi/Makefile
@@ -0,0 +1,48 @@
+# robotpkg Makefile for: supervision/urbi
+# Created: Thomas Moulard on Sun, 30 May 2010
+#
+
+DISTNAME= urbi-sdk-${VERSION}
+PKGNAME= urbi-${VERSION}
+VERSION= 2.0.2
+
+CATEGORIES= supervision
+MASTER_SITES= http://www.gostai.com/static/downloads/
+
+MAINTAINER= openrobots@laas.fr
+HOMEPAGE= http://www.gostai.com/
+COMMENT= Urbi middleware for robotics
+LICENSE= gnu-agpl-v3
+
+USE_LANGUAGES+= c c++
+
+GNU_CONFIGURE= yes
+
+# Enable release mode.
+CONFIGURE_ARGS+= --enable-compilation-mode=speed
+# Generate documentation.
+CONFIGURE_ARGS+= --enable-doc-sections=all
+
+# Fix perl path
+SUBST_CLASSES+= perlp
+SUBST_STAGE.perlp= pre-configure
+SUBST_MESSAGE.perlp= Replacing perl path
+SUBST_SED.perlp= '1s@/usr/bin/perl@${PERL}@'
+SUBST_FILES.perlp= build-aux/bin/git-version-gen
+
+include ../../devel/boost-headers/depend.mk
+include ../../devel/boost-libs/depend.mk
+include ../../mk/sysdep/flex.mk
+include ../../mk/sysdep/libjpeg.mk
+include ../../mk/sysdep/perl.mk
+include ../../mk/robotpkg.mk
+
+# Remove local libjpeg header.
+# For historical reason Urbi installs libjpeg headers.
+# This is wrong. Let's remove them to avoid conflicts.
+post-install:
+ ${RM} -f \
+ "${PREFIX}/include/jconfig.h" \
+ "${PREFIX}/include/jerror.h" \
+ "${PREFIX}/include/jmorecfg.h" \
+ "${PREFIX}/include/jpeglib.h"
diff --git a/urbi/PLIST b/urbi/PLIST
new file mode 100644
index 00000000..6b776405
--- /dev/null
+++ b/urbi/PLIST
@@ -0,0 +1,370 @@
+@comment Sun May 30 18:44:32 CEST 2010
+bin/uinstall
+bin/umake
+bin/umake-deepclean
+bin/umake-engine
+bin/umake-fullengine
+bin/umake-lib
+bin/umake-link
+bin/umake-remote
+bin/umake-shared
+bin/urbi
+bin/urbi-balltrackinghead
+bin/urbi-bandwidth
+bin/urbi-cycle
+bin/urbi-image
+bin/urbi-launch
+bin/urbi-mirror
+bin/urbi-ping
+bin/urbi-play
+bin/urbi-record
+bin/urbi-reverse
+bin/urbi-scale
+bin/urbi-send
+bin/urbi-sendbin
+bin/urbi-sendsound
+bin/urbi-sound
+bin/urbi-talkie
+include/libport/algorithm
+include/libport/algorithm.hxx
+include/libport/arpa/inet.h
+include/libport/asio.hh
+include/libport/asio.hxx
+include/libport/assert.hh
+include/libport/attributes.hh
+include/libport/backtrace.hh
+include/libport/backtrace.hxx
+include/libport/base64.hh
+include/libport/bind.hh
+include/libport/boost-error.hh
+include/libport/boost-error.hxx
+include/libport/buffer-stream.hh
+include/libport/cassert
+include/libport/cerrno
+include/libport/cli.hh
+include/libport/cli.hxx
+include/libport/cmath
+include/libport/compilation.hh
+include/libport/compiler.hh
+include/libport/compiler.hxx
+include/libport/condition.hh
+include/libport/condition.hxx
+include/libport/config.h
+include/libport/containers.hh
+include/libport/containers.hxx
+include/libport/contract.hh
+include/libport/csignal
+include/libport/cstdio
+include/libport/cstdlib
+include/libport/cstdlib.hxx
+include/libport/cstring
+include/libport/cstring.hxx
+include/libport/ctime
+include/libport/damerau-levenshtein-distance.hh
+include/libport/debug.hh
+include/libport/deref.hh
+include/libport/deref.hxx
+include/libport/destructible.hh
+include/libport/destructible.hxx
+include/libport/detect-win32.h
+include/libport/dirent.h
+include/libport/dlfcn.h
+include/libport/errors.hh
+include/libport/escape.hh
+include/libport/escape.hxx
+include/libport/exception.hh
+include/libport/exception.hxx
+include/libport/export.hh
+include/libport/fcntl.h
+include/libport/fd-stream.hh
+include/libport/fifo.hh
+include/libport/fifo.hxx
+include/libport/file-library.hh
+include/libport/file-library.hxx
+include/libport/file-system.hh
+include/libport/finally.hh
+include/libport/finally.hxx
+include/libport/foreach.hh
+include/libport/format.hh
+include/libport/fwd.hh
+include/libport/hash.hh
+include/libport/hierarchy.hh
+include/libport/hmac-sha1.hh
+include/libport/indent.hh
+include/libport/input-arguments.hh
+include/libport/input-arguments.hxx
+include/libport/instance-tracker.hh
+include/libport/instance-tracker.hxx
+include/libport/instrument.hh
+include/libport/intrusive-ptr.hh
+include/libport/intrusive-ptr.hxx
+include/libport/iostream
+include/libport/io-stream.hh
+include/libport/ip-semaphore.hh
+include/libport/lexical-cast.hh
+include/libport/local-data.hh
+include/libport/local-data.hxx
+include/libport/lockable.hh
+include/libport/lockable.hxx
+include/libport/map.hh
+include/libport/map.hxx
+include/libport/markup-ostream.hh
+include/libport/meta.hh
+include/libport/netdb.h
+include/libport/network.h
+include/libport/option-parser.hh
+include/libport/option-parser.hxx
+include/libport/package-info.hh
+include/libport/pair.hh
+include/libport/pair.hxx
+include/libport/path.hh
+include/libport/path.hxx
+include/libport/pid-file.hh
+include/libport/pod-cast.hh
+include/libport/pod-cast.hxx
+include/libport/preproc.hh
+include/libport/program-name.hh
+include/libport/pthread.h
+include/libport/pthread.hxx
+include/libport/range.hh
+include/libport/range.hxx
+include/libport/read-stdin.hh
+include/libport/ref-counted.hh
+include/libport/ref-counted.hxx
+include/libport/ref-pt.hh
+include/libport/reserved-vector.hh
+include/libport/reserved-vector.hxx
+include/libport/safe-container.hh
+include/libport/safe-container.hxx
+include/libport/sched.hh
+include/libport/select-const.hh
+include/libport/select-ref.hh
+include/libport/semaphore.h
+include/libport/semaphore.hh
+include/libport/semaphore.hxx
+include/libport/separate.hh
+include/libport/separate.hxx
+include/libport/separator.hh
+include/libport/singleton-ptr.hh
+include/libport/singleton-ptr.hxx
+include/libport/specific-ptr.hh
+include/libport/specific-ptr.hxx
+include/libport/statistics.hh
+include/libport/statistics.hxx
+include/libport/symbol.hh
+include/libport/symbol.hxx
+include/libport/synchronizer.hh
+include/libport/synchronizer.hxx
+include/libport/sysexits.hh
+include/libport/sys/param.h
+include/libport/sys/prctl.h
+include/libport/sys/select.h
+include/libport/sys/socket.h
+include/libport/sys/stat.h
+include/libport/sys/stat.hxx
+include/libport/system-warning-pop.hh
+include/libport/system-warning-push.hh
+include/libport/sys/time.h
+include/libport/sys/time.hxx
+include/libport/sys/types.h
+include/libport/sys/wait.h
+include/libport/thread-data.hh
+include/libport/thread.hh
+include/libport/thread.hxx
+include/libport/thread-pool.hh
+include/libport/throw-exception.hh
+include/libport/time.hh
+include/libport/time.hxx
+include/libport/timer.hh
+include/libport/timer.hxx
+include/libport/tokenizer.hh
+include/libport/traits.hh
+include/libport/type-info.hh
+include/libport/type-info.hxx
+include/libport/typelist.hh
+include/libport/uffloat.hh
+include/libport/ufloat.h
+include/libport/ufloat.hh
+include/libport/ufloat.hxx
+include/libport/ull-fixed-point.hh
+include/libport/ulong-fixed-point.hh
+include/libport/unique-pointer.hh
+include/libport/unique-pointer.hxx
+include/libport/unistd.h
+include/libport/unit-test.hh
+include/libport/utime.hh
+include/libport/utime.hxx
+include/libport/valgrind.hh
+include/libport/version.hh
+include/libport/warning-pop.hh
+include/libport/warning-push.hh
+include/libport/weak-ptr.hh
+include/libport/weak-ptr.hxx
+include/libport/windows.hh
+include/libport/xltdl.hh
+include/libport/xltdl.hxx
+include/serialize/binary-i-serializer.hh
+include/serialize/binary-i-serializer.hxx
+include/serialize/binary-o-serializer.hh
+include/serialize/binary-o-serializer.hxx
+include/serialize/exception.hh
+include/serialize/export.hh
+include/serialize/fwd.hh
+include/serialize/i-serializer.hh
+include/serialize/i-serializer.hxx
+include/serialize/o-serializer.hh
+include/serialize/o-serializer.hxx
+include/serialize/serialize.hh
+include/urbi/exit.hh
+include/urbi/export.hh
+include/urbi/fwd.hh
+include/urbi/kernel-version.hh
+include/urbi/package-info.hh
+include/urbi/qt_umain.hh
+include/urbi/uabstractclient.hh
+include/urbi/uabstractclient.hxx
+include/urbi/ubinary.hh
+include/urbi/ublend-type.hh
+include/urbi/ucallbacks.hh
+include/urbi/uclient.hh
+include/urbi/ucontext-factory.hh
+include/urbi/ucontext.hh
+include/urbi/ucontext.hxx
+include/urbi/ucontext-impl.hh
+include/urbi/ucontext-impl.hxx
+include/urbi/uconversion.hh
+include/urbi/uevent.hh
+include/urbi/uevent.hxx
+include/urbi/uexternal.hh
+include/urbi/uimage.hh
+include/urbi/umain.hh
+include/urbi/umessage.hh
+include/urbi/umessage.hxx
+include/urbi/uobject.hh
+include/urbi/uobject-hub.hh
+include/urbi/uobject.hxx
+include/urbi/uproperty.hh
+include/urbi/uprop.hh
+include/urbi/urbi-root.hh
+include/urbi/usound.hh
+include/urbi/ustarter.hh
+include/urbi/ustarter.hxx
+include/urbi/usyncclient.hh
+include/urbi/usystem.hh
+include/urbi/utable.hh
+include/urbi/utag.hh
+include/urbi/utimer-callback.hh
+include/urbi/uvalue.hh
+include/urbi/uvalue.hxx
+include/urbi/uvar.hh
+include/urbi/uvar.hxx
+libexec/gostai/libtool
+lib/gostai/engine/libuobject.la
+lib/gostai/engine/param.mk
+lib/gostai/remote/libuobject.la
+lib/gostai/remote/param.mk
+lib/gostai/remote/version.hh
+lib/gostai/uobjects/all.so
+lib/gostai/uobjects/factory.so
+lib/gostai/uobjects/generic.so
+lib/gostai/uobjects/lib-urbi.so
+lib/gostai/uobjects/remote.so
+lib/gostai/uobjects/sensor2.so
+lib/gostai/uobjects/sensor.so
+lib/gostai/uobjects/subsumption.so
+lib/gostai/uobjects/threaded.so
+lib/gostai/uobjects/timer.so
+lib/gostai/uobjects/uaccess2.so
+lib/gostai/uobjects/uaccess3.so
+lib/gostai/uobjects/uaccess.so
+lib/gostai/uobjects/uchange.so
+lib/gostai/uobjects/ultest.so
+lib/libjpeg4urbi.la
+lib/libport.la
+lib/libsched.la
+lib/libserialize.la
+lib/liburbi.la
+share/doc/urbi-sdk/AUTHORS.txt
+share/doc/urbi-sdk/LICENSE.txt
+share/doc/urbi-sdk/README.txt
+share/doc/urbi-sdk/THANKS.txt
+share/doc/urbi-sdk/urbi-naming.pdf
+share/doc/urbi-sdk/urbi-sdk.pdf
+share/gostai/images/gostai-logo/gostai-logo-00.jpg
+share/gostai/images/gostai-logo/gostai-logo-01.jpg
+share/gostai/images/gostai-logo/gostai-logo-02.jpg
+share/gostai/images/gostai-logo/gostai-logo-03.jpg
+share/gostai/images/gostai-logo/gostai-logo-04.jpg
+share/gostai/images/gostai-logo/gostai-logo-05.jpg
+share/gostai/images/gostai-logo/gostai-logo-06.jpg
+share/gostai/images/gostai-logo/gostai-logo-07.jpg
+share/gostai/images/gostai-logo/gostai-logo-08.jpg
+share/gostai/images/gostai-logo/gostai-logo-09.jpg
+share/gostai/images/gostai-logo/gostai-logo-10.jpg
+share/gostai/images/gostai-logo/gostai-logo-11.jpg
+share/gostai/images/gostai-logo/gostai-logo-12.jpg
+share/gostai/images/gostai-logo/gostai-logo-13.jpg
+share/gostai/images/gostai-logo/gostai-logo-14.jpg
+share/gostai/images/gostai-logo/gostai-logo-15.jpg
+share/gostai/images/gostai-logo/gostai-logo-16.jpg
+share/gostai/images/gostai-logo/gostai-logo-17.jpg
+share/gostai/images/gostai-logo/gostai-logo-18.jpg
+share/gostai/images/gostai-logo/gostai-logo-19.jpg
+share/gostai/umain/umain.cc
+share/gostai/umain/urbi-root.cc
+share/gostai/urbi/binary.u
+share/gostai/urbi/boolean.u
+share/gostai/urbi/call-message.u
+share/gostai/urbi/channel.u
+share/gostai/urbi/code.u
+share/gostai/urbi/comparable.u
+share/gostai/urbi/component.u
+share/gostai/urbi/control.u
+share/gostai/urbi/dataflow.u
+share/gostai/urbi/date.u
+share/gostai/urbi/dictionary.u
+share/gostai/urbi/duration.u
+share/gostai/urbi/event.u
+share/gostai/urbi/exception.u
+share/gostai/urbi/file.u
+share/gostai/urbi/float.u
+share/gostai/urbi/formatter.u
+share/gostai/urbi/global.u
+share/gostai/urbi/group.u
+share/gostai/urbi/job.u
+share/gostai/urbi/kernel1.u
+share/gostai/urbi/lazy.u
+share/gostai/urbi/list.u
+share/gostai/urbi/loadable.u
+share/gostai/urbi/lobby.u
+share/gostai/urbi/math.u
+share/gostai/urbi/mutex.u
+share/gostai/urbi/naming-standard.u
+share/gostai/urbi/nil.u
+share/gostai/urbi/object.u
+share/gostai/urbi/orderable.u
+share/gostai/urbi/package-info-libport.u
+share/gostai/urbi/package-info.u
+share/gostai/urbi/package-info-urbi-sdk-remote.u
+share/gostai/urbi/package-info-urbi-sdk.u
+share/gostai/urbi/path.u
+share/gostai/urbi/pattern.u
+share/gostai/urbi/platform.u
+share/gostai/urbi/profiling.u
+share/gostai/urbi/pubsub.u
+share/gostai/urbi/range-iterable.u
+share/gostai/urbi/semaphore.u
+share/gostai/urbi/singleton.u
+share/gostai/urbi/socket.u
+share/gostai/urbi/stack-frame.u
+share/gostai/urbi/string.u
+share/gostai/urbi/system.u
+share/gostai/urbi/tag.u
+share/gostai/urbi/test-suite.u
+share/gostai/urbi/timeout.u
+share/gostai/urbi/trajectory-generator.u
+share/gostai/urbi/tuple.u
+share/gostai/urbi/uobject.u
+share/gostai/urbi/updatehook-stack.u
+share/gostai/urbi/urbi.u
+share/gostai/urbi/weak-pointer.u
diff --git a/urbi/distinfo b/urbi/distinfo
new file mode 100644
index 00000000..8c039d49
--- /dev/null
+++ b/urbi/distinfo
@@ -0,0 +1,9 @@
+SHA1 (urbi-sdk-2.0.2.tar.gz) = e6698661e2475706b5dcae29231b1ca20f27ec26
+RMD160 (urbi-sdk-2.0.2.tar.gz) = ef6cdaa045de7d924fdcbb18204fd74fbce9ad06
+Size (urbi-sdk-2.0.2.tar.gz) = 12921094 bytes
+SHA1 (patch-aa) = 1e085cc1a867ac4ec237c1d4bdd7992092cb6547
+SHA1 (patch-ab) = 58ecac1f06462f07275b618270a37c6ca923e467
+SHA1 (patch-ac) = c2ae001669109414f29153947b9cb70f8020a778
+SHA1 (patch-ad) = 9bd13e29371091e0b2c8ca96825ca02ff64ee2c5
+SHA1 (patch-ae) = 85770e2d0630b659100ddcd1f3dfafe3fbf22e23
+SHA1 (patch-af) = 0ceacd5bee64da23aa641e488b0ac471d69d29b4
diff --git a/urbi/patches/patch-aa b/urbi/patches/patch-aa
new file mode 100644
index 00000000..4a547ea2
--- /dev/null
+++ b/urbi/patches/patch-aa
@@ -0,0 +1,20 @@
+--- configure~ 2010-05-05 16:36:02.000000000 +0200
++++ configure 2011-10-20 16:37:26.750705372 +0200
+@@ -418,7 +418,7 @@
+ while true
+ do
+ eval res="$dir"
+- if test x"$dir" == x"$res"; then
++ if test x"$dir" = x"$res"; then
+ break
+ fi
+ dir=$res
+@@ -2287,7 +2287,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_distcheck_configure_flags=
+-eval distcheck_configure_flags $ac_configure_args
++#eval distcheck_configure_flags $ac_configure_args
+
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_distcheck_configure_flags" >&5
diff --git a/urbi/patches/patch-ab b/urbi/patches/patch-ab
new file mode 100644
index 00000000..3cf28ac0
--- /dev/null
+++ b/urbi/patches/patch-ab
@@ -0,0 +1,20 @@
+--- sdk-remote/configure~ 2010-05-05 12:01:47.000000000 +0200
++++ sdk-remote/configure 2011-10-20 16:34:43.610705499 +0200
+@@ -418,7 +418,7 @@
+ while true
+ do
+ eval res="$dir"
+- if test x"$dir" == x"$res"; then
++ if test x"$dir" = x"$res"; then
+ break
+ fi
+ dir=$res
+@@ -2233,7 +2233,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_distcheck_configure_flags=
+-eval distcheck_configure_flags $ac_configure_args
++#eval distcheck_configure_flags $ac_configure_args
+
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_distcheck_configure_flags" >&5
diff --git a/urbi/patches/patch-ac b/urbi/patches/patch-ac
new file mode 100644
index 00000000..f22ed088
--- /dev/null
+++ b/urbi/patches/patch-ac
@@ -0,0 +1,20 @@
+--- sdk-remote/libport/configure~ 2010-04-23 16:40:48.000000000 +0200
++++ sdk-remote/libport/configure 2011-10-20 16:35:19.618704989 +0200
+@@ -418,7 +418,7 @@
+ while true
+ do
+ eval res="$dir"
+- if test x"$dir" == x"$res"; then
++ if test x"$dir" = x"$res"; then
+ break
+ fi
+ dir=$res
+@@ -2238,7 +2238,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_distcheck_configure_flags=
+-eval distcheck_configure_flags $ac_configure_args
++#eval distcheck_configure_flags $ac_configure_args
+
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_distcheck_configure_flags" >&5
diff --git a/urbi/patches/patch-ad b/urbi/patches/patch-ad
new file mode 100644
index 00000000..09454ab0
--- /dev/null
+++ b/urbi/patches/patch-ad
@@ -0,0 +1,22 @@
+--- sdk-remote/jpeg/configure~ 2010-04-23 16:41:01.000000000 +0200
++++ sdk-remote/jpeg/configure 2011-10-20 16:51:32.202706277 +0200
+@@ -14215,13 +14215,13 @@
+ { $as_echo "$as_me:$LINENO: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
+ $as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
+ if test -f $ac_prefix_conf_INP ; then
+- echo "s/#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
+- echo "s/#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
+- echo "s/#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
+- echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
++ $as_echo "s/#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
++ $as_echo "s/#undef *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
++ $as_echo "s/#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
++ $as_echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
+ echo "#endif/" >>conftest.prefix
+- echo "s/#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
+- echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
++ $as_echo "s/#define *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
++ $as_echo "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
+ echo "#endif/" >> conftest.prefix
+ # now executing _script on _DEF input to create _OUT output file
+ echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
diff --git a/urbi/patches/patch-ae b/urbi/patches/patch-ae
new file mode 100644
index 00000000..da80ceb5
--- /dev/null
+++ b/urbi/patches/patch-ae
@@ -0,0 +1,11 @@
+--- sdk-remote/libport/configure~ 2011-10-20 17:02:15.366705853 +0200
++++ sdk-remote/libport/configure 2011-10-20 17:02:20.722706041 +0200
+@@ -20717,7 +20717,7 @@
+ boost_cv_lib_filesystem_LIBS="-l$boost_lib";;
+ esac
+ boost_save_LIBS=$LIBS
+- LIBS="$boost_cv_lib_filesystem_LIBS $LIBS"
++ LIBS="$boost_cv_lib_filesystem_LIBS -lboost_system $LIBS"
+ test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath"
+ rm -f conftest$ac_exeext
+ boost_save_ac_ext=$ac_ext
diff --git a/urbi/patches/patch-af b/urbi/patches/patch-af
new file mode 100644
index 00000000..9e510e72
--- /dev/null
+++ b/urbi/patches/patch-af
@@ -0,0 +1,15 @@
+--- sdk-remote/src/tests/bin/wrapper.in~ 2010-03-19 10:50:11.000000000 +0100
++++ sdk-remote/src/tests/bin/wrapper.in 2011-10-20 17:17:52.138706184 +0200
+@@ -27,10 +27,10 @@
+ abs_top_srcdir='@abs_top_srcdir@'
+
+ # Find urbi headers.
+-EXTRA_CPPFLAGS+=" -I$abs_top_srcdir/include -I$abs_top_builddir/include"
++EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS} -I$abs_top_srcdir/include -I$abs_top_builddir/include"
+
+ # Find libport headers.
+-EXTRA_CPPFLAGS+=" -I$abs_top_srcdir/libport/include -I$abs_top_builddir/libport/include"
++EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS} -I$abs_top_srcdir/libport/include -I$abs_top_builddir/libport/include"
+
+ test -d "$abs_top_builddir" ||
+ fatal "cannot find top build directory: $abs_top_builddir"
--
GitLab