mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2024-12-21 06:30:05 +00:00
abuild: automatically replace the config.sub with our version
introduce post_unpack that by default will search for config.sub and config.guess and replace those if found. we ship our own version of those files
This commit is contained in:
parent
d1b6da646e
commit
8c12f9f61e
10
Makefile
10
Makefile
@ -16,10 +16,11 @@ SCRIPTS := abuild buildrepo abuild-keygen abuild-sign newapkbuild \
|
||||
USR_BIN_FILES := $(SCRIPTS) abuild-tar abuild-sudo
|
||||
SAMPLES := sample.APKBUILD sample.initd sample.confd \
|
||||
sample.pre-install sample.post-install
|
||||
AUTOTOOLS_TOOLCHAIN_FILES := config.sub config.guess
|
||||
|
||||
SCRIPT_SOURCES := $(addsuffix .in,$(SCRIPTS))
|
||||
|
||||
DISTFILES=$(SCRIPT_SOURCES) $(SAMPLES) Makefile abuild.conf
|
||||
DISTFILES=$(SCRIPT_SOURCES) $(SAMPLES) Makefile abuild.conf
|
||||
|
||||
GIT_REV := $(shell test -d .git && git describe || echo exported)
|
||||
ifneq ($(GIT_REV), exported)
|
||||
@ -43,7 +44,7 @@ SED_REPLACE := -e 's:@VERSION@:$(FULL_VERSION):g' \
|
||||
SSL_CFLAGS = $(shell pkg-config --cflags openssl)
|
||||
SSL_LIBS = $(shell pkg-config --libs openssl)
|
||||
|
||||
LDFLAGS ?=
|
||||
LDFLAGS ?=
|
||||
|
||||
OBJS-abuild-tar = abuild-tar.o
|
||||
LIBS-abuild-tar = $(SSL_LIBS)
|
||||
@ -62,7 +63,7 @@ OBJS-abuild-sudo = abuild-sudo.o
|
||||
|
||||
P=$(PACKAGE)-$(VERSION)
|
||||
|
||||
all: $(USR_BIN_FILES)
|
||||
all: $(USR_BIN_FILES)
|
||||
|
||||
clean:
|
||||
@rm -f $(USR_BIN_FILES)
|
||||
@ -97,7 +98,8 @@ install: $(USR_BIN_FILES) $(SAMPLES) abuild.conf functions.sh aports.lua
|
||||
if [ -n "$(DESTDIR)" ] || [ ! -f "/$(sysconfdir)"/abuild.conf ]; then\
|
||||
cp abuild.conf $(DESTDIR)/$(sysconfdir)/; \
|
||||
fi
|
||||
cp $(SAMPLES) $(DESTDIR)/$(prefix)/share/abuild
|
||||
cp $(SAMPLES) $(DESTDIR)/$(prefix)/share/abuild/
|
||||
cp $(AUTOTOOLS_TOOLCHAIN_FILES) $(DESTDIR)/$(prefix)/share/abuild/
|
||||
cp functions.sh $(DESTDIR)/$(datadir)/
|
||||
mkdir -p $(DESTDIR)$(LUA_SHAREDIR)
|
||||
cp aports.lua $(DESTDIR)$(LUA_SHAREDIR)/
|
||||
|
21
abuild.in
21
abuild.in
@ -494,6 +494,24 @@ unpack() {
|
||||
default_unpack
|
||||
}
|
||||
|
||||
default_post_unpack() {
|
||||
local i
|
||||
options_has "!configsub" && return 0
|
||||
for i in "$srcdir"/*/configure; do
|
||||
[ -x "$i" ] || continue
|
||||
find "${i%/configure}" -name config.sub -o -name config.guess \
|
||||
| while read f; do
|
||||
msg "Replacing ${f##*/}"
|
||||
cp "$datadir"/${f##*/} "$f" || return 1
|
||||
done
|
||||
break
|
||||
done
|
||||
}
|
||||
|
||||
post_unpack() {
|
||||
default_post_unpack
|
||||
}
|
||||
|
||||
# cleanup source and package dir
|
||||
clean() {
|
||||
msg "Cleaning temporary build dirs..."
|
||||
@ -1177,7 +1195,8 @@ build_abuildrepo() {
|
||||
if ! apk_up2date || [ -n "$force" ]; then
|
||||
logcmd "building $pkgname"
|
||||
sanitycheck && builddeps && clean && fetch && unpack \
|
||||
&& prepare && mkusers && rootpkg || return 1
|
||||
&& post_unpack && prepare && mkusers && rootpkg \
|
||||
|| return 1
|
||||
fi
|
||||
update_abuildrepo_index
|
||||
}
|
||||
|
1558
config.guess
vendored
Executable file
1558
config.guess
vendored
Executable file
File diff suppressed because it is too large
Load Diff
1788
config.sub
vendored
Executable file
1788
config.sub
vendored
Executable file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user