[Buildroot] [PATCH v5] package/radlib: new package

[Buildroot] [PATCH v5] package/radlib: new package

[ray.kinsella at intel.com]

From: Ray Kinsella <ray.kinsella@intel.com>

Changes v4 -> v5:
  * reorganize autotools changes into 3 seperate patches
    * adding pkg-config support for sqlite and postgresql 
    * adding mysql-config support for mysql
    * removing ugly CROSS_COMPILE and paths relative to $(prefix)
  * number of small tidy ups for package/radlib

Ray Kinsella (1):
  package/radlib: new package

 package/Config.in                                  |   1 +
 ...oduce-pkg-config-for-sqlite-and-postgresq.patch | 102 +++++++++++++++++++++
 .../0002-radlib-introduce-mysql-config.patch       |  78 ++++++++++++++++
 ...adlib-fix-the-paths-in-the-subdir-objects.patch |  93 +++++++++++++++++++
 package/radlib/Config.in                           |  38 ++++++++
 package/radlib/radlib.hash                         |   2 +
 package/radlib/radlib.mk                           |  28 ++++++
 7 files changed, 342 insertions(+)
 create mode 100644 package/radlib/0001-radlib-introduce-pkg-config-for-sqlite-and-postgresq.patch
 create mode 100644 package/radlib/0002-radlib-introduce-mysql-config.patch
 create mode 100644 package/radlib/0003-radlib-fix-the-paths-in-the-subdir-objects.patch
 create mode 100644 package/radlib/Config.in
 create mode 100644 package/radlib/radlib.hash
 create mode 100644 package/radlib/radlib.mk

-- 
2.4.11

[Buildroot] [PATCH v5] package/radlib: new package

[ray.kinsella at intel.com]

From: Ray Kinsella <ray.kinsella@intel.com>

radlib is a rapid application development library for unix
multi-process applications. It uses SYS V IPC facilities and
FIFOs to provide an RTOS-like, event-driven, distributed
framework. Processes may be run as daemons or have a controlling
terminal.

Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
---
 package/Config.in                                  |   1 +
 ...oduce-pkg-config-for-sqlite-and-postgresq.patch | 102 +++++++++++++++++++++
 .../0002-radlib-introduce-mysql-config.patch       |  78 ++++++++++++++++
 ...adlib-fix-the-paths-in-the-subdir-objects.patch |  93 +++++++++++++++++++
 package/radlib/Config.in                           |  38 ++++++++
 package/radlib/radlib.hash                         |   2 +
 package/radlib/radlib.mk                           |  28 ++++++
 7 files changed, 342 insertions(+)
 create mode 100644 package/radlib/0001-radlib-introduce-pkg-config-for-sqlite-and-postgresq.patch
 create mode 100644 package/radlib/0002-radlib-introduce-mysql-config.patch
 create mode 100644 package/radlib/0003-radlib-fix-the-paths-in-the-subdir-objects.patch
 create mode 100644 package/radlib/Config.in
 create mode 100644 package/radlib/radlib.hash
 create mode 100644 package/radlib/radlib.mk

diff --git a/package/Config.in b/package/Config.in
index 64822bf..6c59556 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1262,6 +1262,7 @@ endif
 	source "package/protobuf-c/Config.in"
 	source "package/qhull/Config.in"
 	source "package/qlibc/Config.in"
+	source "package/radlib/Config.in"
 	source "package/startup-notification/Config.in"
 	source "package/tz/Config.in"
 	source "package/tzdata/Config.in"
