mirror/ULib
1
0
Fork 0
mirror of https://github.com/stefanocasazza/ULib.git synced 2025-09-28 19:05:55 +08:00
Code Issues Releases Wiki Activity

postgres fix

Browse Source
This commit is contained in:
stefanocasazza 2017-09-03 17:12:27 +02:00
parent 639362309f
commit 112d3d27be
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -28614,10 +28614,14 @@ $as_echo_n "checking for PostgreSQL client libraries... " >&6; }
POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir` -I`$PG_CONFIG --includedir-server`" POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir` -I`$PG_CONFIG --includedir-server`"
POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
if test -f "$postgresql_libdir/libpgport.a" -o -f "$postgresql_libdir/libpgport.so"; then if test -f "$postgresql_libdir/libpgport.a" -o -f "$postgresql_libdir/libpgport.so" -o -f "/usr/lib/libpgport.a" -o -f "/usr/lib/libpgport.so"; then
POSTGRESQL_LIBS="-lpq -lpgport" POSTGRESQL_LIBS="-lpq -lpgport"
else else
POSTGRESQL_LIBS="-lpq" POSTGRESQL_LIBS="-lpq"
$as_echo "#define LIBPGPORT_NOT_FOUND 1" >>confdefs.h
fi fi

4
include/ulib/base/utility.h
View File

@ -731,6 +731,10 @@ static inline uint64_t u_getValue(uint16_t tag, void* payload)
static inline void u_setTag(uint16_t tag, uint64_t* pval) { uint64_t payload = u_getPayload(*pval); *pval = u_getValue(tag, (void*)(long)payload); } static inline void u_setTag(uint16_t tag, uint64_t* pval) { uint64_t payload = u_getPayload(*pval); *pval = u_getValue(tag, (void*)(long)payload); }
#if defined(USE_PGSQL) && defined(LIBPGPORT_NOT_FOUND)
static inline void pg_qsort(void* a, size_t n, size_t es, int (*cmp)(const void*, const void*)) { qsort(a, n, es, cmp); }
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

3
include/ulib/internal/config.h.in
View File

@ -589,6 +589,9 @@
/* Standard C lib version */ /* Standard C lib version */
#undef LIBC_VERSION #undef LIBC_VERSION
/* Define to 1 if PostgreSQL libpgport is not available */
#undef LIBPGPORT_NOT_FOUND
/* Libraries */ /* Libraries */
#undef LIBS_VAR #undef LIBS_VAR

7
m4/ax_lib_postgresql.m4
View File

@ -100,14 +100,15 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir` -I`$PG_CONFIG --includedir-server`" POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir` -I`$PG_CONFIG --includedir-server`"
POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
if test -f "$postgresql_libdir/libpgport.a" -o -f "$postgresql_libdir/libpgport.so"; then if test -f "$postgresql_libdir/libpgport.a" -o -f "$postgresql_libdir/libpgport.so" -o -f "/usr/lib/libpgport.a" -o -f "/usr/lib/libpgport.so"; then
POSTGRESQL_LIBS="-lpq -lpgport" POSTGRESQL_LIBS="-lpq -lpgport"
else else
POSTGRESQL_LIBS="-lpq" POSTGRESQL_LIBS="-lpq"
AC_DEFINE([LIBPGPORT_NOT_FOUND], [1], [Define to 1 if PostgreSQL libpgport is not available])
fi fi
AC_DEFINE([HAVE_POSTGRESQL], [1], AC_DEFINE([HAVE_POSTGRESQL], [1], [Define to 1 if PostgreSQL libraries are available])
[Define to 1 if PostgreSQL libraries are available])
AC_MSG_RESULT([$POSTGRESQL_LIBS]) AC_MSG_RESULT([$POSTGRESQL_LIBS])
fi fi

5
tests/examples/benchmark/FrameworkBenchmarks/ULib/ulib.sh
View File

@ -14,7 +14,10 @@ ULIB_DOCUMENT_ROOT=$ULIB_ROOT/ULIB_DOCUMENT_ROOT
mkdir -p $ULIB_ROOT mkdir -p $ULIB_ROOT
mkdir -p $ULIB_DOCUMENT_ROOT mkdir -p $ULIB_DOCUMENT_ROOT
#sudo apt-get install -y libpq-dev if [ "$TRAVIS" = "true" ]; then
# AVOID "fatal error: postgres_fe.h: No such file or directory"
sudo apt-get install -y postgresql-server-dev-all
fi
# make use of FIFO scheduling policy possible (we must avoid use of test because bash signal trapping) # make use of FIFO scheduling policy possible (we must avoid use of test because bash signal trapping)
#type setcap >/dev/null 2>/dev/null #type setcap >/dev/null 2>/dev/null