0001-poco-add-the-staging-path-to-search-path.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From b8417607ec8840e6a1e27cf03b6958c794a33e49 Mon Sep 17 00:00:00 2001
  2. From: Baruch Siach <baruch@tkos.co.il>
  3. Date: Tue, 4 Aug 2015 10:14:00 +0200
  4. Subject: [PATCH 1/2] poco: add the staging path to search path
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Add the mysql headers and client libraries to the search path of the
  9. preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables
  10. must be set from the make command line.
  11. [Peter: Remove host dirs, add MYSQL_INCDIR]
  12. Signed-off-by: Baruch Siach <baruch@tkos.co.il>
  13. [Jörg: Update to version 1.6.1 from github]
  14. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
  15. ---
  16. Data/MySQL/Makefile | 4 ++--
  17. 1 file changed, 2 insertions(+), 2 deletions(-)
  18. diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile
  19. index 0b18ca5..094e807 100644
  20. --- a/Data/MySQL/Makefile
  21. +++ b/Data/MySQL/Makefile
  22. @@ -8,8 +8,8 @@
  23. include $(POCO_BASE)/build/rules/global
  24. -SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient
  25. -INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include
  26. +SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient
  27. +INCLUDE += -I$(MYSQL_INCDIR)
  28. SYSFLAGS += -DTHREADSAFE -DNO_TCL
  29. objects = Binder Extractor SessionImpl Connector \
  30. --
  31. 2.5.0