diff --git a/package/radlib/0001-radlib-introduce-pkg-config-for-sqlite-and-postgresq.patch b/package/radlib/0001-radlib-introduce-pkg-config-for-sqlite-and-postgresq.patch
new file mode 100644
index 0000000..63a4315
--- /dev/null
+++ b/package/radlib/0001-radlib-introduce-pkg-config-for-sqlite-and-postgresq.patch
@@ -0,0 +1,102 @@
+From 3c7aad41e2c32b63267fa8cd6bf3fbb9ea0aaae3 Mon Sep 17 00:00:00 2001
+From: Ray Kinsella <ray.kinsella@intel.com>
+Date: Wed, 13 Apr 2016 16:21:02 +0100
+Subject: [PATCH 1/3] radlib: introduce pkg-config for sqlite and postgresql
+
+Retrieve cflags and linker options for sqlite and postgresql using pkg-config.
+
+Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
+---
+ configure.in          | 6 ++++++
+ debug/Makefile.am     | 4 ++--
+ msgRouter/Makefile.am | 4 ++--
+ src/Makefile.am       | 6 ++----
+ 4 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 47e507e..83f572c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -23,6 +23,9 @@ AC_ARG_ENABLE(pgresql,
+   *) pgresql=false ;;
+ esac],[pgresql=false])
+ AM_CONDITIONAL(PGRESQL, test x$pgresql = xtrue)
++if test x$pgresql = xtrue; then
++  PKG_CHECK_MODULES([POSTGRESQL], [libpq])
++fi
+ 
+ AC_ARG_ENABLE(sqlite,
+ [  --enable-sqlite                include radlib sqlite database support],
+@@ -32,6 +35,9 @@ AC_ARG_ENABLE(sqlite,
+   *) sqlite=false ;;
+ esac],[sqlite=false])
+ AM_CONDITIONAL(SQLITE, test x$sqlite = xtrue)
++if test x$sqlite = xtrue; then
++  PKG_CHECK_MODULES([SQLITE3], [sqlite3])
++fi
+ 
+ # Check for big endian host:
+ AC_C_BIGENDIAN()
+diff --git a/debug/Makefile.am b/debug/Makefile.am
+index 00f3b13..bd3e94e 100644
+--- a/debug/Makefile.am
++++ b/debug/Makefile.am
+@@ -19,11 +19,11 @@ if MYSQL
+ raddebug_LDADD   += -lmysqlclient
+ else
+ if PGRESQL
+-raddebug_LDADD   += -lpq
++raddebug_LDADD   += $(POSTGRESQL_LIBS)
+ endif
+ endif
+ if SQLITE
+-raddebug_LDADD   += -lsqlite3
++raddebug_LDADD   += $(SQLITE3_LIBS)
+ endif
+ 
+ # define library directories
+diff --git a/msgRouter/Makefile.am b/msgRouter/Makefile.am
+index 5a20421..08ec4c9 100644
+--- a/msgRouter/Makefile.am
++++ b/msgRouter/Makefile.am
+@@ -19,11 +19,11 @@ if MYSQL
+ radmrouted_LDADD   += -lmysqlclient
+ else
+ if PGRESQL
+-radmrouted_LDADD   += -lpq
++radmrouted_LDADD   += $(POSTGRESQL_LIBS)
+ endif
+ endif
+ if SQLITE
+-radmrouted_LDADD   += -lsqlite3
++radmrouted_LDADD   += $(SQLITE3_LIBS)
+ endif
+ 
+ # define library directories
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 38b2ac8..8853e58 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -24,8 +24,7 @@ MYSQL_HDRS	= \
+ endif
+ if PGRESQL
+ PG_INCLUDES 	= \
+-		-I$(prefix)/include \
+-		-I/usr/include
++		$(POSTGRESQL_CFLAGS)
+ PG_SOURCES	= \
+ 		$(top_srcdir)/database/postgresql/pg_database.c \
+ 		$(top_srcdir)/src/raddatabase.c
+@@ -35,8 +34,7 @@ PGSQL_HDRS	= \
+ endif
+ if SQLITE
+ SQ_INCLUDES 	= \
+-		-I$(prefix)/include \
+-		-I/usr/include
++		$(SQLITE3_CFLAGS) 
+ SQ_SOURCES	= \
+ 		$(top_srcdir)/src/radsqlite.c
+ SQLITE_HDRS	= \
+-- 
+2.4.11
+
diff --git a/package/radlib/0002-radlib-introduce-mysql-config.patch b/package/radlib/0002-radlib-introduce-mysql-config.patch
new file mode 100644
index 0000000..d778d42
--- /dev/null
+++ b/package/radlib/0002-radlib-introduce-mysql-config.patch
@@ -0,0 +1,78 @@
+From c70ccfd485b87f9ffe065b82588aa158743620a0 Mon Sep 17 00:00:00 2001
+From: Ray Kinsella <ray.kinsella@intel.com>
+Date: Wed, 13 Apr 2016 16:23:11 +0100
+Subject: [PATCH 2/3] radlib: introduce mysql-config
+
+Retrieve cflags and linker options for mysql using mysql-config.$
+
+Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
+---
+ configure.in          | 9 +++++++++
+ debug/Makefile.am     | 2 +-
+ msgRouter/Makefile.am | 2 +-
+ src/Makefile.am       | 3 +--
+ 4 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 83f572c..3fb8f49 100644
+--- a/configure.in
++++ b/configure.in
+@@ -14,6 +14,15 @@ AC_ARG_ENABLE(mysql,
+   *) mysql=false ;;
+ esac],[mysql=false])
+ AM_CONDITIONAL(MYSQL, test x$mysql = xtrue)
++if test x$mysql = xtrue; then
++  AC_PATH_PROG([MYSQL_CONFIG], [mysql_config])
++  if test "x$MYSQL_CONFIG" != "x";then
++    MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
++    MYSQL_LIBS=`$MYSQL_CONFIG --libs`
++    AC_SUBST([MYSQL_CFLAGS])
++    AC_SUBST([MYSQL_LIBS])
++  fi
++fi
+ 
+ AC_ARG_ENABLE(pgresql,
+ [  --enable-pgresql               include radlib postgreSQL database support],
+diff --git a/debug/Makefile.am b/debug/Makefile.am
+index bd3e94e..7c558ed 100644
+--- a/debug/Makefile.am
++++ b/debug/Makefile.am
+@@ -16,7 +16,7 @@ raddebug_SOURCES  = \
+ raddebug_LDADD   = -lrad -lpthread 
+ 
+ if MYSQL
+-raddebug_LDADD   += -lmysqlclient
++raddebug_LDADD   += $(MYSQL_LIBS)
+ else
+ if PGRESQL
+ raddebug_LDADD   += $(POSTGRESQL_LIBS)
+diff --git a/msgRouter/Makefile.am b/msgRouter/Makefile.am
+index 08ec4c9..14733b7 100644
+--- a/msgRouter/Makefile.am
++++ b/msgRouter/Makefile.am
+@@ -16,7 +16,7 @@ radmrouted_SOURCES  = \
+ radmrouted_LDADD   = -lrad -lpthread
+ 
+ if MYSQL
+-radmrouted_LDADD   += -lmysqlclient
++radmrouted_LDADD   += $(MYSQL_LIBS)
+ else
+ if PGRESQL
+ radmrouted_LDADD   += $(POSTGRESQL_LIBS)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8853e58..ea1b73d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -14,8 +14,7 @@ lib_LTLIBRARIES = librad.la
+ 
+ if MYSQL
+ MY_INCLUDES 	= \
+-		-I$(prefix)/include/mysql \
+-		-I/usr/include/mysql
++		$(MYSQL_CFLAGS)
+ MY_SOURCES  	= \
+ 		$(top_srcdir)/database/mysql/my_database.c \
+ 		$(top_srcdir)/src/raddatabase.c
+-- 
+2.4.11
+
diff --git a/package/radlib/0003-radlib-fix-the-paths-in-the-subdir-objects.patch b/package/radlib/0003-radlib-fix-the-paths-in-the-subdir-objects.patch
new file mode 100644
index 0000000..b375eaf
--- /dev/null
+++ b/package/radlib/0003-radlib-fix-the-paths-in-the-subdir-objects.patch
@@ -0,0 +1,93 @@
+From ddcebb69533c795c1c0371eeefe856924e11ff23 Mon Sep 17 00:00:00 2001
+From: Ray Kinsella <ray.kinsella@intel.com>
+Date: Wed, 13 Apr 2016 16:24:34 +0100
+Subject: [PATCH 3/3] radlib: fix the paths in the subdir-objects
+
+Remove paths relative to $(prefix) and CROSS_COMPILE options from
+subdir-objects.
+
+Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
+---
+ configure.in          |  1 +
+ debug/Makefile.am     | 16 ++--------------
+ msgRouter/Makefile.am | 16 ++--------------
+ src/Makefile.am       |  1 -
+ 4 files changed, 5 insertions(+), 29 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3fb8f49..ffc0204 100644
+--- a/configure.in
++++ b/configure.in
+@@ -4,6 +4,7 @@ AC_PREREQ(2.5)
+ AC_INIT([radlib],[2.12.0],[mteel2005 at gmail.com])
+ AC_CONFIG_SRCDIR([h/radmsgLog.h])
+ AM_INIT_AUTOMAKE([radlib],[2.12.0])
++AM_INIT_AUTOMAKE([subdir-objects])
+ AM_CONFIG_HEADER([config.h])
+ 
+ AC_ARG_ENABLE(mysql,
+diff --git a/debug/Makefile.am b/debug/Makefile.am
+index 7c558ed..e732a06 100644
+--- a/debug/Makefile.am
++++ b/debug/Makefile.am
+@@ -27,18 +27,6 @@ raddebug_LDADD   += $(SQLITE3_LIBS)
+ endif
+ 
+ # define library directories
+-raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib
+-INCLUDES         += -I$(prefix)/include -I/usr/include
++raddebug_LDADD += -L../src/.libs 
+ 
+-if MYSQL
+-raddebug_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
+-else
+-if PGRESQL
+-raddebug_LDFLAGS += -L$(prefix)/pgsql/lib
+-INCLUDES         += -I$(prefix)/pgsql/include
+-endif
+-endif
+-
+-if CROSSCOMPILE
+-raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
+-endif
++# removed paths relative to $(prefix)
+diff --git a/msgRouter/Makefile.am b/msgRouter/Makefile.am
+index 14733b7..2cf9d17 100644
+--- a/msgRouter/Makefile.am
++++ b/msgRouter/Makefile.am
+@@ -27,18 +27,6 @@ radmrouted_LDADD   += $(SQLITE3_LIBS)
+ endif
+ 
+ # define library directories
+-radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib
+-INCLUDES           += -I$(prefix)/include -I/usr/include
++radmrouted_LDADD += -L../src/.libs
+ 
+-if MYSQL
+-radmrouted_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
+-else
+-if PGRESQL
+-radmrouted_LDFLAGS += -L$(prefix)/lib -L$(prefix)/pgsql/lib
+-INCLUDES           += -I$(prefix)/pgsql/include
+-endif
+-endif
+-
+-if CROSSCOMPILE
+-radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
+-endif
++# removed paths relative to $(prefix)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ea1b73d..f08976b 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -43,7 +43,6 @@ endif
+ # define include directories
+ INCLUDES = \
+ 		-I$(top_srcdir)/h \
+-		-I$(prefix)/include \
+ 		-D_GNU_SOURCE \
+ 		$(MY_INCLUDES) \
+ 		$(PG_INCLUDES) \
+-- 
+2.4.11
+
diff --git a/package/radlib/Config.in b/package/radlib/Config.in
new file mode 100644
index 0000000..a4a89c9
--- /dev/null
+++ b/package/radlib/Config.in
@@ -0,0 +1,38 @@
+config BR2_PACKAGE_RADLIB
+	bool "radlib"
+	help
+	  radlib is a rapid application development library for unix
+	  multi-process applications. It uses SYS V IPC facilities and
+	  FIFOs to provide an RTOS-like, event-driven, distributed framework.
+	  Processes may be run as daemons or have a controlling terminal.
+	  
+	  http://sourceforge.net/projects/radlib/
+
+choice
+	prompt "radlib database backend"
+	depends on BR2_PACKAGE_RADLIB
+	depends on BR2_PACKAGE_SQLITE \
+		|| BR2_PACKAGE_MYSQL \
+		|| BR2_PACKAGE_POSTGRESQL
+	help
+	  Selects the backend database: sqlite, mysql or postgresql
+
+config BR2_PACKAGE_RADLIB_SQLITE
+	bool "sqlite"
+	depends on BR2_PACKAGE_SQLITE
+	help
+	  Configure radlib to use a sqlite database backend
+
+config BR2_PACKAGE_RADLIB_MYSQL
+	bool "mysql"
+	depends on BR2_PACKAGE_MYSQL
+	help
+	  Configure radlib to use a mysql database backend
+
+config BR2_PACKAGE_RADLIB_POSTGRESQL
+	bool "postgresql"
+	depends on BR2_PACKAGE_POSTGRESQL
+	help
+	  Configure radlib to use a postgresql database backend
+
+endchoice
diff --git a/package/radlib/radlib.hash b/package/radlib/radlib.hash
new file mode 100644
index 0000000..2fbfbba
--- /dev/null
+++ b/package/radlib/radlib.hash
@@ -0,0 +1,2 @@
+# From http://sourceforge.net/projects/radlib/files/
+sha256  82b98bb5e08a500dea1e4252843b9c772fa1fb67ac8ab89ed64abdd5e22eca66  radlib-2.12.0.tar.gz
diff --git a/package/radlib/radlib.mk b/package/radlib/radlib.mk
new file mode 100644
index 0000000..8b8d61e
--- /dev/null
+++ b/package/radlib/radlib.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# radlib
+#
+################################################################################
+
+RADLIB_VERSION = 2.12.0
+RADLIB_SITE = http://downloads.sourceforge.net/radlib
+RADLIB_INSTALL_STAGING = YES
+RADLIB_LICENSE = BSD-2c
+RADLIB_LICENSE_FILES = COPYING
+RADLIB_AUTORECONF = YES
+RADLIB_DEPENDENCIES = host-pkgconf
+
+ifeq ($(BR2_PACKAGE_RADLIB_SQLITE),y)
+RADLIB_CONF_OPTS += --enable-sqlite
+endif
+
+ifeq ($(BR2_PACKAGE_RADLIB_MYSQL),y)
+RADLIB_CONF_ENV=ac_cv_path_MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
+RADLIB_CONF_OPTS += --enable-mysql
+endif
+
+ifeq ($(BR2_PACKAGE_RADLIB_POSTGRESQL),y)
+RADLIB_CONF_OPTS += --enable-pgresql
+endif
+
+$(eval $(autotools-package))
-- 
2.4.11

[Buildroot] [PATCH v5] package/radlib: new package

[Kinsella, Ray]

Hi folks,

Please ignore this patch, as the current radlib build results in an
incorrect dynamic link table in librad. 

Lines like the following are just broken 

raddebug_LDADD   += -lmysqlclient
radmrouted_LDADD   += -lmysqlclient

or 

radmrouted_LDADD   += $(MYSQL_LIBS)
raddebug_LDADD   += $(MYSQL_LIBS)

The radlib library (librad.so) should link against
mysql/sqlite/postgresql. The radlib executables (shown above) should
then link again radlib (librad.so). 

Thanks,

Ray K

On Wed, 2016-04-13 at 17:06 +0100, ray.kinsella at intel.com wrote:
> From: Ray Kinsella <ray.kinsella@intel.com>
> 
> Changes v4 -> v5:
>   * reorganize autotools changes into 3 seperate patches
>     * adding pkg-config support for sqlite and postgresql 
>     * adding mysql-config support for mysql
>     * removing ugly CROSS_COMPILE and paths relative to $(prefix)
>   * number of small tidy ups for package/radlib
> 
> Ray Kinsella (1):
>   package/radlib: new package
> 
>  package/Config.in                                  |   1 +
>  ...oduce-pkg-config-for-sqlite-and-postgresq.patch | 102
> +++++++++++++++++++++
>  .../0002-radlib-introduce-mysql-config.patch       |  78
> ++++++++++++++++
>  ...adlib-fix-the-paths-in-the-subdir-objects.patch |  93
> +++++++++++++++++++
>  package/radlib/Config.in                           |  38 ++++++++
>  package/radlib/radlib.hash                         |   2 +
>  package/radlib/radlib.mk                           |  28 ++++++
>  7 files changed, 342 insertions(+)
>  create mode 100644 package/radlib/0001-radlib-introduce-pkg-config
> -for-sqlite-and-postgresq.patch
>  create mode 100644 package/radlib/0002-radlib-introduce-mysql
> -config.patch
>  create mode 100644 package/radlib/0003-radlib-fix-the-paths-in-the
> -subdir-objects.patch
>  create mode 100644 package/radlib/Config.in
>  create mode 100644 package/radlib/radlib.hash
>  create mode 100644 package/radlib/radlib.mk
> 

[Buildroot] [PATCH v5] package/radlib: new package

[Thomas Petazzoni]

Hello,

On Wed, 20 Apr 2016 15:44:14 +0000, Kinsella, Ray wrote:

> Please ignore this patch, as the current radlib build results in an
> incorrect dynamic link table in librad. 
> 
> Lines like the following are just broken 
> 
> raddebug_LDADD   += -lmysqlclient
> radmrouted_LDADD   += -lmysqlclient
> 
> or 
> 
> radmrouted_LDADD   += $(MYSQL_LIBS)
> raddebug_LDADD   += $(MYSQL_LIBS)
> 
> The radlib library (librad.so) should link against
> mysql/sqlite/postgresql. The radlib executables (shown above) should
> then link again radlib (librad.so). 

There were some other issues in your patch, and I was planning to
review it. I'll try to give you some feedback so that you can take it
into account for your v6.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v5] package/radlib: new package

[Arnout Vandecappelle]

On 04/13/16 18:06, ray.kinsella at intel.com wrote:
> From: Ray Kinsella <ray.kinsella@intel.com>
>
> radlib is a rapid application development library for unix
> multi-process applications. It uses SYS V IPC facilities and
> FIFOs to provide an RTOS-like, event-driven, distributed
> framework. Processes may be run as daemons or have a controlling
> terminal.
>
> Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
> ---
[snip]
> diff --git a/package/radlib/0001-radlib-introduce-pkg-config-for-sqlite-and-postgresq.patch b/package/radlib/0001-radlib-introduce-pkg-config-for-sqlite-and-postgresq.patch
> new file mode 100644
> index 0000000..63a4315
> --- /dev/null
> +++ b/package/radlib/0001-radlib-introduce-pkg-config-for-sqlite-and-postgresq.patch
> @@ -0,0 +1,102 @@
> +From 3c7aad41e2c32b63267fa8cd6bf3fbb9ea0aaae3 Mon Sep 17 00:00:00 2001
> +From: Ray Kinsella <ray.kinsella@intel.com>
> +Date: Wed, 13 Apr 2016 16:21:02 +0100
> +Subject: [PATCH 1/3] radlib: introduce pkg-config for sqlite and postgresql

  Please generate patches with the -N option; the 1/3 becomes invalid when a 4th 
patch is added, or when some of the patches are accepted upstream. Given 
upstream's lack of updates the latter isn't very likely :-) Did you try to 
submit the patches upstream?

