package/radlib: new package

From: Ray Kinsella <[email protected]>

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 <[email protected]>

---

package/radlib/0001-radlib-introduce-pkg-config-for-sqlite-and-postgresq.patch new file +10 -0

+
+Retrieve cflags and linker options for sqlite and postgresql using pkg-config.
+
+Signed-off-by: Ray Kinsella <[email protected]>
+---
+ configure.in          | 6 ++++++
+ debug/Makefile.am     | 4 ++--
+ msgRouter/Makefile.am | 4 ++--
+ src/Makefile.am       | 6 ++----
+ 4 files changed, 12 insertions(+), 8 deletions(-)

package/radlib/0001-radlib-introduce-pkg-config-for-sqlite-and-postgresq.patch new file +5 -0

++  PKG_CHECK_MODULES([SQLITE3], [sqlite3])
++fi
+
+ # Check for big endian host:
+ AC_C_BIGENDIAN()

package/radlib/0002-radlib-introduce-mysql-config.patch new file +14 -0

new file mode 100644
index 0000000..d778d42
@@ -0,0 +1,78 @@
+From c70ccfd485b87f9ffe065b82588aa158743620a0 Mon Sep 17 00:00:00 2001
+From: Ray Kinsella <[email protected]>
+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 <[email protected]>
+---
+ configure.in          | 9 +++++++++
+ debug/Makefile.am     | 2 +-
+ msgRouter/Makefile.am | 2 +-
+ src/Makefile.am       | 3 +--
+ 4 files changed, 12 insertions(+), 4 deletions(-)

package/radlib/0002-radlib-introduce-mysql-config.patch new file +5 -0

++  fi
++fi
+
+ AC_ARG_ENABLE(pgresql,
+ [  --enable-pgresql               include radlib postgreSQL database support],

package/radlib/0003-radlib-fix-the-paths-in-the-subdir-objects.patch new file +7 -0

+
+Signed-off-by: Ray Kinsella <[email protected]>
+---
+ configure.in          |  1 +
+ debug/Makefile.am     | 16 ++--------------
+ msgRouter/Makefile.am | 16 ++--------------
+ src/Makefile.am       |  1 -

package/radlib/0003-radlib-fix-the-paths-in-the-subdir-objects.patch new file +69 -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
+

package/radlib/Config.in new file +0 -0

new file mode 100644
index 0000000..a4a89c9

package/radlib/Config.in new file +20 -0

+
+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

package/radlib/radlib.hash new file +0 -0

new file mode 100644
index 0000000..2fbfbba

package/radlib/radlib.hash new file +1 -0

+sha256  82b98bb5e08a500dea1e4252843b9c772fa1fb67ac8ab89ed64abdd5e22eca66  radlib-2.12.0.tar.gz

package/radlib/radlib.mk new file +6 -0

new file mode 100644
index 0000000..8b8d61e
@@ -0,0 +1,28 @@
+################################################################################
+#
+# radlib
+#
+################################################################################
+

package/radlib/radlib.mk new file +3 -0

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

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?

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).

Quoted 11 lines

++ 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.

Same, use AM_COND_IF

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

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

Quoted 1 line

+ AM_INIT_AUTOMAKE([radlib],[2.12.0])

Shouldn't this one be removed?

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

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...

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.

Quoted 3 lines

+sha256
82b98bb5e08a500dea1e4252843b9c772fa1fb67ac8ab89ed64abdd5e22eca66 radlib-2.12.0.tar.gz

RADLIB_DEPENDENCIES += sqlite
else
RADLIB_CONF_OPTS += --disable-sqlite

Quoted 6 lines

package/radlib/radlib.mk new file +4 -0

+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

package/radlib/radlib.mk line 25

Quoted 5 lines

package/radlib/radlib.mk new file +4 -0

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

Same here

Thanks Arnout,

See inline.

On Fri, 2016-04-22 at 01:02 +0200, Arnout Vandecappelle wrote:

Quoted 3 lines

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?

Quoted 5 lines

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.

Quoted 4 lines · Ray

Thanks Arnout,

See inline.

Quoted 1 line · Arnout Vandecappelle

[snip]

Quoted 3 lines

Quoted 3 lines

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.

Quoted 10 lines

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.

Quoted 6 lines

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]

Quoted 6 lines

Quoted 5 lines

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...

Quoted 4 lines

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

From: Ray Kinsella <[email protected]>

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

(quoted diff) +0 -3

-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

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).

Hello,

Quoted 10 lines · Ray

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

Quoted 7 lines

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