diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-06-23 08:50:09 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2016-06-23 08:50:09 +0000 |
| commit | 3243be768ad8a601b2636be4dd23dbb6c2d7dd9b (patch) | |
| tree | cabb6414ea898fa0e0375aa4d0603861819d854c /apk-tools-2.6.6.local.patch | |
| parent | a0c044e739c6161692408ee2595870e184640f27 (diff) | |
| download | midipix_build-3243be768ad8a601b2636be4dd23dbb6c2d7dd9b.tar.bz2 midipix_build-3243be768ad8a601b2636be4dd23dbb6c2d7dd9b.tar.xz | |
- Adds and integrates pkgconf_host and pkgconf; fixes Irssi and other
packages that depend on pkg-config(1) and makes their build variables
significantly less hacky (apk_tools, irssi, nano, ncurses, ncursestw
ncursesw, and pacman.) pkgconf_host installs a ${TARGET}-pkg-config
wrapper script that passes --define-variable=prefix=${PREFIX_NATIVE}
when cross-compiling.
- Adds -i flag to insert a link to pkg.build for a new build script
and automatically rename build scripts with higher consecutive build
levels.
- Consistently quote [(1) operands correctly wherever necessary.
- Reorganise build level 3 script levels:
1) 300-319: library dependencies, ordered by dependencies and alphabetically,
2) 320-389: leaf packages, ordered alphabetically.
Diffstat (limited to 'apk-tools-2.6.6.local.patch')
| -rw-r--r-- | apk-tools-2.6.6.local.patch | 62 |
1 files changed, 18 insertions, 44 deletions
diff --git a/apk-tools-2.6.6.local.patch b/apk-tools-2.6.6.local.patch index ab7a6afd..df03820e 100644 --- a/apk-tools-2.6.6.local.patch +++ b/apk-tools-2.6.6.local.patch @@ -16,11 +16,23 @@ } int main(int argc, char **argv) ---- apk-tools-2.6.6/src/Makefile.orig 2016-02-09 15:57:53.000000000 +0100 -+++ apk-tools-2.6.6/src/Makefile 2016-03-09 10:28:09.862286100 +0100 -@@ -1,26 +1,20 @@ +--- apk-tools-2.6.6/Make.rules.orig 2016-02-09 15:57:53.000000000 +0100 ++++ apk-tools-2.6.6/Make.rules 2016-03-09 10:44:12.457459300 +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 + CFLAGS_ALL += $(CFLAGS) + + LDFLAGS ?= -g +--- apk-tools-2.6.6/src/Makefile.orig 2016-02-09 14:57:53.000000000 +0000 ++++ apk-tools-2.6.6/src/Makefile 2016-06-23 08:14:37.843747529 +0000 +@@ -1,12 +1,12 @@ PKGDEPS := openssl zlib -PKG_CONFIG ?= pkg-config ++PKG_CONFIG ?= $(PKG_TARGET)-pkg-config LUAAPK ?= yes # lua module @@ -32,50 +44,12 @@ 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_LIB-y := $(obj)/apk.so - install-LUA_LIB-y := $(INSTALLDIR) $(DESTDIR)$(LUA_LIBDIR) && \ - $(INSTALL) $(LUA_LIB-y) $(DESTDIR)$(LUA_LIBDIR) - endif - --ifeq ($(shell $(PKG_CONFIG) --print-errors --exists $(PKGDEPS) || echo fail),fail) --$(error Build dependencies are not met) --endif -- - progs-y += apk - apk-objs := apk.o add.o del.o fix.o update.o info.o \ - search.o upgrade.o cache.o ver.o index.o fetch.o \ -@@ -65,10 +59,8 @@ - LDFLAGS_apk += -L$(obj) +@@ -66,7 +66,7 @@ LDFLAGS_apk-test += -L$(obj) --CFLAGS_ALL += $(shell $(PKG_CONFIG) --cflags $(PKGDEPS)) + CFLAGS_ALL += $(shell $(PKG_CONFIG) --cflags $(PKGDEPS)) -LIBS := /usr/lib/libfetch.a \ +LIBS := $(PREFIX)/lib/libfetch.a \ -Wl,--as-needed \ -- $(shell $(PKG_CONFIG) --libs $(PKGDEPS)) \ + $(shell $(PKG_CONFIG) --libs $(PKGDEPS)) \ -Wl,--no-as-needed - - $(obj)/apk: $(LIBAPK-y) ---- apk-tools-2.6.6/Make.rules.orig 2016-02-09 15:57:53.000000000 +0100 -+++ apk-tools-2.6.6/Make.rules 2016-03-09 10:44:12.457459300 +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 - CFLAGS_ALL += $(CFLAGS) - - LDFLAGS ?= -g -@@ -225,7 +225,7 @@ - quiet_cmd_ld = LD $@ - cmd_ld = $(CC) $(ld_flags) -o $@ \ - $(addprefix $(obj)/,$($(@F)-objs)) \ -- $(LIBS) $(LIBS_$(@F)) -+ $(LIBS) $(LIBS_$(@F)) $(LDFLAGS_LIBS) - - $(__progs): override local-target-prereqs=$(addprefix $(obj)/,$($(*F)-objs)) - |