From d6ed97bfe11b4ba807060e061c1907bd9a52f62e Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 22 Jun 2017 11:00:15 +0200 Subject: introduce i486 as well --- Makefile | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b27de7e..1857844 100644 --- a/Makefile +++ b/Makefile @@ -13,12 +13,19 @@ SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*) MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc))) GENERATED_CONFIGS = \ + pacman-extra-i486.conf \ pacman-extra-i686.conf \ + pacman-testing-i486.conf \ pacman-testing-i686.conf \ + pacman-staging-i486.conf \ pacman-staging-i686.conf \ + pacman-staging-with-build-support-i486.conf \ pacman-staging-with-build-support-i686.conf \ + pacman-kde-unstable-i486.conf \ pacman-kde-unstable-i686.conf \ + pacman-gnome-unstable-i486.conf \ pacman-gnome-unstable-i686.conf \ + makepkg-i486.conf \ makepkg-i686.conf GENERATED_CONFIGS := $(addprefix $(BUILDDIR)/config/,$(GENERATED_CONFIGS)) @@ -36,21 +43,27 @@ COMMITPKG_LINKS = \ gnome-unstablepkg ARCHBUILD_LINKS = \ + extra-i486-build \ extra-i686-build \ extra-x86_64-build \ extra-x86_64_v3-build \ + testing-i486-build \ testing-i686-build \ testing-x86_64-build \ testing-x86_64_v3-build \ + staging-i486-build \ staging-i686-build \ staging-x86_64-build \ staging-x86_64_v3-build \ + staging-with-build-support-i486-build \ staging-with-build-support-i686-build \ multilib-build \ multilib-testing-build \ multilib-staging-build \ + kde-unstable-i486-build \ kde-unstable-i686-build \ kde-unstable-x86_64-build \ + gnome-unstable-i486-build \ gnome-unstable-i686-build \ gnome-unstable-x86_64-build @@ -88,15 +101,31 @@ endif edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g" GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)" +$(BUILDDIR)/config/makepkg-i486.conf: config/makepkg/x86_64.conf + @echo "GEN $(notdir $@)" + @mkdir -p $(dir $@) + @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i486\2,g' "$<" > "$@" + $(BUILDDIR)/config/makepkg-i686.conf: config/makepkg/x86_64.conf @echo "GEN $(notdir $@)" @mkdir -p $(dir $@) @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i686\2,g' "$<" > "$@" +$(BUILDDIR)/config/pacman-%-i486.conf: config/pacman/%.conf + @echo "GEN $(notdir $@)" + @mkdir -p $(dir $@) + @sed " \ + s,/mirrorlist\$$,\032,; \ + /^Architecture = / s/^.*\$$/Architecture = i486/; \ + " "$<" > "$@" + $(BUILDDIR)/config/pacman-%-i686.conf: config/pacman/%.conf @echo "GEN $(notdir $@)" @mkdir -p $(dir $@) - @sed 's,/mirrorlist$$,\032,' "$<" > "$@" + @sed " \ + s,/mirrorlist\$$,\032,; \ + /^Architecture = / s/^.*$$/Architecture = i686/ \ + " "$<" > "$@" define buildInScript $(1)/%: $(2)%.in $(LIBUTILS) -- cgit v1.2.3-54-g00ecf