|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
--- apk-tools-2.6.8/Make.rules.orig 2016-10-25 10:06:30.000000000 +0200
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
@@ -70,7 +70,7 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
INSTALLDIR := $(INSTALL) -d
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
CFLAGS ?= -g -O2
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
-CFLAGS_ALL := -Werror -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
+CFLAGS_ALL := -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
CFLAGS_ALL += $(CFLAGS)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
LDFLAGS ?= -g
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
--- apk-tools-2.6.8/src/apk.c.orig 2016-10-25 10:06:30.000000000 +0200
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
@@ -428,12 +428,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) |
09c779 |
--- apk-tools-2.6.8/src/Makefile.orig 2016-10-25 10:06:30.000000000 +0200
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
@@ -7,13 +7,13 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
-FETCH_LIBS := $(shell $(CC) -print-file-name=libfetch.a)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
+FETCH_LIBS := $(shell $(CC) -print-file-name=$(PREFIX)/lib/libfetch.a)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
3243be |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
09c779 |
# 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
|