> +
> +Retrieve cflags and linker options for sqlite and postgresql using pkg-config.
> +
> +Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
> +---
> + configure.in          | 6 ++++++
> + debug/Makefile.am     | 4 ++--
> + msgRouter/Makefile.am | 4 ++--
> + src/Makefile.am       | 6 ++----
> + 4 files changed, 12 insertions(+), 8 deletions(-)
> +
> +diff --git a/configure.in b/configure.in
> +index 47e507e..83f572c 100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -23,6 +23,9 @@ AC_ARG_ENABLE(pgresql,
> +   *) pgresql=false ;;
> + esac],[pgresql=false])
> + AM_CONDITIONAL(PGRESQL, test x$pgresql = xtrue)
> ++if test x$pgresql = xtrue; then

  Since the AM_CONDITIONAL is defined just above, it's better to use AM_COND_IF:

AM_COND_IF([PGRESQL],
   PKG_CHECK_MODULES([POSTGRESQL], [libpq])
)

(untested, of course).

> ++  PKG_CHECK_MODULES([POSTGRESQL], [libpq])
> ++fi
> +
> + AC_ARG_ENABLE(sqlite,
> + [  --enable-sqlite                include radlib sqlite database support],
> +@@ -32,6 +35,9 @@ AC_ARG_ENABLE(sqlite,
> +   *) sqlite=false ;;
> + esac],[sqlite=false])
> + AM_CONDITIONAL(SQLITE, test x$sqlite = xtrue)
> ++if test x$sqlite = xtrue; then

  Same here.

