Revert "Remove i686 support"

This reverts commit 7259e7def07a5f6ee04a34db61a87361ad0b5ac7, except for commitpkg.in

1 files changed, 12 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 0229c5c..f0332f4 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,8 @@ GENERATED_CONFIGS = \
 	pacman-testing-i686.conf \
 	pacman-staging-i686.conf \
 	pacman-kde-unstable-i686.conf \
-	pacman-gnome-unstable-i686.conf
+	pacman-gnome-unstable-i686.conf \
+	makepkg-i686.conf
 GENERATED_CONFIGS := $(addprefix $(BUILDDIR)/config/,$(GENERATED_CONFIGS))
 
 COMMITPKG_LINKS = \
@@ -34,16 +35,21 @@ COMMITPKG_LINKS = \
 	gnome-unstablepkg
 
 ARCHBUILD_LINKS = \
+	extra-i686-build \
 	extra-x86_64-build \
 	extra-x86_64_v3-build \
+	testing-i686-build \
 	testing-x86_64-build \
 	testing-x86_64_v3-build \
+	staging-i686-build \
 	staging-x86_64-build \
 	staging-x86_64_v3-build \
 	multilib-build \
 	multilib-testing-build \
 	multilib-staging-build \
+	kde-unstable-i686-build \
 	kde-unstable-x86_64-build \
+	gnome-unstable-i686-build \
 	gnome-unstable-x86_64-build
 
 CROSSREPOMOVE_LINKS = \
@@ -80,6 +86,11 @@ endif
 edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
 GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"
 
+$(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-%-i686.conf: config/pacman/%.conf
 	@echo "GEN $(notdir $@)"
 	@mkdir -p $(dir $@)