fjoe@... wrote:
-------------------------------------------------------
Hi!
Attached patch fixes cint build on FreeBSD. I also included patch for
tools/INSTALLBIN.
/fjoe
------------------------------------------------------------------------
--- Makefile.orig Fri Nov 24 14:41:26 2006
+++ Makefile Tue Aug 21 14:57:42 2007
@@ -38,11 +38,11 @@
touch include/iosenum.h; \
else \
(echo Generating iosenum.h. This might take a while...; \
- cd include;$(G__CFG_RM) stdfunc$(G__CFG_SOEXT); cd ..\
+ cd include;$(G__CFG_RM) stdfunc$(G__CFG_SOEXT); cd ..;\
unset VS_UNICODE_OUTPUT; \
LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:. \
DYLD_LIBRARY_PATH=$$DYLD_LIBRARY_PATH:. \
- ./cint$(G__CFG_EXEEXT) $(G__CFG_INCP)inc iosenum.cxx); \
+ ./cint$(G__CFG_EXEEXT) $(G__CFG_INCP)inc include/iosenum.cxx); \
fi)
@echo > done
--- configure.orig 2006-11-24 08:30:23.000000000 +0000
+++ configure 2007-08-23 05:06:38.042002000 +0000
@@ -20,7 +20,7 @@
# configure settings to build CINT
-ARCHS=(linux linuxicc macgcc djgpp cygwin mingw mwerks hpux aix msvc7 msvc8 solaris solarisgcc)
+ARCHS=(linux linuxicc macgcc djgpp cygwin mingw mwerks hpux aix msvc7 msvc8 solaris solarisgcc freebsd)
#############################################################
###
@@ -102,6 +102,13 @@
config_GCC_defaults
}
+function config_freebsd {
+ config_GCC_defaults
+ CFLAGS="${CFLAGS} -fPIC"
+ CXXFLAGS="${CXXFLAGS} -fPIC"
+ DEFAULTLIBS="`echo $DEFAULTLIBS | sed 's/-ldl//'`"
+}
+
function config_linuxx8664gcc {
config_GCC_defaults
@@ -326,7 +333,7 @@
# freebsd*:*:6*) arch=freebsd5 ;;
# freebsd*:*:5*) arch=freebsd5 ;;
# freebsd*:*:4*) arch=freebsd4 ;;
-# freebsd*:*:*) arch=freebsd ;;
+ freebsd*:*:*) arch=freebsd ;;
# hp-ux:ia64:*) arch=hpuxia64acc ;;
# hp-ux:*:*) arch=hpuxacc ;;
# hurd*:*:*) arch=hurddeb ;;
@@ -357,6 +364,8 @@
esac
if [ "x`uname -a|grep -i linux`" != "x" ]; then
GUESSEDARCH=$arch
+ elif [ "x`uname -a|grep -i freebsd`" != "x" ]; then
+ GUESSEDARCH=$arch
elif cl.exe >/dev/null 2>&1; then
if [ "x`cl 2>&1|grep 'Version 14'`" != "x" ]; then
GUESSEDARCH=msvc8
--- tool/INSTALLBIN.orig Tue Aug 21 15:08:47 2007
+++ tool/INSTALLBIN Tue Aug 21 15:14:16 2007
@@ -96,17 +96,17 @@
#####################################################################
# Copy lib files
#####################################################################
-mkdir -p $LIBDIR/src
for i in include/*; do
if test -d $i; then mkdir -p $LIBDIR/$i; fi
done
mkdir -p $LIBDIR/lib/prec_stl
mkdir -p $LIBDIR/lib/longlong
mkdir -p $LIBDIR/stl
+mkdir -p $LIBDIR/inc
mkdir -p $LIBDIR/main
# Copy lib files
-FILELIST="MAKEINFO include/* include/*/* stl/* lib/prec_stl/* lib/longlong/longlong.h G__ci.h main/*"
+FILELIST="include/* include/*/* stl/* lib/prec_stl/* lib/longlong/longlong.h inc/* main/*"
# Add either shared or static library to $FILELIST
if test -f libcint.so; then
FILELIST="$FILELIST libcint.so"
@@ -115,7 +115,7 @@
fi
for i in $FILELIST; do
case $i in
- include/make*|include/Make*|*/setup*)
+ include/make*|include/Make*|*/setup*|*/CVS|*/CVS/*)
;;
*)
if ! test -d $i; then echo -n "$i "; cp $i $LIBDIR/$i; fi
Hi!
Attached patch fixes cint build on FreeBSD. I also included patch for
tools/INSTALLBIN.
/fjoe
--- Makefile.orig Fri Nov 24 14:41:26 2006
+++ Makefile Tue Aug 21 14:57:42 2007
@@ -38,11 +38,11 @@
touch include/iosenum.h; \
else \
(echo Generating iosenum.h. This might take a while...; \
- cd include;$(G__CFG_RM) stdfunc$(G__CFG_SOEXT); cd ..\
+ cd include;$(G__CFG_RM) stdfunc$(G__CFG_SOEXT); cd ..;\
unset VS_UNICODE_OUTPUT; \
LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:. \
DYLD_LIBRARY_PATH=$$DYLD_LIBRARY_PATH:. \
- ./cint$(G__CFG_EXEEXT) $(G__CFG_INCP)inc iosenum.cxx); \
+ ./cint$(G__CFG_EXEEXT) $(G__CFG_INCP)inc include/iosenum.cxx); \
fi)
@echo > done
--- configure.orig 2006-11-24 08:30:23.000000000 +0000
+++ configure 2007-08-23 05:06:38.042002000 +0000
@@ -20,7 +20,7 @@
# configure settings to build CINT
-ARCHS=(linux linuxicc macgcc djgpp cygwin mingw mwerks hpux aix msvc7 msvc8 solaris solarisgcc)
+ARCHS=(linux linuxicc macgcc djgpp cygwin mingw mwerks hpux aix msvc7 msvc8 solaris solarisgcc freebsd)
#############################################################
###
@@ -102,6 +102,13 @@
config_GCC_defaults
}
+function config_freebsd {
+ config_GCC_defaults
+ CFLAGS="${CFLAGS} -fPIC"
+ CXXFLAGS="${CXXFLAGS} -fPIC"
+ DEFAULTLIBS="`echo $DEFAULTLIBS | sed 's/-ldl//'`"
+}
+
function config_linuxx8664gcc {
config_GCC_defaults
@@ -326,7 +333,7 @@
# freebsd*:*:6*) arch=freebsd5 ;;
# freebsd*:*:5*) arch=freebsd5 ;;
# freebsd*:*:4*) arch=freebsd4 ;;
-# freebsd*:*:*) arch=freebsd ;;
+ freebsd*:*:*) arch=freebsd ;;
# hp-ux:ia64:*) arch=hpuxia64acc ;;
# hp-ux:*:*) arch=hpuxacc ;;
# hurd*:*:*) arch=hurddeb ;;
@@ -357,6 +364,8 @@
esac
if [ "x`uname -a|grep -i linux`" != "x" ]; then
GUESSEDARCH=$arch
+ elif [ "x`uname -a|grep -i freebsd`" != "x" ]; then
+ GUESSEDARCH=$arch
elif cl.exe >/dev/null 2>&1; then
if [ "x`cl 2>&1|grep 'Version 14'`" != "x" ]; then
GUESSEDARCH=msvc8
--- tool/INSTALLBIN.orig Tue Aug 21 15:08:47 2007
+++ tool/INSTALLBIN Tue Aug 21 15:14:16 2007
@@ -96,17 +96,17 @@
#####################################################################
# Copy lib files
#####################################################################
-mkdir -p $LIBDIR/src
for i in include/*; do
if test -d $i; then mkdir -p $LIBDIR/$i; fi
done
mkdir -p $LIBDIR/lib/prec_stl
mkdir -p $LIBDIR/lib/longlong
mkdir -p $LIBDIR/stl
+mkdir -p $LIBDIR/inc
mkdir -p $LIBDIR/main
# Copy lib files
-FILELIST="MAKEINFO include/* include/*/* stl/* lib/prec_stl/* lib/longlong/longlong.h G__ci.h main/*"
+FILELIST="include/* include/*/* stl/* lib/prec_stl/* lib/longlong/longlong.h inc/* main/*"
# Add either shared or static library to $FILELIST
if test -f libcint.so; then
FILELIST="$FILELIST libcint.so"
@@ -115,7 +115,7 @@
fi
for i in $FILELIST; do
case $i in
- include/make*|include/Make*|*/setup*)
+ include/make*|include/Make*|*/setup*|*/CVS|*/CVS/*)
;;
*)
if ! test -d $i; then echo -n "$i "; cp $i $LIBDIR/$i; fi