> ++  PKG_CHECK_MODULES([SQLITE3], [sqlite3])
> ++fi
> +
> + # Check for big endian host:
> + AC_C_BIGENDIAN()
[snip]
> diff --git a/package/radlib/0002-radlib-introduce-mysql-config.patch b/package/radlib/0002-radlib-introduce-mysql-config.patch
> new file mode 100644
> index 0000000..d778d42
> --- /dev/null
> +++ b/package/radlib/0002-radlib-introduce-mysql-config.patch
> @@ -0,0 +1,78 @@
> +From c70ccfd485b87f9ffe065b82588aa158743620a0 Mon Sep 17 00:00:00 2001
> +From: Ray Kinsella <ray.kinsella@intel.com>
> +Date: Wed, 13 Apr 2016 16:23:11 +0100
> +Subject: [PATCH 2/3] radlib: introduce mysql-config
> +
> +Retrieve cflags and linker options for mysql using mysql-config.$
> +
> +Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
> +---
> + configure.in          | 9 +++++++++
> + debug/Makefile.am     | 2 +-
> + msgRouter/Makefile.am | 2 +-
> + src/Makefile.am       | 3 +--
> + 4 files changed, 12 insertions(+), 4 deletions(-)
> +
> +diff --git a/configure.in b/configure.in
> +index 83f572c..3fb8f49 100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -14,6 +14,15 @@ AC_ARG_ENABLE(mysql,
> +   *) mysql=false ;;
> + esac],[mysql=false])
> + AM_CONDITIONAL(MYSQL, test x$mysql = xtrue)
> ++if test x$mysql = xtrue; then

  Same, use AM_COND_IF

