NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poco: unbreak mysql support

Browse Source 
Update patch to also pass include directory for mysql headers, and get
rid of host directories in -L / -I arguments. Finally look in
staging rather than target for libmysqlclient.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2011-10-08 23:06:43 +02:00
parent ddb8c639c3
commit 610d64b4b9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/poco/poco-1.4.2p1-add-staging-search-path.patch
View File

@ -2,9 +2,10 @@ From: Baruch Siach <baruch@tkos.co.il>
Subject: [PATCH] poco: add the staging path to search path Subject: [PATCH] poco: add the staging path to search path
Add the mysql headers and client libraries to the search path of the Add the mysql headers and client libraries to the search path of the
preprocessor and the linker. The $MYSQL_LIBDIR variable must be set from the preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables
make command line. must be set from the make command line.
[Peter: Remove host dirs, add MYSQL_INCDIR]
Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
--- ---
--- poco-1.4.1p1-all-dist/Data/MySQL/Makefile 2011-02-09 11:13:00.000000000 +0200 --- poco-1.4.1p1-all-dist/Data/MySQL/Makefile 2011-02-09 11:13:00.000000000 +0200
@ -15,8 +16,8 @@ Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-SYSLIBS += -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient -SYSLIBS += -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient
-INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include -INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include
+SYSLIBS += -L$(MYSQL_LIBDIR) -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient +SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient
+INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include -I=/mysql +INCLUDE += -I$(MYSQL_INCDIR)
SYSFLAGS += -DTHREADSAFE -DNO_TCL SYSFLAGS += -DTHREADSAFE -DNO_TCL
objects = Binder Extractor SessionImpl Connector \ objects = Binder Extractor SessionImpl Connector \

3
package/poco/poco.mk
View File

@ -43,7 +43,8 @@ endef
define POCO_BUILD_CMDS define POCO_BUILD_CMDS
$(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSSENV=$(TARGET_CROSS) \ $(MAKE) POCO_TARGET_OSARCH=$(ARCH) CROSSENV=$(TARGET_CROSS) \
MYSQL_LIBDIR=$(TARGET_DIR)/usr/lib/mysql -C $(@D) MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \
MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql -C $(@D)
endef endef
define POCO_INSTALL_STAGING_CMDS define POCO_INSTALL_STAGING_CMDS