[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-43-gab65ef3
Lifeng Sun
lifongsun at gmail.com
Wed Jun 27 16:11:50 UTC 2012
The following commit has been merged in the master branch:
commit ab65ef366d581fb10a2c9ad7339f9f65196fa30e
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Sat Jun 23 12:55:53 2012 +0000
Try to fix hurd-i386 port.
root-system-rootd is still broken on hurd-i386.
diff --git a/debian/patches/76-hurd-i386.patch b/debian/patches/76-hurd-i386.patch
new file mode 100644
index 0000000..1f55e38
--- /dev/null
+++ b/debian/patches/76-hurd-i386.patch
@@ -0,0 +1,128 @@
+--- a/configure
++++ b/configure
+@@ -1218,6 +1218,7 @@
+ hp-ux:ia64:*) arch=hpuxia64acc ;;
+ hp-ux:*:*) arch=hpuxacc ;;
+ hurd*:*:*) arch=hurddeb ;;
++ gnu:i*86*:*) arch=hurddeb ;;
+ linux:ia64:*) arch=linuxia64gcc ;;
+ linux:x86_64:*) arch=linuxx8664gcc ;;
+ linux:alpha:*) arch=linuxalphagcc ;;
+@@ -1811,7 +1812,7 @@
+ fi
+ fi
+
+-if test "x$platform" = "xlinux" -o "x$platform" = "xkfreebsd" ; then
++if test "x$platform" = "xlinux" -o "x$platform" = "xkfreebsd" -o "x$platform" = "xhurd"; then
+ linuxdist=
+ if `$cwhich lsb_release > /dev/null 2>&1` ; then
+ if lsb_release -d | grep -i 'ubuntu' > /dev/null 2>& 1; then
+@@ -3907,7 +3908,7 @@
+ #
+ bonjourcppflags=
+ case $platform in
+- linux|kfreebsd|macosx|ios)
++ linux|kfreebsd|hurd|macosx|ios)
+ ;;
+ *)
+ if test "x$enable_bonjour" = "xyes" ; then
+@@ -5932,7 +5933,7 @@
+ message "Checking whether to build libMemStat"
+ if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
+ case $arch in
+- linux*|macos*|kfreebsd*)
++ linux*|macos*|kfreebsd*|hurd*)
+ enable_memstat="yes" ;;
+ *)
+ enable_memstat="no" ;;
+--- a/cint/cint/inc/G__ci.h
++++ b/cint/cint/inc/G__ci.h
+@@ -366,7 +366,7 @@
+ #endif
+
+ /* added by Fons Radamakers in 2000 Oct 2 */
+-#if (defined(__linux) || defined(__linux__) || defined(linux) || defined(__FreeBSD_kernel__)) && ! defined(__CINT__)
++#if (defined(__linux) || defined(__linux__) || defined(linux) || defined(__FreeBSD_kernel__) || defined(__GNU__)) && ! defined(__CINT__)
+ # include <features.h>
+ # if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2
+ # define G__NONSCALARFPOS2
+--- a/core/base/inc/RConfig.h
++++ b/core/base/inc/RConfig.h
+@@ -322,6 +322,7 @@
+ # define R__UNIX
+ # define R__BYTESWAP
+ # define R__GLIBC /* GNU/Hurd always use GLIBC 2.x :-) */
++# define PATH_MAX 4096
+ # define NEED_SIGJMP
+ #endif
+
+--- a/graf3d/gl/src/TGLFaceSet.cxx
++++ b/graf3d/gl/src/TGLFaceSet.cxx
+@@ -34,7 +34,7 @@
+ {
+ #if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
+ typedef GLvoid (*tessfuncptr_t)(...);
+-#elif defined(__mips) || defined(__linux__) || defined(__FreeBSD__) || defined( __OpenBSD__ ) || defined(__sun) || defined (__CYGWIN__) || defined (__APPLE__) || defined(__FreeBSD_kernel__)
++#elif defined(__mips) || defined(__linux__) || defined(__FreeBSD__) || defined( __OpenBSD__ ) || defined(__sun) || defined (__CYGWIN__) || defined (__APPLE__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+ typedef GLvoid (*tessfuncptr_t)();
+ #elif defined (WIN32)
+ typedef GLvoid (CALLBACK *tessfuncptr_t)();
+--- a/graf3d/gl/src/TGLPadUtils.cxx
++++ b/graf3d/gl/src/TGLPadUtils.cxx
+@@ -542,7 +542,7 @@
+ extern "C" {
+ #if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
+ typedef GLvoid (*tess_t)(...);
+-#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) || defined (__APPLE__) || defined(__FreeBSD_kernel__)
++#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) || defined (__APPLE__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+ typedef GLvoid (*tess_t)();
+ #elif defined ( WIN32)
+ typedef GLvoid (CALLBACK *tess_t)( );
+--- a/graf3d/gl/src/TGLUtil.cxx
++++ b/graf3d/gl/src/TGLUtil.cxx
+@@ -1396,7 +1396,7 @@
+ {
+ #if defined(__APPLE_CC__) && __APPLE_CC__ > 4000 && __APPLE_CC__ < 5450 && !defined(__INTEL_COMPILER)
+ typedef GLvoid (*tessfuncptr_t)(...);
+-#elif defined(__mips) || defined(__linux__) || defined(__FreeBSD__) || defined( __OpenBSD__ ) || defined(__sun) || defined (__CYGWIN__) || defined (__APPLE__) || defined(__FreeBSD_kernel__)
++#elif defined(__mips) || defined(__linux__) || defined(__FreeBSD__) || defined( __OpenBSD__ ) || defined(__sun) || defined (__CYGWIN__) || defined (__APPLE__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+ typedef GLvoid (*tessfuncptr_t)();
+ #elif defined (WIN32)
+ typedef GLvoid (CALLBACK *tessfuncptr_t)();
+--- a/cint/reflex/src/genmap/genmap.cxx
++++ b/cint/reflex/src/genmap/genmap.cxx
+@@ -14,6 +14,10 @@
+ #include <iostream>
+ #include <exception>
+
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ using namespace std;
+ using namespace ROOT::Reflex;
+
+--- a/net/rpdutils/src/rpdutils.cxx
++++ b/net/rpdutils/src/rpdutils.cxx
+@@ -209,7 +209,7 @@
+ #endif
+
+ #if !defined(__hpux) && !defined(linux) && !defined(__FreeBSD__) && \
+- !defined(__OpenBSD__) && !defined(__FreeBSD_kernel__) || defined(cygwingcc)
++ !defined(__OpenBSD__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) || defined(cygwingcc)
+ static int setresgid(gid_t r, gid_t e, gid_t)
+ {
+ if (setgid(r) == -1)
+--- a/proof/proofd/src/proofd.cxx
++++ b/proof/proofd/src/proofd.cxx
+@@ -225,6 +225,10 @@
+ #include "rsalib.h"
+ }
+
++#ifndef NOFILE
++# define NOFILE 256
++#endif
++
+ // General globals
+ int gDebug = 0;
+
diff --git a/debian/patches/series b/debian/patches/series
index dccc588..cb0e8be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -48,3 +48,4 @@
73-ruby-1.9.1.patch
74-kfreebsd.patch
75-hardening-flag.patch
+76-hurd-i386.patch
diff --git a/debian/rules b/debian/rules
index eb8f7bb..42231f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,9 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
+ifeq (hurd-i386,$(DEB_BUILD_ARCH))
+MAKEFLAGS += -j1
+endif
UNUR = --enable-unuran
#ifneq (,$(findstring alpha, $(DEB_BUILD_ARCH)))
#UNUR = --disable-unuran
@@ -366,6 +369,10 @@ config.status: configure
tar -xvzf math/unuran/src/unuran*
#if change, correct unurar version
mv unuran-1.8.0-root ./math/unuran/src/.
+ cp /usr/share/misc/config.guess \
+ math/unuran/src/unuran-1.8.0-root/autoconf
+ cp /usr/share/misc/config.sub \
+ math/unuran/src/unuran-1.8.0-root/autoconf
sed -i -e 's/auxilliary/auxiliary/' \
math/unuran/src/unuran-1.8.0-root/src/urng/urng_default.c \
math/unuran/src/unuran-1.8.0-root/src/parser/make_stringparser.pl
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list