[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-9-g73b9402
Lifeng Sun
lifongsun at gmail.com
Tue Jun 12 15:26:31 UTC 2012
The following commit has been merged in the master branch:
commit 73b94022360abf1732c47870ce4f464f51c18979
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Tue Jun 12 21:07:43 2012 +0800
Support kFreeBSD.
Although I only tested it on kFreeBSD-amd64, it's expected to work on
kFreeBSD-i386 as well.
diff --git a/debian/changelog b/debian/changelog
index f00834f..2e6bea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ root-system (5.34.00~rc1-2) UNRELEASED; urgency=low
* Fix incomplete ftgl-dev => libftgl-dev transition. (Closes: #498677)
* root-system-rootd: ship /var/spool/rootd/* as empty directories.
(Closes: #677053)
+ * Support kFreeBSD.
- -- Lifeng Sun <lifongsun at gmail.com> Mon, 11 Jun 2012 21:18:08 +0800
+ -- Lifeng Sun <lifongsun at gmail.com> Tue, 12 Jun 2012 23:22:43 +0800
root-system (5.34.00~rc1-1) unstable; urgency=low
diff --git a/debian/patches/74-kfreebsd.patch b/debian/patches/74-kfreebsd.patch
new file mode 100644
index 0000000..d645e29
--- /dev/null
+++ b/debian/patches/74-kfreebsd.patch
@@ -0,0 +1,424 @@
+--- /dev/null
++++ b/config/Makefile.kfreebsd
+@@ -0,0 +1,80 @@
++# -*- mode: makefile -*-
++#
++# Makefile of ROOT for kFreeBSD i386 with glibc and gcc.
++
++PLATFORM = kfreebsd
++
++DEBUGFLAGS = -g
++OPTFLAGS = -O2
++
++ifeq (debug,$(findstring debug,$(ROOTBUILD)))
++OPT = $(DEBUGFLAGS)
++NOOPT =
++else
++OPT = $(OPTFLAGS)
++NOOPT =
++endif
++
++ifeq (c++11,$(findstring c++11,$(ROOTBUILD)))
++CXX11 = -std=c++11
++endif
++
++# Compiler:
++CXX = g++
++CC = gcc
++CXXFLAGS = -pipe -m32 -Wall -W -Woverloaded-virtual \
++ -fPIC $(EXTRA_CXXFLAGS) $(CXX11)
++CFLAGS = -pipe -m32 -Wall -W -fPIC $(EXTRA_CFLAGS)
++CINTCXXFLAGS = -pipe -m32 -Wall -W -Woverloaded-virtual \
++ -fPIC $(EXTRA_CXXFLAGS) $(CXX11) \
++ -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
++ -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO \
++ -DG__STD_EXCEPTION
++CINTCFLAGS = -pipe -m32 -Wall -W -fPIC $(EXTRA_CFLAGS) \
++ -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
++ -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO \
++ -DG__STD_EXCEPTION
++COMPILER = gnu
++
++# Linker:
++LD = g++
++LDFLAGS = -m32 $(OPT) $(EXTRA_LDFLAGS) -Wl,--no-undefined -Wl,--as-needed
++SOFLAGS = -shared -Wl,-soname,
++SOEXT = so
++
++# System libraries:
++SYSLIBS = -lm -ldl $(OSTHREADLIBDIR) $(OSTHREADLIB) \
++ $(ALLOCLIBDIR) $(ALLOCLIB) -rdynamic
++XLIBS = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lXext -lX11
++CILIBS = -lm -ldl -rdynamic
++CRYPTLIBS = -lcrypt
++
++# Fortran:
++ifneq ($(findstring gfortran, $(F77)),)
++ifeq ($(F77),)
++# only needed to get default compiler in ./configure
++F77 = gfortran
++endif
++F77FLAGS = -m32 -fPIC -std=legacy
++ifneq ($(shell $(F77) -m32 -print-file-name=libgfortran.$(SOEXT)),libgfortran.$(SOEXT))
++F77LIBS := $(shell $(F77) -m32 -print-file-name=libgfortran.$(SOEXT))
++else
++F77LIBS := $(shell $(F77) -m32 -print-file-name=libgfortran.a)
++endif
++F77LIBS += $(shell $(F77) -m32 -print-file-name=libgfortranbegin.a)
++endif
++
++ifneq ($(findstring g77, $(F77)),)
++ifeq ($(F77),)
++# only needed to get default compiler in ./configure
++F77 = g77
++endif
++F77FLAGS = -m32 -fPIC
++ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so)
++F77LIBS := $(shell $(F77) -m32 -print-file-name=libg2c.so) -lnsl
++else
++F77LIBS := $(shell $(F77) -m32 -print-file-name=libg2c.a) -lnsl
++endif
++endif
++
++# Extras
+--- /dev/null
++++ b/config/Makefile.kfreebsdx8664gcc
+@@ -0,0 +1,80 @@
++# -*- mode: makefile -*-
++#
++# Makefile of ROOT for kFreeBSD x86-64 with glibc and gcc.
++
++PLATFORM = kfreebsd
++
++DEBUGFLAGS = -g
++OPTFLAGS = -O2
++
++ifeq (debug,$(findstring debug,$(ROOTBUILD)))
++OPT = $(DEBUGFLAGS)
++NOOPT =
++else
++OPT = $(OPTFLAGS)
++NOOPT =
++endif
++
++ifeq (c++11,$(findstring c++11,$(ROOTBUILD)))
++CXX11 = -std=c++11
++endif
++
++# Compiler:
++CXX = g++
++CC = gcc
++CXXFLAGS = -pipe -m64 -Wshadow -Wall -W -Woverloaded-virtual \
++ -fPIC $(EXTRA_CXXFLAGS) $(CXX11)
++CFLAGS = -pipe -m64 -Wshadow -Wall -W -fPIC $(EXTRA_CFLAGS)
++CINTCXXFLAGS = -pipe -m64 -Wall -W -Woverloaded-virtual \
++ -fPIC $(EXTRA_CXXFLAGS) $(CXX11) \
++ -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
++ -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO \
++ -DG__STD_EXCEPTION -DG__64BIT
++CINTCFLAGS = -pipe -m64 -Wall -W -fPIC $(EXTRA_CFLAGS) \
++ -DG__REGEXP -DG__UNIX -DG__SHAREDLIB \
++ -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO \
++ -DG__STD_EXCEPTION -DG__64BIT
++COMPILER = gnu
++
++# Linker:
++LD = g++
++LDFLAGS = -m64 $(OPT) $(EXTRA_LDFLAGS) -Wl,--no-undefined -Wl,--as-needed
++SOFLAGS = -shared -Wl,-soname,
++SOEXT = so
++
++# System libraries:
++SYSLIBS = -lm -ldl $(OSTHREADLIBDIR) $(OSTHREADLIB) \
++ $(ALLOCLIBDIR) $(ALLOCLIB) -rdynamic
++XLIBS = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lXext -lX11
++CILIBS = -lm -ldl -rdynamic
++CRYPTLIBS = -lcrypt
++
++# Fortran:
++ifneq ($(findstring gfortran, $(F77)),)
++ifeq ($(F77),)
++# only needed to get default compiler in ./configure
++F77 = gfortran
++endif
++F77FLAGS = -fPIC -m64 -std=legacy
++ifneq ($(shell $(F77) -m64 -print-file-name=libgfortran.$(SOEXT)),libgfortran.$(SOEXT))
++F77LIBS := $(shell $(F77) -m64 -print-file-name=libgfortran.$(SOEXT))
++else
++F77LIBS := $(shell $(F77) -m64 -print-file-name=libgfortran.a)
++endif
++F77LIBS += $(shell $(F77) -m64 -print-file-name=libgfortranbegin.a)
++endif
++
++ifneq ($(findstring g77, $(F77)),)
++ifeq ($(F77),)
++# only needed to get default compiler in ./configure
++F77 = g77
++endif
++F77FLAGS = -fPIC -m64
++ifneq ($(shell $(F77) -print-file-name=libg2c.so),libg2c.so)
++F77LIBS := $(shell $(F77) -m64 -print-file-name=libg2c.so) -lnsl
++else
++F77LIBS := $(shell $(F77) -m64 -print-file-name=libg2c.a) -lnsl
++endif
++endif
++
++# Extras
+--- 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(__CINT__)
++#if (defined(__linux) || defined(__linux__) || defined(linux)) || defined(__FreeBSD_kernel__) && ! defined(__CINT__)
+ # include <features.h>
+ # if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2
+ # define G__NONSCALARFPOS2
+--- a/cint/cint/src/bc_reader.h
++++ b/cint/cint/src/bc_reader.h
+@@ -57,7 +57,7 @@
+ int rewindpos() ;
+ unsigned long getpos() { return((unsigned long)0 /* m_pos */ ); } //not used
+ void setspos(unsigned long pos) {
+-#if defined(__linux)
++#if defined(__linux) || defined(__FreeBSD_kernel__)
+ #if (__GNUC__==2 && __GNUC_MINOR__<96)
+ #if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
+ m_pos.__pos = pos; // this is for Debian
+--- a/config/ARCHS
++++ b/config/ARCHS
+@@ -5,6 +5,8 @@
+ freebsd4 for FreeBSD 4.x with gcc
+ freebsd5 for FreeBSD 5.x and 6.x with gcc
+ freebsd7 for FreeBSD 7.x with gcc
++kfreebsd for i386 kFreeBSD with gcc
++kfreebsdx8664gcc for x86-64 kFreeBSD with gcc
+ hpuxacc for HP-UX 10.20 with HP aCC
+ hpuxgcc for HP-UX 10.20 with gcc
+ hpuxia64acc for HP-UX 11i v1.5 (IA-64) with HP aCC
+--- a/config/root-config.in
++++ b/config/root-config.in
+@@ -343,6 +343,18 @@
+ auxcflags=
+ auxlibs="-lm -lstdc++"
+ ;;
++kfreebsd)
++ # kFreeBSD with gcc
++ auxcflags="-m32"
++ auxldflags="-m32"
++ auxlibs="-lm -ldl -rdynamic"
++ ;;
++kfreebsdx8664gcc)
++ # AMD Opteron and Intel EM64T (64 bit mode) kFreeBSD with gcc
++ auxcflags="-m64"
++ auxldflags="-m64"
++ auxlibs="-lm -ldl -rdynamic"
++ ;;
+ openbsd)
+ # OpenBSD with libc
+ auxcflags=
+--- a/configure
++++ b/configure
+@@ -1169,6 +1169,8 @@
+ freebsd*:*:5*) arch=freebsd5 ;;
+ freebsd*:*:4*) arch=freebsd4 ;;
+ freebsd*:*:*) arch=freebsd ;;
++ gnu/kfreebsd:i*86:*) arch=kfreebsd ;;
++ gnu/kfreebsd:x86_64:*) arch=kfreebsdx8664gcc;;
+ hp-ux:ia64:*) arch=hpuxia64acc ;;
+ hp-ux:*:*) arch=hpuxacc ;;
+ hurd*:*:*) arch=hurddeb ;;
+@@ -1764,7 +1766,7 @@
+ fi
+ fi
+
+-if test "x$platform" = "xlinux" ; then
++if test "x$platform" = "xlinux" -o "x$platform" = "xkfreebsd" ; then
+ linuxdist=
+ if `$cwhich lsb_release > /dev/null 2>&1` ; then
+ if lsb_release -d | grep -i 'ubuntu' > /dev/null 2>& 1; then
+@@ -3838,7 +3840,7 @@
+ #
+ bonjourcppflags=
+ case $platform in
+- linux|macosx|ios)
++ linux|kfreebsd|macosx|ios)
+ ;;
+ *)
+ if test "x$enable_bonjour" = "xyes" ; then
+@@ -5863,7 +5865,7 @@
+ message "Checking whether to build libMemStat"
+ if test "x$enable_memstat" = "xyes" || test ! "x$MEMSTAT" = "x"; then
+ case $arch in
+- linux*|macos*)
++ linux*|macos*|kfreebsd*)
+ enable_memstat="yes" ;;
+ *)
+ enable_memstat="no" ;;
+--- a/core/base/inc/RConfig.h
++++ b/core/base/inc/RConfig.h
+@@ -350,6 +350,20 @@
+ # define HAS_STRLCPY
+ #endif
+
++#if defined(__FreeBSD_kernel__)
++# define R__UNIX
++# define R__BYTESWAP
++# if defined(__i386__)
++# ifndef __i486__
++# define __i486__ /* turn off if you really want to run on an i386 */
++# endif
++# endif
++# if defined(__amd64__)
++# define R__B64
++# endif
++# define R__THROWNEWDELETE /* new/delete throw exceptions */
++#endif
++
+ #if defined(__OpenBSD__)
+ # define R__OBSD
+ # define R__UNIX
+--- a/core/unix/src/TUnixSystem.cxx
++++ b/core/unix/src/TUnixSystem.cxx
+@@ -60,7 +60,7 @@
+ #if defined(R__AIX) || defined(R__LINUX) || defined(R__ALPHA) || \
+ defined(R__SGI) || defined(R__HIUX) || defined(R__FBSD) || \
+ defined(R__OBSD) || defined(R__LYNXOS) || defined(R__MACOSX) || \
+- defined(R__HURD)
++ defined(R__HURD) || defined(__FreeBSD_kernel__)
+ # include <sys/ioctl.h>
+ #endif
+ #if defined(R__AIX) || defined(R__SOLARIS)
+@@ -195,7 +195,8 @@
+ (defined(R__SUNGCC3) && defined(__arch64__)) || \
+ defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
+ (defined(R__AIX) && defined(_AIX43)) || \
+- (defined(R__SOLARIS) && defined(_SOCKLEN_T))
++ (defined(R__SOLARIS) && defined(_SOCKLEN_T)) || \
++ defined(__FreeBSD_kernel__)
+ # define USE_SOCKLEN_T
+ #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__)
++#elif defined(__mips) || defined(__linux__) || defined(__FreeBSD__) || defined( __OpenBSD__ ) || defined(__sun) || defined (__CYGWIN__) || defined (__APPLE__) || defined(__FreeBSD_kernel__)
+ 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__)
++#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__) || defined (__APPLE__) || defined(__FreeBSD_kernel__)
+ 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__)
++#elif defined(__mips) || defined(__linux__) || defined(__FreeBSD__) || defined( __OpenBSD__ ) || defined(__sun) || defined (__CYGWIN__) || defined (__APPLE__) || defined(__FreeBSD_kernel__)
+ typedef GLvoid (*tessfuncptr_t)();
+ #elif defined (WIN32)
+ typedef GLvoid (CALLBACK *tessfuncptr_t)();
+--- a/montecarlo/eg/inc/cfortran.h
++++ b/montecarlo/eg/inc/cfortran.h
+@@ -168,7 +168,7 @@
+ #if defined(__CYGWIN__) /* 04/11/02 LEB (CFITSIO) */
+ #define f2cFortran
+ #endif
+-#if defined(__GNUC__) && defined(linux) /* 06/21/00 PDW (CFITSIO) */
++#if defined(__GNUC__) && (defined(linux) || defined(__FreeBSD_kernel__)) /* 06/21/00 PDW (CFITSIO) */
+ #define f2cFortran
+ #endif
+ #if defined(macintosh) /* 11/1999 (CFITSIO) */
+--- a/net/rpdutils/src/daemon.cxx
++++ b/net/rpdutils/src/daemon.cxx
+@@ -53,7 +53,7 @@
+
+ #if defined(linux) || defined(__hpux) || defined(__sun) || defined(__sgi) || \
+ defined(_AIX) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
+- defined(__APPLE__) || defined(__MACH__) || \
++ defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD_kernel__) || \
+ (defined(__CYGWIN__) && defined(__GNUC__))
+ #define USE_SETSID
+ #endif
+--- a/net/rpdutils/src/net.cxx
++++ b/net/rpdutils/src/net.cxx
+@@ -38,7 +38,8 @@
+ (defined(R__SUNGCC3) && defined(__arch64__)) || \
+ defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
+ (defined(R__AIX) && defined(_AIX43)) || \
+- (defined(R__SOLARIS) && defined(_SOCKLEN_T))
++ (defined(R__SOLARIS) && defined(_SOCKLEN_T)) || \
++ defined(__FreeBSD_kernel__)
+ # define USE_SOCKLEN_T
+ #endif
+
+--- a/net/rpdutils/src/netpar.cxx
++++ b/net/rpdutils/src/netpar.cxx
+@@ -51,7 +51,8 @@
+ (defined(R__SUNGCC3) && defined(__arch64__)) || \
+ defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
+ (defined(R__AIX) && defined(_AIX43)) || \
+- (defined(R__SOLARIS) && defined(_SOCKLEN_T))
++ (defined(R__SOLARIS) && defined(_SOCKLEN_T)) || \
++ defined(__FreeBSD_kernel__)
+ # define USE_SOCKLEN_T
+ #endif
+
+--- a/net/rpdutils/src/rpdutils.cxx
++++ b/net/rpdutils/src/rpdutils.cxx
+@@ -190,7 +190,7 @@
+ //--- Machine specific routines ------------------------------------------------
+
+ #if defined(__alpha) && !defined(linux) && !defined(__FreeBSD__) && \
+- !defined(__OpenBSD__)
++ !defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
+ extern "C" int initgroups(const char *name, int basegid);
+ #endif
+
+@@ -209,7 +209,7 @@
+ #endif
+
+ #if !defined(__hpux) && !defined(linux) && !defined(__FreeBSD__) && \
+- !defined(__OpenBSD__) || defined(cygwingcc)
++ !defined(__OpenBSD__) && !defined(__FreeBSD_kernel__) || defined(cygwingcc)
+ static int setresgid(gid_t r, gid_t e, gid_t)
+ {
+ if (setgid(r) == -1)
+--- a/net/rpdutils/src/ssh.cxx
++++ b/net/rpdutils/src/ssh.cxx
+@@ -40,7 +40,8 @@
+ (defined(R__SUNGCC3) && defined(__arch64__)) || \
+ defined(R__OBSD) || defined(MAC_OS_X_VERSION_10_4) || \
+ (defined(R__AIX) && defined(_AIX43)) || \
+- (defined(R__SOLARIS) && defined(_SOCKLEN_T))
++ (defined(R__SOLARIS) && defined(_SOCKLEN_T)) || \
++ defined(__FreeBSD_kernel__)
+ # define USE_SOCKLEN_T
+ #endif
+
+--- a/build/unix/makelib.sh
++++ b/build/unix/makelib.sh
+@@ -65,7 +65,7 @@
+ EXPLLNKCORE="-Llib -lCint"
+ fi
+ fi
+- if [ $PLATFORM = "linux" ]; then
++ if [ $PLATFORM = "linux" ] || [ $PLATFORM = "kfreebsd" ]; then
+ if [ -z "$EXPLLNKCORE" ]; then
+ EXPLLNKCORE=" -ldl"
+ else
diff --git a/debian/patches/series b/debian/patches/series
index 108cb44..3d58460 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,3 +47,4 @@
71-remove-root-plugin-proof-xproof.patch
72-rpath-ldflag.patch
73-ruby-1.9.1.patch
+74-kfreebsd.patch
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list