|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
--- apk-tools-2.6.6/src/apk.c.orig 2016-02-09 15:57:53.000000000 +0100
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
+++ apk-tools-2.6.6/src/apk.c 2016-03-09 10:24:39.763540600 +0100
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
@@ -425,12 +425,15 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
static void apk_applet_register_builtin(void)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
{
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
+#if 0
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
extern apk_init_func_t __start_initapplets[], __stop_initapplets[];
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
apk_init_func_t *p;
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
list_init(&apk_applet_list);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
for (p = __start_initapplets; p < __stop_initapplets; p++)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
(*p)();
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
+#endif
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
+ list_init(&apk_applet_list);
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
}
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
int main(int argc, char **argv)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
--- apk-tools-2.6.6/Make.rules.orig 2016-02-09 15:57:53.000000000 +0100
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
+++ apk-tools-2.6.6/Make.rules 2016-03-09 10:44:12.457459300 +0100
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
@@ -70,7 +70,7 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
INSTALLDIR := $(INSTALL) -d
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
CFLAGS ?= -g -O2
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
-CFLAGS_ALL := -Werror -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
+CFLAGS_ALL := -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
CFLAGS_ALL += $(CFLAGS)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
LDFLAGS ?= -g
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
--- apk-tools-2.6.6/src/Makefile.orig 2016-02-09 14:57:53.000000000 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
+++ apk-tools-2.6.6/src/Makefile 2016-06-23 08:14:37.843747529 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
@@ -1,12 +1,12 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
PKGDEPS := openssl zlib
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
-PKG_CONFIG ?= pkg-config
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
+PKG_CONFIG ?= $(PKG_TARGET)-pkg-config
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
LUAAPK ?= yes
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
# lua module
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
ifneq ($(LUAAPK),)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
LUA_VERSION ?= 5.2
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
LUA_PC ?= lua$(LUA_VERSION)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
-LUA_LIBDIR ?= /usr/lib/lua/$(LUA_VERSION)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
+LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUA_VERSION)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
LIBAPK := YesPlease
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
shlibs-y += apk.so
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
apk.so-objs := lua-apk.o
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
@@ -66,7 +66,7 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
LDFLAGS_apk-test += -L$(obj)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
CFLAGS_ALL += $(shell $(PKG_CONFIG) --cflags $(PKGDEPS))
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
-LIBS := /usr/lib/libfetch.a \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
+LIBS := $(PREFIX)/lib/libfetch.a \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
-Wl,--as-needed \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
$(shell $(PKG_CONFIG) --libs $(PKGDEPS)) \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
5a3901 |
-Wl,--no-as-needed
|