diff options
author | Timo Teräs <timo.teras@iki.fi> | 2015-10-19 07:12:51 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2015-10-19 07:12:51 +0000 |
commit | 9da706a07ba62a31a3a758c34c64320889639538 (patch) | |
tree | 5d492e4e41119551a581992bfe5b15758b395e97 /main/lua-ldbus/fix-makefile.patch | |
parent | 4e1226a2020c9ad19d070d438117d0565a321770 (diff) | |
download | aports-9da706a07ba62a31a3a758c34c64320889639538.tar.bz2 aports-9da706a07ba62a31a3a758c34c64320889639538.tar.xz |
main/lua-ldbus: fix package
Diffstat (limited to 'main/lua-ldbus/fix-makefile.patch')
-rw-r--r-- | main/lua-ldbus/fix-makefile.patch | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/main/lua-ldbus/fix-makefile.patch b/main/lua-ldbus/fix-makefile.patch index 781efe7c2a..04dd6fa1f4 100644 --- a/main/lua-ldbus/fix-makefile.patch +++ b/main/lua-ldbus/fix-makefile.patch @@ -1,16 +1,20 @@ --- ldbus-9f6db626600eb7e04000368da947e0c5cd175fb5.orig/src/Makefile +++ ldbus-9f6db626600eb7e04000368da947e0c5cd175fb5/src/Makefile -@@ -1,22 +1,32 @@ +@@ -1,22 +1,33 @@ -LUA_LIBDIR = /usr/local/lib/lua/5.3 +LUA_VERSION ?= 5.3 +LUA_LIBDIR = /usr/local/lib/lua/$(LUA_VERSION) -+O = obj$(LUA_VERSION) - CFLAGS += -Wall -Wextra --pedantic -Wno-long-long +-CFLAGS += -Wall -Wextra --pedantic -Wno-long-long -CFLAGS += `pkg-config --cflags lua5.3 dbus-1` -+CFLAGS += `pkg-config --cflags lua$(LUA_VERSION) dbus-1` - CFLAGS += -fPIC - CFLAGS += -I ../vendor/compat-5.3/c-api +-CFLAGS += -fPIC +-CFLAGS += -I ../vendor/compat-5.3/c-api ++O = obj$(LUA_VERSION) ++MY_CFLAGS += $(CFLAGS) ++MY_CFLAGS += -Wall -Wextra --pedantic -Wno-long-long ++MY_CFLAGS += `pkg-config --cflags lua$(LUA_VERSION) dbus-1` ++MY_CFLAGS += -g -fPIC ++MY_CFLAGS += -I ../vendor/compat-5.3/c-api LIBS = `pkg-config --libs dbus-1` @@ -24,14 +28,14 @@ - $(CC) -o ldbus.so -shared $(CFLAGS) $^ $(LIBS) +$(O)/compat-5.3.o: ../vendor/compat-5.3/c-api/compat-5.3.c + @mkdir -p $(O) -+ $(CC) -c -o $@ $(CFLAGS) $< ++ $(CC) -c -o $@ $(MY_CFLAGS) $< +$(O)/%.o: %.c + @mkdir -p $(O) -+ $(CC) -c -o $@ $(CFLAGS) $< ++ $(CC) -c -o $@ $(MY_CFLAGS) $< + +$(O)/ldbus.so: $(OBJS) -+ $(CC) -o $@ -shared $(CFLAGS) $^ $(LIBS) ++ $(CC) -o $@ -shared $(MY_CFLAGS) $^ $(LIBS) + clean: rm -f -- ldbus.so $(OBJS) |