bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[package] radlib: bump version to 2.12.0, add sqlite

Browse Source 
This is the latest official version. Currently tested only with wview as there
are no other packages in the repository depending on radlib.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@33082 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-08-10 15:49:20 +00:00
parent fe2fb38758
commit 289047f9bb
3 changed files with 107 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libs/radlib/Makefile
View File

@ -8,18 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=radlib
PKG_VERSION:=2.8.5
PKG_RELEASE:=2
PKG_VERSION:=2.12.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/radlib
PKG_MD5SUM:=82ab0c702e55a860b69ad76e2aac748f
ifeq ($(CONFIG_EXTERNAL_KERNEL_TREE),)
PATCH_DIR:=
else
PATCH_DIR:=./patches
endif
PKG_SHA1SUM:=1b3feace6d0361436c9e4ce9b06856195a5ac1b1
PKG_FIXUP:=autoreconf
@ -28,6 +22,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/radlib
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libpthread
TITLE:=Rapid Application Development Library
URL:=http://www.radlib.teel.ws/
endef
@ -36,13 +31,43 @@ define Package/radlib/description
radlib is a rapid application development library for unix multi-process applications
endef
define Package/radlib-sqlite
$(call Package/radlib)
VARIANT:=sqlite
DEPENDS+=+libsqlite3
TITLE+= (sqlite)
endef
define Package/radlib-sqlite/description
$(call Package/radlib/description)
This package comes with sqlite support
endef
CONFIGURE_ARGS += \
--prefix="$(TOOLCHAIN_DIR)/usr"
define Package/radlib/install
ifeq ($(BUILD_VARIANT),sqlite)
CONFIGURE_ARGS += \
--enable-sqlite
endif
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_BUILD_DIR)/h/rad*.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/.libs/librad.so $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/src/.libs/librad.so* $(1)/usr/lib/
endef
define Package/radlib/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/.libs/librad.so* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/msgRouter/.libs/radmrouted $(1)/usr/bin/
endef
define Package/radlib-sqlite/install
$(call Package/radlib/install,$(1))
endef
$(eval $(call BuildPackage,radlib))
$(eval $(call BuildPackage,radlib-sqlite))

71
libs/radlib/patches/001-cross_compile_link_bug.patch Normal file
View File

@ -0,0 +1,71 @@
--- a/debug/Makefile.am
+++ b/debug/Makefile.am
@@ -27,8 +27,8 @@ raddebug_LDADD += -lsqlite3
endif
# define library directories
-raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib
-INCLUDES += -I$(prefix)/include -I/usr/include
+raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib
+INCLUDES += -I$(prefix)/include
if MYSQL
raddebug_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
@@ -39,6 +39,6 @@ INCLUDES += -I$(prefix)/pgsql/in
endif
endif
-if CROSSCOMPILE
-raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
-endif
+#if CROSSCOMPILE
+#raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
+#endif
--- a/msgRouter/Makefile.am
+++ b/msgRouter/Makefile.am
@@ -27,8 +27,8 @@ radmrouted_LDADD += -lsqlite3
endif
# define library directories
-radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib
-INCLUDES += -I$(prefix)/include -I/usr/include
+radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib
+INCLUDES += -I$(prefix)/include
if MYSQL
radmrouted_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
@@ -39,6 +39,6 @@ INCLUDES += -I$(prefix)/pgsql/
endif
endif
-if CROSSCOMPILE
-radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
-endif
+#if CROSSCOMPILE
+#radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
+#endif
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,9 +34,6 @@ PGSQL_HDRS = \
$(top_srcdir)/database/postgresql/_pg-types.h
endif
if SQLITE
-SQ_INCLUDES = \
- -I$(prefix)/include \
- -I/usr/include
SQ_SOURCES = \
$(top_srcdir)/src/radsqlite.c
SQLITE_HDRS = \
@@ -46,11 +43,9 @@ endif
# define include directories
INCLUDES = \
-I$(top_srcdir)/h \
- -I$(prefix)/include \
-D_GNU_SOURCE \
$(MY_INCLUDES) \
- $(PG_INCLUDES) \
- $(SQ_INCLUDES)
+ $(PG_INCLUDES)

44
libs/radlib/patches/001-cross_link_bug.patch
View File

@ -1,44 +0,0 @@
diff -urN radlib-2.8.4/debug/Makefile.am radlib-2.8.42/debug/Makefile.am
--- radlib-2.8.4/debug/Makefile.am 2009-02-05 06:10:01.000000000 +0100
+++ radlib-2.8.42/debug/Makefile.am 2009-10-04 16:40:08.000000000 +0200
@@ -43,5 +43,5 @@
endif
if CROSSCOMPILE
-raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
+#raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
endif
diff -urN radlib-2.8.4/debug/Makefile.in radlib-2.8.42/debug/Makefile.in
--- radlib-2.8.4/debug/Makefile.in 2009-08-15 16:03:37.000000000 +0200
+++ radlib-2.8.42/debug/Makefile.in 2009-10-04 16:40:17.000000000 +0200
@@ -43,7 +43,7 @@
@MYSQL_FALSE@@PGRESQL_TRUE@am__append_6 = -I$(prefix)/pgsql/include
@SQLITE_TRUE@am__append_7 = -L/usr/lib -L/usr/local/lib
@SQLITE_TRUE@am__append_8 = -I/usr/include -I/usr/local/include
-@CROSSCOMPILE_TRUE@am__append_9 = $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
+#@CROSSCOMPILE_TRUE@am__append_9 = $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
subdir = debug
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff -urN radlib-2.8.4/msgRouter/Makefile.am radlib-2.8.42/msgRouter/Makefile.am
--- radlib-2.8.4/msgRouter/Makefile.am 2009-02-05 06:10:01.000000000 +0100
+++ radlib-2.8.42/msgRouter/Makefile.am 2009-10-04 16:31:24.000000000 +0200
@@ -44,5 +44,5 @@
endif
if CROSSCOMPILE
-radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
+#radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
endif
diff -urN radlib-2.8.4/msgRouter/Makefile.in radlib-2.8.42/msgRouter/Makefile.in
--- radlib-2.8.4/msgRouter/Makefile.in 2009-08-15 16:03:37.000000000 +0200
+++ radlib-2.8.42/msgRouter/Makefile.in 2009-10-04 16:36:01.000000000 +0200
@@ -43,7 +43,7 @@
@MYSQL_FALSE@@PGRESQL_TRUE@am__append_6 = -I$(prefix)/pgsql/include
@SQLITE_TRUE@am__append_7 = -L/usr/lib -L/usr/local/lib
@SQLITE_TRUE@am__append_8 = -I/usr/include -I/usr/local/include
-@CROSSCOMPILE_TRUE@am__append_9 = $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
+#@CROSSCOMPILE_TRUE@am__append_9 = $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
subdir = msgRouter
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4