Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-06-22 11:00:15 +0200
committerErich Eckner <git@eckner.net>2020-06-29 10:43:34 +0200
commit6e5604a3908b945a210c3facaf8aa33b6884c6ae (patch)
tree3b1158731816d7d5f95c54761c2ebea381bef0a7
parent936297a449489f736526a72314ad71307848f41b (diff)
introduce i486 as well
-rw-r--r--.gitignore2
-rw-r--r--Makefile29
2 files changed, 30 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 6b7a40b..f02925f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,5 +19,7 @@ crossrepomove
arch-nspawn
sogrep
doc/*.1
+pacman-*-i486.conf
pacman-*-i686.conf
+makepkg-i486.conf
makepkg-i686.conf
diff --git a/Makefile b/Makefile
index d48fcbd..80e8c11 100644
--- a/Makefile
+++ b/Makefile
@@ -25,12 +25,19 @@ BINPROGS = \
$(IN_PROGS)
GENERATED_CONFIGFILES = \
+ 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
CONFIGFILES = \
@@ -61,18 +68,24 @@ COMMITPKG_LINKS = \
gnome-unstablepkg
ARCHBUILD_LINKS = \
+ extra-i486-build \
extra-i686-build \
extra-x86_64-build \
+ testing-i486-build \
testing-i686-build \
testing-x86_64-build \
+ staging-i486-build \
staging-i686-build \
staging-x86_64-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
@@ -101,13 +114,27 @@ man: $(MANS)
edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
+makepkg-i486.conf: makepkg-x86_64.conf
+ @echo "GEN $@"
+ @sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i486\2,g' "$<" > "$@"
+
makepkg-i686.conf: makepkg-x86_64.conf
@echo "GEN $@"
@sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i686\2,g' "$<" > "$@"
+pacman-%-i486.conf: pacman-%.conf
+ @echo "GEN $@"
+ @sed " \
+ s,/mirrorlist\$$,\032,; \
+ /^Architecture = / s/^.*\$$/Architecture = i486/; \
+ " "$<" > "$@"
+
pacman-%-i686.conf: pacman-%.conf
@echo "GEN $@"
- @sed 's,/mirrorlist$$,\032,' "$<" > "$@"
+ @sed " \
+ s,/mirrorlist\$$,\032,; \
+ /^Architecture = / s/^.*$$/Architecture = i686/ \
+ " "$<" > "$@"
%: %.in Makefile lib/common.sh
@echo "GEN $@"