> ++  AC_PATH_PROG([MYSQL_CONFIG], [mysql_config])
> ++  if test "x$MYSQL_CONFIG" != "x";then
> ++    MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
> ++    MYSQL_LIBS=`$MYSQL_CONFIG --libs`
> ++    AC_SUBST([MYSQL_CFLAGS])
> ++    AC_SUBST([MYSQL_LIBS])

  I guess there should be an error in the else branch?

> ++  fi
> ++fi
> +
> + AC_ARG_ENABLE(pgresql,
> + [  --enable-pgresql               include radlib postgreSQL database support],
[snip]
> diff --git a/package/radlib/0003-radlib-fix-the-paths-in-the-subdir-objects.patch b/package/radlib/0003-radlib-fix-the-paths-in-the-subdir-objects.patch
> new file mode 100644
> index 0000000..b375eaf
> --- /dev/null
> +++ b/package/radlib/0003-radlib-fix-the-paths-in-the-subdir-objects.patch
> @@ -0,0 +1,93 @@
> +From ddcebb69533c795c1c0371eeefe856924e11ff23 Mon Sep 17 00:00:00 2001
> +From: Ray Kinsella <ray.kinsella@intel.com>
> +Date: Wed, 13 Apr 2016 16:24:34 +0100
> +Subject: [PATCH 3/3] radlib: fix the paths in the subdir-objects
> +
> +Remove paths relative to $(prefix) and CROSS_COMPILE options from
> +subdir-objects.

  I think this should be the first patch; our autoreconf will not be happy 
without subdir-objects.

> +
> +Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
> +---
> + configure.in          |  1 +
> + debug/Makefile.am     | 16 ++--------------
> + msgRouter/Makefile.am | 16 ++--------------
> + src/Makefile.am       |  1 -
> + 4 files changed, 5 insertions(+), 29 deletions(-)
> +
> +diff --git a/configure.in b/configure.in
> +index 3fb8f49..ffc0204 100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -4,6 +4,7 @@ AC_PREREQ(2.5)
> + AC_INIT([radlib],[2.12.0],[mteel2005 at gmail.com])
> + AC_CONFIG_SRCDIR([h/radmsgLog.h])
> + AM_INIT_AUTOMAKE([radlib],[2.12.0])

  Shouldn't this one be removed?

> ++AM_INIT_AUTOMAKE([subdir-objects])
> + AM_CONFIG_HEADER([config.h])
> +
> + AC_ARG_ENABLE(mysql,
> +diff --git a/debug/Makefile.am b/debug/Makefile.am
> +index 7c558ed..e732a06 100644
> +--- a/debug/Makefile.am
> ++++ b/debug/Makefile.am
> +@@ -27,18 +27,6 @@ raddebug_LDADD   += $(SQLITE3_LIBS)
> + endif
> +
> + # define library directories
> +-raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib
> +-INCLUDES         += -I$(prefix)/include -I/usr/include
> ++raddebug_LDADD += -L../src/.libs
> +
> +-if MYSQL
> +-raddebug_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
> +-else
> +-if PGRESQL
> +-raddebug_LDFLAGS += -L$(prefix)/pgsql/lib
> +-INCLUDES         += -I$(prefix)/pgsql/include
> +-endif
> +-endif
> +-
> +-if CROSSCOMPILE
> +-raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
> +-endif
> ++# removed paths relative to $(prefix)
> +diff --git a/msgRouter/Makefile.am b/msgRouter/Makefile.am
> +index 14733b7..2cf9d17 100644
> +--- a/msgRouter/Makefile.am
> ++++ b/msgRouter/Makefile.am
> +@@ -27,18 +27,6 @@ radmrouted_LDADD   += $(SQLITE3_LIBS)
> + endif
> +
> + # define library directories
> +-radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib
> +-INCLUDES           += -I$(prefix)/include -I/usr/include
> ++radmrouted_LDADD += -L../src/.libs
> +
> +-if MYSQL
> +-radmrouted_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
> +-else
> +-if PGRESQL
> +-radmrouted_LDFLAGS += -L$(prefix)/lib -L$(prefix)/pgsql/lib
> +-INCLUDES           += -I$(prefix)/pgsql/include
> +-endif
> +-endif
> +-
> +-if CROSSCOMPILE
> +-radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
> +-endif
> ++# removed paths relative to $(prefix)
> +diff --git a/src/Makefile.am b/src/Makefile.am
> +index ea1b73d..f08976b 100644
> +--- a/src/Makefile.am
> ++++ b/src/Makefile.am
> +@@ -43,7 +43,6 @@ endif
> + # define include directories
> + INCLUDES = \
> + 		-I$(top_srcdir)/h \
> +-		-I$(prefix)/include \
> + 		-D_GNU_SOURCE \
> + 		$(MY_INCLUDES) \
> + 		$(PG_INCLUDES) \
> +--
> +2.4.11
> +
> diff --git a/package/radlib/Config.in b/package/radlib/Config.in
> new file mode 100644
> index 0000000..a4a89c9
> --- /dev/null
> +++ b/package/radlib/Config.in
> @@ -0,0 +1,38 @@
> +config BR2_PACKAGE_RADLIB
> +	bool "radlib"
> +	help
> +	  radlib is a rapid application development library for unix
> +	  multi-process applications. It uses SYS V IPC facilities and
> +	  FIFOs to provide an RTOS-like, event-driven, distributed framework.
> +	  Processes may be run as daemons or have a controlling terminal.

  Lines in help text should be wrapped at 72 columns, where tab counts for 8.

> +	
> +	  http://sourceforge.net/projects/radlib/
> +
> +choice
> +	prompt "radlib database backend"
> +	depends on BR2_PACKAGE_RADLIB
> +	depends on BR2_PACKAGE_SQLITE \
> +		|| BR2_PACKAGE_MYSQL \
> +		|| BR2_PACKAGE_POSTGRESQL
> +	help
> +	  Selects the backend database: sqlite, mysql or postgresql

  I'm not really happy with this choice, I'd prefer an automatic selection. But 
it's true, if both mysql and postgresql are selected it's hard to decide which 
one should be used...

> +
> +config BR2_PACKAGE_RADLIB_SQLITE
> +	bool "sqlite"
> +	depends on BR2_PACKAGE_SQLITE
> +	help
> +	  Configure radlib to use a sqlite database backend
> +
> +config BR2_PACKAGE_RADLIB_MYSQL
> +	bool "mysql"
> +	depends on BR2_PACKAGE_MYSQL
> +	help
> +	  Configure radlib to use a mysql database backend
> +
> +config BR2_PACKAGE_RADLIB_POSTGRESQL
> +	bool "postgresql"
> +	depends on BR2_PACKAGE_POSTGRESQL
> +	help
> +	  Configure radlib to use a postgresql database backend
> +
> +endchoice
> diff --git a/package/radlib/radlib.hash b/package/radlib/radlib.hash
> new file mode 100644
> index 0000000..2fbfbba
> --- /dev/null
> +++ b/package/radlib/radlib.hash
> @@ -0,0 +1,2 @@
> +# From http://sourceforge.net/projects/radlib/files/

  Err, I see sha1 and md5 there, but not sha256. So you should take the md5 and 
sha1 from sourceforge and add the locally-calculated sha256.

> +sha256  82b98bb5e08a500dea1e4252843b9c772fa1fb67ac8ab89ed64abdd5e22eca66  radlib-2.12.0.tar.gz
> diff --git a/package/radlib/radlib.mk b/package/radlib/radlib.mk
> new file mode 100644
> index 0000000..8b8d61e
> --- /dev/null
> +++ b/package/radlib/radlib.mk
> @@ -0,0 +1,28 @@
> +################################################################################
> +#
> +# radlib
> +#
> +################################################################################
> +
> +RADLIB_VERSION = 2.12.0
> +RADLIB_SITE = http://downloads.sourceforge.net/radlib
> +RADLIB_INSTALL_STAGING = YES
> +RADLIB_LICENSE = BSD-2c
> +RADLIB_LICENSE_FILES = COPYING
> +RADLIB_AUTORECONF = YES
> +RADLIB_DEPENDENCIES = host-pkgconf
> +
> +ifeq ($(BR2_PACKAGE_RADLIB_SQLITE),y)
> +RADLIB_CONF_OPTS += --enable-sqlite
RADLIB_DEPENDENCIES += sqlite
else
RADLIB_CONF_OPTS += --disable-sqlite
> +endif
> +
> +ifeq ($(BR2_PACKAGE_RADLIB_MYSQL),y)
> +RADLIB_CONF_ENV=ac_cv_path_MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
> +RADLIB_CONF_OPTS += --enable-mysql

  Same here

> +endif
> +
> +ifeq ($(BR2_PACKAGE_RADLIB_POSTGRESQL),y)
> +RADLIB_CONF_OPTS += --enable-pgresql

  Same here

  Regards,
  Arnout

> +endif
> +
> +$(eval $(autotools-package))
>


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH v5] package/radlib: new package

[Kinsella, Ray]

Thanks Thomas,

The backend 'choice' needs to be reworked to to remove sqllite. mysql
or postgresql is used in 'raddatabase', these are mutually exclusive.
SQLite ('radsqlite') is used seperately, it can be simply be enabled or
disabled depending on whether it is BR2_PACKAGE_SQLITE is enabled.

Thanks,

Ray K


On Wed, 2016-04-20 at 17:59 +0200, Thomas Petazzoni wrote:
> Hello,
> 
> On Wed, 20 Apr 2016 15:44:14 +0000, Kinsella, Ray wrote:
> 
> > Please ignore this patch, as the current radlib build results in an
> > incorrect dynamic link table in librad. 
> > 
> > Lines like the following are just broken 
> > 
> > raddebug_LDADD   += -lmysqlclient
> > radmrouted_LDADD   += -lmysqlclient
> > 
> > or 
> > 
> > radmrouted_LDADD   += $(MYSQL_LIBS)
> > raddebug_LDADD   += $(MYSQL_LIBS)
> > 
> > The radlib library (librad.so) should link against
> > mysql/sqlite/postgresql. The radlib executables (shown above)
> > should
> > then link again radlib (librad.so). 
> 
> There were some other issues in your patch, and I was planning to
> review it. I'll try to give you some feedback so that you can take it
> into account for your v6.
> 
> Thanks,
> 
> Thomas

[Buildroot] [PATCH v5] package/radlib: new package

[Kinsella, Ray]

Thanks Arnout, 

See inline. 

On Fri, 2016-04-22 at 01:02 +0200, Arnout Vandecappelle wrote:
>   Please generate patches with the -N option; the 1/3 becomes invalid
> when a 4th 
> patch is added, or when some of the patches are accepted upstream.


ok then, so it should be a git format-patch -N. I see what you mean,
you may want to remove the patches independently as they get
upstreamed, so that would muck up the numbering. 

> Given 
> upstream's lack of updates the latter isn't very likely :-) Did you
> try to 
> submit the patches upstream?

