[PATCH] lists, doc: introduce @IA32, @X86 archdep macros

[Michael Shigorin]

The former ("proper 32-bit x86 package form") has been suggested
by zerg@ quite some time ago but the desired interface wasn't clear
at the moment IIRC; a quiet morning helped me realize that

  ICAClient-preinstall at IA32

is rather more readable than

  ICAClient-preinstall at i586 i586-ICAClient-preinstall at x86_64

so here's the (trivial) implementation; and I actually needed
the latter, @X86 ("any-x86") to mark x86-only packages so

  xorg-drv-intel at X86

is now equivalent to

  xorg-drv-intel at i586 xorg-drv-intel at x86_64
---
 doc/archdep.txt       | 9 +++++++++
 pkg.in/lists/Makefile | 4 +++-
 pkg.in/lists/README   | 3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/doc/archdep.txt b/doc/archdep.txt
index 6383e37..c9ecddd 100644
--- a/doc/archdep.txt
+++ b/doc/archdep.txt
@@ -40,7 +40,16 @@
   haspd at i586
   i586-haspd at x86_64
 
+ÉÌÉ ÕÐÒÏÝ£ÎÎÏ (Ó ×ÅÒÓÉÉ 1.2.12):
+
+  haspd at IA32
+
 äÌÑ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ÍÏÖÎÏ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÓÌÅÄÕÀÝÅÊ ËÏÍÁÎÄÏÊ:
 
   sed -r -e 's/@I586_ONLY@([^\t ]+)/\1 at i586/g' \
          -e 's/@X86_64_ONLY@([^\t ]+)/\1 at x86_64/g'
+
+ðÒÉ ÎÅÏÂÈÏÄÉÍÏÓÔÉ ÄÏÂÁ×ÉÔØ ÐÁËÅÔ ÔÏÌØËÏ ÎÁ x86-ÁÒÈÉÔÅËÔÕÒÁÈ (ÎÅ×ÁÖÎÏ,
+i586 ÉÌÉ x86_64) ÍÏÖÎÏ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÍÁËÒÏÓÏÍ X86 (Ó ×ÅÒÓÉÉ 1.2.12):
+
+  xorg-drv-intel at X86
diff --git a/pkg.in/lists/Makefile b/pkg.in/lists/Makefile
index e112e4f..02bc67e 100644
--- a/pkg.in/lists/Makefile
+++ b/pkg.in/lists/Makefile
@@ -40,8 +40,10 @@ grep-archdep:
 	@# xargs -L 1024 -n 1024 ? -- breaks -I
 	@find $(TARGET) -type f \
 	| xargs -I '__' sh -c '\
+		sed -ri  "s/\\<([^@ ]*)@X86\\>/\\1 at i586 \\1 at x86_64/g" __; \
+		sed -ri  "s/\\<([^@ ]*)@IA32\\>/\\1 at i586 i586-\\1 at x86_64/g" __;\
 		sed -rni "s/\\<([^@ ]*)\\>|\\<([^@ ]*)@$a\\>/\\1\\2/pg" __; \
-		sed -i -r "s/\\<([^@ ]*)@[^@ ]+\\> *//g" __'
+		sed -ri  "s/\\<([^@ ]*)@[^@ ]+\\> *//g" __'
 
 # do beforehand as foreach gets expanded before recipe execution
 $(TARGET):
diff --git a/pkg.in/lists/README b/pkg.in/lists/README
index 21719a0..9e4602e 100644
--- a/pkg.in/lists/README
+++ b/pkg.in/lists/README
@@ -16,6 +16,9 @@
 ÕÓÔÏÊÞÉ×ÙÅ ÇÒÕÐÐÙ ÐÁËÅÔÏ× ÍÏÇÕÔ ÚÁÓÌÕÖÉ×ÁÔØ ×ÙÄÅÌÅÎÉÑ ÏÔÄÅÌØÎÙÍ
 ÓÐÉÓËÏÍ.
 
+ðÒÉ ËÏÐÉÒÏ×ÁÎÉÉ ÓÐÉÓËÏ× × BUILDROOT ÐÒÏÉÓÈÏÄÉÔ ÉÈ ÏÂÒÁÂÏÔËÁ
+Ó ÐÒÉÍÅÎÅÎÉÅÍ ÁÒÈÉÔÅËÔÕÒÎÏÚÁ×ÉÓÉÍÙÈ ÍÁËÒÏÓÏ×, ÓÍ. doc/archdep.txt
+
 NB: ÓÐÉÓËÉ ÐÁËÅÔÏ× ÅÓÔØ ÓÍÙÓÌ ×ÙÄÅÌÑÔØ × ÆÁÊÌÙ ÐÒÉ ÐÏ×ÔÏÒÎÏÍ
 ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÌÉÂÏ ÐÒÉ ÚÁÍÅÔÎÏÍ ÏÂߣÍÅ, ËÏÇÄÁ ÐÅÒÅÞÉÓÌÅÎÉÅ
 ÐÒÑÍÏ × ËÏÎÆÉÇÕÒÁÃÉÉ ÓÉÌØÎÏ ÓÎÉÖÁÅÔ Å£ ÞÉÔÁÅÍÏÓÔØ.
-- 
2.10.4


--gBBFr7Ir9EOA20Yy--