Commit e7f4427a authored by Claes Sjofors's avatar Claes Sjofors

ebuild fix for berkeley db

parent 2d74d1f8
......@@ -317,6 +317,8 @@ fi
if [ $pwre_hw == "hw_arm" ] && [ $ebuild -eq 1 ]; then
echo "Arm ebuild"
pwre_config_check_lib gtk GTK gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-$gnu/libgtk-x11-2.0.so"
pwre_config_check_include gtk GTK 1 "/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h"
pwre_config_check_include jni JNI 1 $jdk/include/jni.h
pwre_config_check_include jni JNI 0 $jdk/include/linux/jni_md.h
......@@ -327,6 +329,8 @@ if [ $pwre_hw == "hw_arm" ] && [ $ebuild -eq 1 ]; then
rm $pwre_sroot/exe/co_convert/src/.os_linux/.hw_arm/makefile
rm $pwre_sroot/exe/wb_rtt/src/.os_linux/.hw_arm/makefile
rm $pwre_sroot/exe/rt_elog/src/.os_linux/.hw_arm/makefile
rm $pwre_sroot/exe/rt_elog_dump/src/.os_linux/.hw_arm/makefile
rm $pwre_croot/remote/exe/rs_remote_mq/src/.os_linux/.hw_arm/makefile
let i=0
while [ $i -lt $inc_cnt ]; do
......@@ -380,7 +384,7 @@ else
pwre_config_check_lib libasound LIBASOUND lib lib 0 "/usr/lib/libasound.so:/usr/lib/libasound.a:/usr/lib/$hwpl-linux-$gnu/libasound.so"
pwre_config_check_lib libpthread LIBPTHREAD lib lib 0 "/usr/lib/libpthread.so:/usr/lib/libpthread.a:/usr/lib/$hwpl-linux-$gnu/libpthread.so"
pwre_config_check_lib libm LIBM lib lib 0 "/usr/lib/libm.so:/usr/lib/libm.a:/usr/lib/$hwpl-linux-$gnu/libm.so"
pwre_config_check_lib libdb LIBDB lib lib 0 "/usr/lib/libdb.so:/usr/lib/$hwpl-linux-$gnu/libdb.so"
pwre_config_check_lib libdb LIBDB lib lib 1 "/usr/lib/libdb.so:/usr/lib/$hwpl-linux-$gnu/libdb.so"
pwre_config_check_lib libdb_cxx LIBDB_CXX lib wb 1 "/usr/lib/libdb_cxx.so:/usr/lib/$hwpl-linux-$gnu/libdb_cxx.so"
pwre_config_check_lib libz LIBZ lib lib 0 "/usr/lib/libz.so:/usr/lib/libz.a:/usr/lib/$hwpl-linux-$gnu/libz.so"
pwre_config_check_lib libcrypt LIBCRYPT lib lib 0 "/usr/lib/libcrypt.so:/usr/lib/libcrypt.a:/usr/lib/$hwpl-linux-$gnu/libcrypt.so"
......
......@@ -40,7 +40,7 @@
Last modification: 030217
*/
#if defined OS_POSIX
#if defined OS_POSIX && defined PWRE_CONF_LIBDB
using namespace std;
......
......@@ -39,7 +39,7 @@
/* xtt_hist_gtk.h -- Historical event window in xtt */
#if defined OS_POSIX
#if defined OS_POSIX && defined PWRE_CONF_LIBDB
#ifndef xtt_hist_h
# include "xtt_hist.h"
......@@ -115,20 +115,17 @@ class HistGtk : public Hist {
#else
// Dummy for other platforms then OS_LINUX
class HistGtk {
#ifndef xtt_hist_h
# include "xtt_hist.h"
#endif
class HistGtk : public Hist {
public:
HistGtk( void *hist_parent_ctx,
GtkWidget *hist_parent_wid,
char *hist_name, pwr_tObjid objid,
pwr_tStatus *status) {}
pwr_tStatus *status) : Hist(hist_parent_ctx,hist_name,objid,status) {}
~HistGtk() {}
void (*close_cb)( void *) {}
void (*start_trace_cb)( void *, pwr_tObjid, char *) {}
void (*display_in_xnav_cb)( void *, pwr_tObjid) {}
void (*update_info_cb)( void *) {}
void (*help_cb)( void *, char *) {}
void (*popup_menu_cb)( void *, pwr_sAttrRef, unsigned long,
unsigned long, char *, Widget * ) {}
};
#endif
......
......@@ -41,6 +41,7 @@
*/
#if defined OS_POSIX
#if defined PWRE_CONF_LIBDB
using namespace std;
......@@ -874,7 +875,7 @@ pwr_tStatus Hist::AdjustForDayBreak( Hist *histOP, pwr_tTime *Time,
return 1;
} /* AdjustForDayBreak */
#endif
#endif
......
......@@ -39,7 +39,7 @@
/* xtt_hist.h -- Historical event window in xtt */
#if defined OS_POSIX
#if defined OS_POSIX && defined PWRE_CONF_LIBDB
#if defined __cplusplus
extern "C" {
......@@ -150,19 +150,17 @@ class Hist {
// Dummy for other platforms then OS_LINUX
class Hist {
public:
Hist(
void *hist_parent_ctx,
Widget hist_parent_wid,
char *hist_name, pwr_tObjid objid,
pwr_tStatus *status) : parent_ctx(hist_parent_ctx) {}
Hist( void *hist_parent_ctx,
char *hist_name, pwr_tObjid objid,
pwr_tStatus *status) : parent_ctx(hist_parent_ctx) {}
void *parent_ctx;
void (*close_cb)( void *);
void (*start_trace_cb)( void *, pwr_tObjid, char *);
void (*display_in_xnav_cb)( void *, pwr_tObjid);
void (*display_in_xnav_cb)( void *, pwr_sAttrRef *);
void (*update_info_cb)( void *);
void (*help_cb)( void *, char *);
void (*help_cb)( void *, const char *);
void (*popup_menu_cb)( void *, pwr_sAttrRef, unsigned long,
unsigned long, char *, Widget * );
unsigned long, char *, int x, int y);
};
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment