blob: 94c7da68c7aed8adcf98fc87c15c6b6191d5b645 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
--- apk-tools-2.6.8/Make.rules.orig 2016-10-25 10:06:30.000000000 +0200
+++ apk-tools-2.6.8/Make.rules 2016-12-17 21:23:39.261695200 +0100
@@ -70,7 +70,7 @@
INSTALLDIR := $(INSTALL) -d
CFLAGS ?= -g -O2
-CFLAGS_ALL := -Werror -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC
+CFLAGS_ALL := -Wall -Wstrict-prototypes -D_GNU_SOURCE -std=gnu99 -fPIC --include=sys/sysmacros.h
CFLAGS_ALL += $(CFLAGS)
LDFLAGS ?= -g
--- apk-tools-2.6.8/src/apk.c.orig 2016-10-25 10:06:30.000000000 +0200
+++ apk-tools-2.6.8/src/apk.c 2016-12-17 21:22:30.592520300 +0100
@@ -428,12 +428,15 @@
static void apk_applet_register_builtin(void)
{
+#if 0
extern apk_init_func_t __start_initapplets[], __stop_initapplets[];
apk_init_func_t *p;
list_init(&apk_applet_list);
for (p = __start_initapplets; p < __stop_initapplets; p++)
(*p)();
+#endif
+ list_init(&apk_applet_list);
}
int main(int argc, char **argv)
--- apk-tools-2.6.8/src/Makefile.orig 2016-10-25 08:06:30.000000000 +0000
+++ apk-tools-2.6.8/src/Makefile 2017-12-03 15:36:54.260000000 +0000
@@ -1,24 +1,15 @@
-PKG_CONFIG ?= pkg-config
LUAAPK ?= yes
-OPENSSL_CFLAGS := $(shell $(PKG_CONFIG) --cflags openssl)
-OPENSSL_LIBS := $(shell $(PKG_CONFIG) --libs openssl)
-
-ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
-ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
-
-FETCH_LIBS := $(shell $(CC) -print-file-name=libfetch.a)
+FETCH_LIBS := $(shell $(CC) -print-file-name=$(PREFIX)/lib/libfetch.a)
# lua module
ifneq ($(LUAAPK),)
LUA_VERSION ?= 5.2
LUA_PC ?= lua$(LUA_VERSION)
-LUA_LIBDIR ?= /usr/lib/lua/$(LUA_VERSION)
LIBAPK := YesPlease
shlibs-y += apk.so
apk.so-objs := lua-apk.o
-CFLAGS_lua-apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\" \
- $(shell $(PKG_CONFIG) $(LUA_PC) --cflags)
+CFLAGS_lua-apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\" $(LUA_CFLAGS)
LUA_LIB-y := $(obj)/apk.so
install-LUA_LIB-y := $(INSTALLDIR) $(DESTDIR)$(LUA_LIBDIR) && \
$(INSTALL) $(LUA_LIB-y) $(DESTDIR)$(LUA_LIBDIR)
|
