ARGH. need to remember to attach patches.
Julia Longtin <[EMAIL PROTECTED]>
On Mon, Nov 06, 2006 at 02:09:41PM -0600, [EMAIL PROTECTED] wrote:
> Wolfgang,
>
> I've successfully reproduced the issue here, will get to work on it
> immediately.
>
> That said, I've generated 24 patches as a result of getting gift to
> compile on my AMD64 debian unstable box.
>
> Here are 19 of those patches (the other 5 have to do with embedded
> perl ,and dont constitute a "complete fix".)
>
> I dont concider all of these commit worthy, i'll say that to start
> with. specifically, I tried and suceeded at fixing three problems:
> 64 bit specific linking errors,
> 64 bit errors in general, and
> ability to build where top_builddir != top_srcdir.
> (EG: ./bootstrap-cvs.sh && mkdir build && cd build && ../configure && make)
>
> a lot of the builddir patches just go to show us where the include
> path starts at top_srcdir. thats a deeper problem, i just included
> top_srcdir, and dont concider that a "complete fix". it just happens
> to work.
>
> the linking problems boil down to "use .la objects to link to, not .a"
>
> AND i'm not satisfied with my fix for the 64bit cast issue i showed
> in an earlier mail: it works on 64 and 32, but.. feels Cish, not C++ish.
>
> SO, david, wolfgang,
>
> these patches are for your eyes. they're ugly. i dont like them, but
> they make gift compile on my box. please show me a better way? :)
>
> Julia Longtin <[EMAIL PROTECTED]>
>
> On Sat, Nov 04, 2006 at 11:26:52AM +0100, Wolfgang Mueller wrote:
> > Hi, David, Julia,
> > I just noted that a mail of mine got "swallowed" last week. Apparently
> > it did not reach the list. I tested the current feature extraction on my
> > machine and got segfaults, as some array index in the current version of
> > Gabor filtering get negative --> VERY big. Using GIFT with old features
> > and current code worked on my machine after having fixed some file:/ vs.
> > file:/// URL annoyances.
> >
> > I will resend the more detailed mails in the beginning of the next week.
> >
> > Cheers,
> > Wolfgang
> > --
> > Dr. Wolfgang Mueller
> > LS Medieninformatik
> > Universitaet Bamberg
> >
> >
> > _______________________________________________
> > help-GIFT mailing list
> > [email protected]
> > http://lists.gnu.org/mailman/listinfo/help-gift
--- ../../dev2/gift/bootstrap-cvs.sh 2006-02-28 14:48:21.000000000 +0100
+++ bootstrap-cvs.sh 2006-10-25 00:10:40.000000000 +0200
@@ -33,7 +33,7 @@
echo "running libtoolize"
libtoolize --force --ltdl || { echo "Libtoolize failed. THIS MIGHT CAUSE
PROBLEMS LATER, continuing " ; }
echo "running aclocal"
-aclocal --force -I . || { echo "bootstrap failed, because aclocal failed.
exiting. " , exit 100; }
+aclocal -I . || { echo "bootstrap failed, because aclocal failed. exiting. " ,
exit 100; }
echo "...done"
echo "running automake -a"
automake -a --force || { echo "bootstrap failed, because automake failed.
exiting." , exit 101; }
--- configure.in 2006-10-31 06:20:13.000000000 +0100
+++ ../../dev/gift/configure.in 2006-10-31 05:23:07.000000000 +0100
@@ -50,7 +50,6 @@
AC_PROG_CC
AC_PROG_CXX
-AC_PROG_RANLIB
AC_LIBTOOL_DLOPEN
AC_LIBLTDL_CONVENIENCE
--- configure.in 2006-10-31 06:21:34.000000000 +0100
+++ ../../dev/gift/configure.in 2006-10-31 05:23:07.000000000 +0100
@@ -65,7 +65,7 @@
AC_PATH_PROG(PERL,perl)
-if perl gift-check-perl-config.pl "XML::DOM" "XML::XQL" "XML::XQL::DOM"
"Text::Iconv" "HTTP::Request" "XML::Parser";
+if perl ${srcdir}/gift-check-perl-config.pl "XML::DOM" "XML::XQL"
"XML::XQL::DOM" "Text::Iconv" "HTTP::Request" "XML::Parser";
then echo "Your perl setup seems to be OK for running the GIFT" ; else
AC_MSG_ERROR([There are some modules missing from your perl
configuration. Please see the output above.])
fi
--- ../../dev2/gift/dtd/Makefile.am 2001-12-11 18:26:21.000000000 +0100
+++ dtd/Makefile.am 2006-10-31 22:22:31.000000000 +0100
@@ -1,14 +1,14 @@
-noinst_DATA= ../libMRML/cc/mrml_const.cc
+noinst_DATA= ${top_builddir}/libMRML/cc/mrml_const.cc
#
# making a new mrml_const.cc if mrml.dtd has been changed
#
-../libMRML/cc/mrml_const.cc: mrml.dtd
- $(PERL) ../scripts/perl/gift-dtd-to-keywords.pl ../dtd/mrml.dtd mrml
mrml_const charmer.mrml
- mv mrml_const.h ../libMRML/include
- mv mrml_const.cc ../libMRML/cc
- mv mrml_const.java ../
+${top_builddir}/libMRML/cc/mrml_const.cc: mrml.dtd
+ $(PERL) ${top_builddir}/scripts/perl/gift-dtd-to-keywords.pl
${srcdir}/mrml.dtd mrml mrml_const charmer.mrml
+ mv mrml_const.h ${top_builddir}/libMRML/include
+ mv mrml_const.cc ${top_builddir}/libMRML/cc
+ mv mrml_const.java ${top_builddir}/
EXTRA_DIST=mrml.dtd
--- ../../dev2/gift/libMRML/cc/CAttributeList.cc 2006-02-28
14:48:22.000000000 +0100
+++ libMRML/cc/CAttributeList.cc 2006-11-01 02:58:41.000000000 +0100
@@ -27,6 +27,7 @@
#include "libMRML/include/CMutex.h"
#include <iostream>
#include <algorithm>
+#include <bits/wordsize.h>
extern CMutex* gMutex;
CAttributeList::CAttributeList(const char * const * const inAttributeList){
@@ -94,7 +95,11 @@
if(strcmp(i->second.first,
i->second.second)){
+#if __WORDSIZE==64
+ cout << "DELETING FAILED" << flush << int64_t(i->second.second) << flush
<< i->second.first << i->second.second << endl;
+#else
cout << "DELETING FAILED" << flush << int(i->second.second) << flush <<
i->second.first << i->second.second << endl;
+#endif
assert(0);
}
delete[] i->second.first;
--- ../../dev/gift/FeatureExtraction/Makefile.am 2006-01-10
02:53:02.000000000 -0600
+++ FeatureExtraction/Makefile.am 2006-11-06 04:54:19.000000000 -0600
@@ -28,9 +28,9 @@
gift_write_feature_descs_SOURCES= $(david_sources) write_feature_descs.c
-gift_extract_features_LDADD = -L$(top_srcdir)/libSquirePPM -lSquirePPM -lm
+gift_extract_features_LDADD = -L$(top_builddir)/libSquirePPM -lSquirePPM -lm
-gift_write_feature_descs_LDADD= -L$(top_srcdir)/libSquirePPM -lSquirePPM -lm
+gift_write_feature_descs_LDADD= -L$(top_builddir)/libSquirePPM -lSquirePPM -lm
bin_PROGRAMS = gift-extract-features gift-write-feature-descs
--- ../../dev/gift/GIFTServer/Makefile.am 2003-04-22 03:03:46.000000000
-0500
+++ GIFTServer/Makefile.am 2006-11-06 04:40:48.000000000 -0600
@@ -16,7 +16,7 @@
# include directories for all programs in this dir
-INCLUDES = -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcInvertedFile/include
-I$(top_srcdir)/libGIFTAcURL2FTS/include -I$(srcdir) -I.
+INCLUDES = -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcInvertedFile/include
-I$(top_srcdir)/libGIFTAcURL2FTS/include -I$(top_srcdir) -I.
#-------------------------------------------------
--- ../../dev/gift/libGIFTAcDistanceMatrix/cc/Makefile.am 2006-02-28
07:48:22.000000000 -0600
+++ libGIFTAcDistanceMatrix/cc/Makefile.am 2006-11-06 04:12:22.000000000
-0600
@@ -25,7 +25,7 @@
libGIFTAcDistanceMatrix_la_LDFLAGS="@PRE_INSTALL_LIBDIRS@" -lMRML
../../libGIFTAcInvertedFile/cc/.libs/libGIFTAcInvertedFile.a
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcInvertedFile/include
-I$(top_srcdir)/libGIFTAcDistanceMatrix/include
-I$(top_srcdir)/libGIFTAcURL2FTS/include
-I$(top_srcdir)/libGIFTQuBayesian/include
-I$(HOME)/browsing/libGIFTQuBayesian/include
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcInvertedFile/include
-I$(top_srcdir)/libGIFTAcDistanceMatrix/include
-I$(top_srcdir)/libGIFTAcURL2FTS/include
-I$(top_srcdir)/libGIFTQuBayesian/include -I$(top_srcdir)
-I$(HOME)/browsing/libGIFTQuBayesian/include
libGIFTAcDistanceMatrix_la_SOURCES= \
--- ../../dev/gift/libGIFTAcHierarchy/cc/Makefile.am 2004-12-03
15:15:19.000000000 +0100
+++ libGIFTAcHierarchy/cc/Makefile.am 2006-11-01 04:24:01.000000000 +0100
@@ -30,7 +30,7 @@
libGIFTAcHierarchy_la_LDFLAGS="@PRE_INSTALL_LIBDIRS@" -lMRML
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcHierarchy/include -I$(top_srcdir)/expat/xmlparse
-I$(top_srcdir)/expat/xmltok
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcHierarchy/include -I$(top_srcdir)/expat/xmlparse
-I$(top_srcdir)/expat/xmltok -I$(top_srcdir)/
libGIFTAcHierarchy_la_SOURCES= \
--- ../../dev/gift/libGIFTAcInvertedFile/cc/Makefile.am 2006-02-28
14:48:22.000000000 +0100
+++ libGIFTAcInvertedFile/cc/Makefile.am 2006-11-01 04:34:21.000000000
+0100
@@ -27,7 +27,7 @@
libGIFTAcInvertedFile_la_LDFLAGS= -module "@PRE_INSTALL_LIBDIRS@" -lMRML
../../libGIFTAcURL2FTS/cc/.libs/libGIFTAcURL2FTS.a
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcInvertedFile/include
-I$(top_srcdir)/libGIFTAcURL2FTS/include
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcInvertedFile/include
-I$(top_srcdir)/libGIFTAcURL2FTS/include -I$(top_srcdir)
#CAcIFFileSystem.cc: CAcIFFileSystem.pre-cc
--- /disk1/gift/src/merge/dev2/gift/libGIFTAcPerl/cc/Makefile.am
2002-02-26 14:20:18.000000000 +0100
+++ libGIFTAcPerl/cc/Makefile.am 2006-11-01 20:51:29.000000000 +0100
@@ -25,7 +25,7 @@
[EMAIL PROTECTED]@ --rpath../../libMRML/cc/.libs/ -lMRML
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcPerl/include
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcPerl/include -I$(top_srcdir)
# libGIFTAcPerl_a_SOURCES=
libGIFTAcPerl_la_SOURCES= \
--- ../../dev2/gift/libGIFTAcURL2FTS/cc/Makefile.am 2002-02-26
14:20:18.000000000 +0100
+++ libGIFTAcURL2FTS/cc/Makefile.am 2006-11-01 04:17:57.000000000 +0100
@@ -25,7 +25,7 @@
libGIFTAcURL2FTS_la_LDFLAGS="@PRE_INSTALL_LIBDIRS@" -lMRML
INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcURL2FTS/include \
- -I$(top_srcdir)/expat/xmlparse -I$(top_srcdir)/expat/xmltok
+ -I$(top_srcdir)/expat/xmlparse -I$(top_srcdir)/expat/xmltok
-I${top_srcdir}/
libGIFTAcURL2FTS_la_SOURCES= \
CAcURL2FTS.cc\
--- /disk1/gift/src/merge/dev2/gift/libGIFTQuInvertedFile/cc/Makefile.am
2006-02-28 14:48:22.000000000 +0100
+++ libGIFTQuInvertedFile/cc/Makefile.am 2006-11-01 20:41:28.000000000
+0100
@@ -29,7 +29,7 @@
#
# The trick here is: do not compile c code with the -D bool=char define.
#-rdynamic
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTQuInvertedFile/include
-I$(top_srcdir)/libGIFTAcInvertedFile/include
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTQuInvertedFile/include
-I$(top_srcdir)/libGIFTAcInvertedFile/include -I$(top_srcdir)/
libGIFTQuInvertedFile_la_SOURCES= \
CWeightingFunction.cc \
--- ../../dev/gift/libGIFTQuHierarchy/cc/Makefile.am 2004-12-03
15:15:20.000000000 +0100
+++ libGIFTQuHierarchy/cc/Makefile.am 2006-11-01 04:29:50.000000000 +0100
@@ -28,6 +28,6 @@
[EMAIL PROTECTED]@ -lMRML -lGIFTAcHierarchy
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcHierarchy/include
-I$(top_srcdir)/libGIFTQuHierarchy/include
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcHierarchy/include
-I$(top_srcdir)/libGIFTQuHierarchy/include -I$(top_srcdir)
libGIFTQuHierarchy_la_SOURCES= CQHierarchy.cc plug_in_fo.cc
--- /disk1/gift/src/merge/dev2/gift/libGIFTQuPerl/cc/Makefile.am
2002-02-26 14:20:19.000000000 +0100
+++ libGIFTQuPerl/cc/Makefile.am 2006-11-01 22:08:25.000000000 +0100
@@ -27,7 +27,7 @@
#
# The trick here is: do not compile c code with the -D bool=char define.
#-rdynamic
-INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcPerl/include -I$(top_srcdir)/libGIFTQuPerl/include
+INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcPerl/include -I$(top_srcdir)/libGIFTQuPerl/include
-I$(top_srcdir)
libGIFTQuPerl_la_SOURCES= \
--- ../../dev2/gift/libMRML/cc/Makefile.am 2006-01-10 09:53:03.000000000
+0100
+++ libMRML/cc/Makefile.am 2006-11-01 03:20:55.000000000 +0100
@@ -114,7 +114,7 @@
s§%LDFLAGS%§$(LDFLAGS)§g;\
s§%LIBS%§$(LIBS)§ g;\
[EMAIL PROTECTED]@§g;\
- s§%libdir%§$(libdir)§g;" < libMRML-config.pre-cc >
libMRML-config.cc
+ s§%libdir%§$(libdir)§g;" < ${srcdir}/libMRML-config.pre-cc >
libMRML-config.cc
bin_PROGRAMS= libMRML-config
--- ../../dev/gift/libGIFTAcDistanceMatrix/cc/Makefile.am 2006-11-06
04:16:40.000000000 -0600
+++ libGIFTAcDistanceMatrix/cc/Makefile.am 2006-11-06 04:16:18.000000000
-0600
@@ -23,7 +23,7 @@
lib_LTLIBRARIES = libGIFTAcDistanceMatrix.la
-libGIFTAcDistanceMatrix_la_LDFLAGS="@PRE_INSTALL_LIBDIRS@" -lMRML
../../libGIFTAcInvertedFile/cc/.libs/libGIFTAcInvertedFile.a
+libGIFTAcDistanceMatrix_la_LDFLAGS="@PRE_INSTALL_LIBDIRS@" -lMRML
../../libGIFTAcInvertedFile/cc/.libs/libGIFTAcInvertedFile.la
INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcInvertedFile/include
-I$(top_srcdir)/libGIFTAcDistanceMatrix/include
-I$(top_srcdir)/libGIFTAcURL2FTS/include
-I$(top_srcdir)/libGIFTQuBayesian/include -I$(top_srcdir)
-I$(HOME)/browsing/libGIFTQuBayesian/include
--- /disk1/gift/src/merge/dev2/gift/libGIFTAcInvertedFile/cc/Makefile.am
2006-11-01 20:37:10.000000000 +0100
+++ libGIFTAcInvertedFile/cc/Makefile.am 2006-11-01 20:36:01.000000000
+0100
@@ -25,7 +25,7 @@
lib_LTLIBRARIES = libGIFTAcInvertedFile.la
-libGIFTAcInvertedFile_la_LDFLAGS= -module "@PRE_INSTALL_LIBDIRS@" -lMRML
../../libGIFTAcURL2FTS/cc/.libs/libGIFTAcURL2FTS.a
+libGIFTAcInvertedFile_la_LDFLAGS= -module "@PRE_INSTALL_LIBDIRS@" -lMRML
../../libGIFTAcURL2FTS/cc/.libs/libGIFTAcURL2FTS.la
INCLUDES= -DHAS_BOOL -I$(top_srcdir)/libMRML/include
-I$(top_srcdir)/libGIFTAcInvertedFile/include
-I$(top_srcdir)/libGIFTAcURL2FTS/include -I$(top_srcdir)
--- /disk1/gift/src/merge/dev2/gift/libGIFTQuInvertedFile/cc/Makefile.am
2006-11-01 21:56:07.000000000 +0100
+++ libGIFTQuInvertedFile/cc/Makefile.am 2006-11-01 20:42:30.000000000
+0100
@@ -23,7 +23,7 @@
lib_LTLIBRARIES = libGIFTQuInvertedFile.la
-libGIFTQuInvertedFile_la_LDFLAGS="@PRE_INSTALL_LIBDIRS@" -lMRML
../../libGIFTAcInvertedFile/cc/.libs/libGIFTAcInvertedFile.a
+libGIFTQuInvertedFile_la_LDFLAGS="@PRE_INSTALL_LIBDIRS@" -lMRML
../../libGIFTAcInvertedFile/cc/.libs/libGIFTAcInvertedFile.la
#
_______________________________________________
help-GIFT mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/help-gift
