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 | |
| parent | 4e1226a2020c9ad19d070d438117d0565a321770 (diff) | |
| download | aports-9da706a07ba62a31a3a758c34c64320889639538.tar.bz2 aports-9da706a07ba62a31a3a758c34c64320889639538.tar.xz | |
main/lua-ldbus: fix package
Diffstat (limited to 'main')
| -rw-r--r-- | main/lua-ldbus/APKBUILD | 16 | ||||
| -rw-r--r-- | main/lua-ldbus/fix-makefile.patch | 22 |
2 files changed, 23 insertions, 15 deletions
diff --git a/main/lua-ldbus/APKBUILD b/main/lua-ldbus/APKBUILD index 982942ba6c..91fb87ee55 100644 --- a/main/lua-ldbus/APKBUILD +++ b/main/lua-ldbus/APKBUILD @@ -1,9 +1,9 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Timo Teräs <timo.teras@iki.fi> _luaversions="5.1 5.2 5.3" pkgname=lua-ldbus pkgver=20150430 _commitid=9f6db626600eb7e04000368da947e0c5cd175fb5 -pkgrel=0 +pkgrel=1 pkgdesc="Lua D-Bus bindings" url="https://github.com/daurnimator/ldbus" arch="all" @@ -13,12 +13,13 @@ subpackages="" makedepends="dbus-dev" install="" source="ldbus-$pkgver.tar.gz::https://github.com/daurnimator/ldbus/archive/$_commitid.tar.gz + 0001-fix-lua_State-usage-for-callbacks.patch fix-makefile.patch " for _i in $_luaversions; do makedepends="$makedepends lua${_i}-dev" - subpackages="$subpackages lua${_i}-dbus:_split_${_i/./}" + subpackages="$subpackages lua${_i}-ldbus:_split_${_i/./}" done _builddir="$srcdir"/ldbus-$_commitid/src @@ -68,8 +69,11 @@ done md5sums="0688d0bc571483a28341c53acc57ded9 ldbus-20150430.tar.gz -c6f40fa1880ba35a0553e281f532f0e6 fix-makefile.patch" +4bc07c735305000e6c4498e001665a0d 0001-fix-lua_State-usage-for-callbacks.patch +e6c33b8dbe4baa5575458f793ff67515 fix-makefile.patch" sha256sums="3f8eabe8a7f73214bc774faa428d1bb3a4a4b8c0f6712c2fffa4646b71020cfd ldbus-20150430.tar.gz -2b9eab47aa85510026bc5aca43b39095d09176ae6a397a7e51db2a51707ba5a5 fix-makefile.patch" +0aefb31c23b2b0da83d3722a5fd84fe65f5f96719bbea4549e5dd5287386b44a 0001-fix-lua_State-usage-for-callbacks.patch +136f38538d4c63288baebee869bf1cd8cc17e5370f0bf07cac71e30ae110d88c fix-makefile.patch" sha512sums="cab609800b3d67bb6fd533b62179345430e822ad30c711bc8f35cb079353108339288eb7adc374a681bb4f42b66cfd025cff4591fd9cbef045acad41e72d3073 ldbus-20150430.tar.gz -63f54e86d1c879d584ff79d384f24f1e5af15d39506ce8bba5c8562ec826e430b273537650639337869758ca7333dfa6af641ad16bca7c1582f628120ad8f01a fix-makefile.patch" +77d631acfa58ad28868a7ccd8a3ec3f5e44357f0243cdf373037955b5961bc84094790d137a05a47b3cd26665d5afcfc1491b361dd895797fe317fe7e947a252 0001-fix-lua_State-usage-for-callbacks.patch +ee9dfa64598cb856602d70f7d15b4783423799ed428ed3c2f6f28d1085dd14c34204cd38fa390574b982237858d0c8970f5f517827310d780afe2bd32e496380 fix-makefile.patch" 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) |