Skip to content

Commit

Permalink
Attempt at fixing rasdaman build
Browse files Browse the repository at this point in the history
With those changes, I manage to build against rasdaman 10.0.0focal-9
(testing, Focal) on Ubuntu 20.04, but the linking fails with:
/usr/bin/ld: /home/even/gdal/gdal/libgdal.so: undefined reference to `el::base::elStorage'
  • Loading branch information
rouault committed Nov 6, 2021
1 parent d98b52c commit 4f08c8f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
6 changes: 4 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -5629,12 +5629,14 @@ AS_MESSAGE([checking whether we should include rasdaman support...])
AC_ARG_WITH(rasdaman,
[ --with-rasdaman[=DIR] Include rasdaman support (DIR is rasdaman's install dir).],,)

RASDAMAN_LIB_TMP="-lrasodmg -lraslib -lclientcomm -lrasodmg -lraslib -lcommline -lrasnet -lcommon_crypto -lcommon_grpc -lcommon_exceptions -lcommon_network -lcommon_logging -lcommon_time -lcommon_uuid -leasyloggingpp -lmymalloc_cln -lgrpc++_unsecure -lgrpc_unsecure -lz -lprotobuf -lpthread -lboost_thread -lcrypto -lcrypt"

if test "$with_rasdaman" = "yes" ; then

AC_CHECK_LIB(raslib,main,RASDAMAN_ENABLED=yes,,,)

if test -n "$RASDAMAN_ENABLED" ; then
RASDAMAN_LIB="-lrasodmg -lclientcomm -lcompression -lnetwork -lraslib"
RASDAMAN_LIB="$RASDAMAN_LIB_TMP"
OPT_GDAL_FORMATS="rasdaman $OPT_GDAL_FORMATS"
AC_MSG_RESULT([ using rasdaman from system libs.])
else
Expand All @@ -5647,7 +5649,7 @@ elif test -n "$with_rasdaman" -a "$with_rasdaman" != "no" ; then

if test -f $RASDAMAN_DIR/include/rasdaman.hh -a -d$RASDAMAN_DIR/lib ; then
RASDAMAN_INC=-I$RASDAMAN_DIR/include
RASDAMAN_LIB="-L$RASDAMAN_DIR/lib -lrasodmg -lclientcomm -lcompression -lnetwork -lraslib"
RASDAMAN_LIB="-L$RASDAMAN_DIR/lib $RASDAMAN_LIB_TMP"
else
AC_MSG_ERROR("Could not find rasdaman.hh or libraslib.a in $RASDAMAN_DIR.")
fi
Expand Down
8 changes: 7 additions & 1 deletion frmts/rasdaman/rasdamandataset.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,16 @@
#pragma GCC system_header
#endif

#include "raslib/template_inst.hh"
#include "raslib/minterval.hh"
#include "raslib/primitivetype.hh"
#include "raslib/structuretype.hh"
#include "raslib/type.hh"

#include "rasodmg/database.hh"
#include "rasodmg/gmarray.hh"
#include "rasodmg/iterator.hh"
#include "rasodmg/oqlquery.hh"
#include "rasodmg/ref.hh"
#include "rasodmg/transaction.hh"

#endif

0 comments on commit 4f08c8f

Please sign in to comment.