From b3a84fa0d00a5c08bdd93e266dacee9430789e55 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 27 Mar 2013 02:21:45 +0100 Subject: [PATCH] Both the PostgreSQL and the Template engines require libSystem to build --- src/engines/Makefile | 8 ++++---- src/engines/project.conf | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/engines/Makefile b/src/engines/Makefile index 23aa73d..2bec5f0 100644 --- a/src/engines/Makefile +++ b/src/engines/Makefile @@ -26,8 +26,8 @@ pdo.so: $(pdo_OBJS) $(CCSHARED) -o pdo.so $(pdo_OBJS) $(pdo_LDFLAGS) pgsql_OBJS = pgsql.o -pgsql_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -I `pg_config --includedir` $(CFLAGSF) $(CFLAGS) -pgsql_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L `pg_config --libdir` -Wl,-rpath,`pg_config --libdir` `pg_config --libs` -lpq +pgsql_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -I `pg_config --includedir` $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem` +pgsql_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --cflags libSystem` -L `pg_config --libdir` -Wl,-rpath,`pg_config --libdir` `pg_config --libs` -lpq pgsql.so: $(pgsql_OBJS) $(CCSHARED) -o pgsql.so $(pgsql_OBJS) $(pgsql_LDFLAGS) @@ -47,8 +47,8 @@ sqlite3.so: $(sqlite3_OBJS) $(CCSHARED) -o sqlite3.so $(sqlite3_OBJS) $(sqlite3_LDFLAGS) template_OBJS = template.o -template_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -template_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) +template_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem` +template_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem` template.so: $(template_OBJS) $(CCSHARED) -o template.so $(template_OBJS) $(template_LDFLAGS) diff --git a/src/engines/project.conf b/src/engines/project.conf index 824a251..d7729ab 100644 --- a/src/engines/project.conf +++ b/src/engines/project.conf @@ -18,7 +18,8 @@ cppflags=-D PREFIX=\"$(PREFIX)\" [pgsql] type=plugin cppflags=-I `pg_config --includedir` -ldflags=-L `pg_config --libdir` -Wl,-rpath,`pg_config --libdir` `pg_config --libs` -lpq +cflags=`pkg-config --cflags libSystem` +ldflags=`pkg-config --cflags libSystem` -L `pg_config --libdir` -Wl,-rpath,`pg_config --libdir` `pg_config --libs` -lpq sources=pgsql.c install=$(LIBDIR)/Database/engine @@ -47,6 +48,8 @@ depends=../../include/Database/database.h [template] type=plugin +cflags=`pkg-config --cflags libSystem` +ldflags=`pkg-config --libs libSystem` sources=template.c [template.c]