Commit 610d64b4 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

poco: unbreak mysql support 



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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent ddb8c639

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

+5 −4
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ From: Baruch Siach <baruch@tkos.co.il> 
Subject: [PATCH] poco: add the staging path to search path



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

make command line.

preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables

must be set from the make command line.



[Peter: Remove host dirs, add MYSQL_INCDIR]

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

-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

+INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include -I=/mysql

+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient

+INCLUDE += -I$(MYSQL_INCDIR)

 SYSFLAGS += -DTHREADSAFE -DNO_TCL

 

 objects = Binder Extractor SessionImpl Connector \

package/poco/poco.mk

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ endef 


define POCO_BUILD_CMDS

	$(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



define POCO_INSTALL_STAGING_CMDS