Haven't submitted them upstream yet, on my to do list. 

>   Since the AM_CONDITIONAL is defined just above, it's better to use
> AM_COND_IF:
> 
> AM_COND_IF([PGRESQL],
>    PKG_CHECK_MODULES([POSTGRESQL], [libpq])
> )

ok, thanks for the tip.

> 
> (untested, of course).
> 
> > ++  PKG_CHECK_MODULES([POSTGRESQL], [libpq])
> > ++fi
> > +
> > + AC_ARG_ENABLE(sqlite,
> > + [  --enable-sqlite                include radlib sqlite database
> > support],
> > +@@ -32,6 +35,9 @@ AC_ARG_ENABLE(sqlite,
> > +   *) sqlite=false ;;
> > + esac],[sqlite=false])
> > + AM_CONDITIONAL(SQLITE, test x$sqlite = xtrue)
> > ++if test x$sqlite = xtrue; then
> 
>   Same here.

ok

> 
>   Same, use AM_COND_IF

ok

>   I guess there should be an error in the else branch?

makes sense.

>   I think this should be the first patch; our autoreconf will not be
> happy 
> without subdir-objects.

autoreconf does complain without the subdir-objects. The removal of the
CROSS_COMPILE in the same patch is important as the linker breaks
without it. It won't even get to linking stage if it can't find the
various database libraries fixed in the two previous patches.

Suggest a new first patch to fix sudir-objects (patch number 4.), but
then leave the other patches as they are. So the flow would be.

1. Fix subdir-objects
2. Fix sqlite + postgresql
3. Fix mysql
4. Fix the linker (CROSS_COMPILE).

What do you think?

+
> > + AM_INIT_AUTOMAKE([radlib],[2.12.0])
> 
>   Shouldn't this one be removed?
yup

>   Lines in help text should be wrapped at 72 columns, where tab
> counts for 8.

ok - I will investigate

>   I'm not really happy with this choice, I'd prefer an automatic
> selection. But 
> it's true, if both mysql and postgresql are selected it's hard to
> decide which 
> one should be used...

sent a seperate email on this.
mysql and postgresql are mutually exclusive.
sqlite lite can be safely enabled/disable depending on
BR2_PACKAGE_SQLITE.

> 
>   Err, I see sha1 and md5 there, but not sha256. So you should take
> the md5 and 
> sha1 from sourceforge and add the locally-calculated sha256.

ok 


> > +sha256 
> >  82b98bb5e08a500dea1e4252843b9c772fa1fb67ac8ab89ed64abdd5e22eca66 
> >  radlib-2.12.0.tar.gz
> RADLIB_DEPENDENCIES += sqlite
> else
> RADLIB_CONF_OPTS += --disable-sqlite

