From 51e89c98f6998b773f1f441178b5a7df3755b135 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 2 Jan 2018 23:38:04 -0500 Subject: Revert "Remove i686 support" This reverts commit 7259e7def07a5f6ee04a34db61a87361ad0b5ac7, except for commitpkg.in --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7372f6f..699060a 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,8 @@ GENERATED_CONFIGFILES = \ 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 CONFIGFILES = \ makepkg-x86_64.conf \ @@ -55,13 +56,18 @@ COMMITPKG_LINKS = \ gnome-unstablepkg ARCHBUILD_LINKS = \ + extra-i686-build \ extra-x86_64-build \ + testing-i686-build \ testing-x86_64-build \ + staging-i686-build \ staging-x86_64-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 = \ @@ -87,6 +93,10 @@ man: $(MANS) edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g" +makepkg-i686.conf: makepkg-x86_64.conf + @echo "GEN $@" + @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i686\2,g' "$<" > "$@" + pacman-%-i686.conf: pacman-%.conf @echo "GEN $@" @sed 's,/mirrorlist$$,\032,' "$<" > "$@" -- cgit v1.2.3-70-g09d2