ok

> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_RADLIB_MYSQL),y)
> > +RADLIB_CONF_ENV=ac_cv_path_MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/my
> > sql_config"
> > +RADLIB_CONF_OPTS += --enable-mysql
> 
>   Same here

ok

> 
> > +endif
> > +
> > +ifeq ($(BR2_PACKAGE_RADLIB_POSTGRESQL),y)
> > +RADLIB_CONF_OPTS += --enable-pgresql
> 
>   Same here

ok

Thanks,

Ray K

[Buildroot] [PATCH v5] package/radlib: new package

[Arnout Vandecappelle]

On 04/24/16 17:15, Kinsella, Ray wrote:
> Thanks Arnout,
>
> See inline.
>
> On Fri, 2016-04-22 at 01:02 +0200, Arnout Vandecappelle wrote:
[snip]
>>   I think this should be the first patch; our autoreconf will not be
>> happy
>> without subdir-objects.

  Actually, this was a silly argument: our build will only work with all patches 
applied, of course.

>
> autoreconf does complain without the subdir-objects. The removal of the
> CROSS_COMPILE in the same patch is important as the linker breaks
> without it. It won't even get to linking stage if it can't find the
> various database libraries fixed in the two previous patches.
>
> Suggest a new first patch to fix sudir-objects (patch number 4.), but
> then leave the other patches as they are. So the flow would be.
>
> 1. Fix subdir-objects
> 2. Fix sqlite + postgresql
> 3. Fix mysql
> 4. Fix the linker (CROSS_COMPILE).
>
> What do you think?

  That sounds good. Perhaps 2+3 could be combined, it doesn't matter that much.


[snip]
>>   I'm not really happy with this choice, I'd prefer an automatic
>> selection. But
>> it's true, if both mysql and postgresql are selected it's hard to
>> decide which
>> one should be used...
>
> sent a seperate email on this.
> mysql and postgresql are mutually exclusive.
> sqlite lite can be safely enabled/disable depending on
> BR2_PACKAGE_SQLITE.

  Still, I'd prefer an automatic selection. E.g. if mysql is selected, build 
mysql support, else if pgsql is selected, build pgsql support, else disable both.


[snip]


  Regards,
  Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCH v5] package/radlib: new package

[Kinsella, Ray]

apologies for the delay in replying.

On 02/05/2016 21:44, Arnout Vandecappelle wrote:
> On 04/24/16 17:15, Kinsella, Ray wrote:
>> Thanks Arnout,
>>
>> See inline.
>>
>> On Fri, 2016-04-22 at 01:02 +0200, Arnout Vandecappelle wrote:
> [snip]
>>>   I think this should be the first patch; our autoreconf will not be
>>> happy
>>> without subdir-objects.
>
>  Actually, this was a silly argument: our build will only work with all
> patches applied, of course.

understood.

>
>>
>> autoreconf does complain without the subdir-objects. The removal of the
>> CROSS_COMPILE in the same patch is important as the linker breaks
>> without it. It won't even get to linking stage if it can't find the
>> various database libraries fixed in the two previous patches.
>>
>> Suggest a new first patch to fix sudir-objects (patch number 4.), but
>> then leave the other patches as they are. So the flow would be.
>>
>> 1. Fix subdir-objects
>> 2. Fix sqlite + postgresql
>> 3. Fix mysql
>> 4. Fix the linker (CROSS_COMPILE).
>>
>> What do you think?
>
>  That sounds good. Perhaps 2+3 could be combined, it doesn't matter that
> much.
>
>
> [snip]
>>>   I'm not really happy with this choice, I'd prefer an automatic
>>> selection. But
>>> it's true, if both mysql and postgresql are selected it's hard to
>>> decide which
>>> one should be used...
>>
>> sent a seperate email on this.
>> mysql and postgresql are mutually exclusive.
>> sqlite lite can be safely enabled/disable depending on
>> BR2_PACKAGE_SQLITE.
>
>  Still, I'd prefer an automatic selection. E.g. if mysql is selected,
> build mysql support, else if pgsql is selected, build pgsql support,
> else disable both.

ok - that will mean there is always an implicit bias for mysql.
I am fine with that being the case.

>
>
> [snip]
>
>
>  Regards,
>  Arnout
>