On 2016-05-11 16:55, Ken Brown wrote:
On 5/11/2016 4:35 PM, Yaakov Selkowitz wrote:
I haven't moved these yet, but what about the rest of the collections?
IIRC the
TEXLIVE_ARCH_PKGS do have CPU-cygwin paths in the "sources", but are they
*really* archful?
No, the only issue is the sources. As it stands, if someone downloads
the source from one arch and tries to build on the other, cygport will
complain about missing source packages. Of course, running 'cygport
fetch' will fix that, so it's not a big deal.
Maybe in the future we should add the TEXLIVE_ARCH_PKGS for both CPUs to
the sources, and then there's no issue at all.
How about the attached?
--
Yaakov
From 6267002753ed243947f95fd153d1d3d53bc8b7bf Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselk...@redhat.com>
Date: Wed, 11 May 2016 17:12:20 -0500
Subject: [PATCH 2/2] texlive: make collection packages noarch
TeX Live collections, as built by cygport, are not really archful but some
of the paths in the sources are, even though the symlinks or scripts therein
are identical. Handling both "arches" at once allows us to make all
collections noarch.
---
cygclass/texlive.cygclass | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/cygclass/texlive.cygclass b/cygclass/texlive.cygclass
index f67a627..b8a06d5 100644
--- a/cygclass/texlive.cygclass
+++ b/cygclass/texlive.cygclass
@@ -98,11 +98,6 @@ support for many languages around the world."
HOMEPAGE="http://www.tug.org/texlive/";
#****
-case ${ARCH} in
-i686) TEXLIVE_ARCH="i386-cygwin" ;;
-x86_64) TEXLIVE_ARCH="x86_64-cygwin" ;;
-esac
-
#****o* texlive.cygclass/SRC_URI (texlive)
# DESCRIPTION
# SRC_URI is constructed automatically based on the value of
TEXLIVE_TEXMF_PKGS,
@@ -121,7 +116,8 @@ done
for pkg in ${TEXLIVE_ARCH_PKGS//,/ }
do
SRC_URI+=" ${tlnet}/archive/$pkg.tar.xz"
- SRC_URI+=" ${tlnet}/archive/$pkg.${TEXLIVE_ARCH}.tar.xz"
+ SRC_URI+=" ${tlnet}/archive/$pkg.i386-cygwin.tar.xz"
+ SRC_URI+=" ${tlnet}/archive/$pkg.x86_64-cygwin.tar.xz"
done
for pkg in ${TEXLIVE_DOC_PKGS//,/ }
do
@@ -131,6 +127,7 @@ unset pkg tlnet
SRC_DIR="."
+ARCH=noarch
#****I* texlive.cygclass/texlive_install
# SYNOPSIS
@@ -151,7 +148,7 @@ texlive_install() {
done
for pkg in ${TEXLIVE_ARCH_PKGS//,/ }
do
- pkgs+="$pkg $pkg.${TEXLIVE_ARCH} "
+ pkgs+="$pkg $pkg.i386-cygwin $pkg.x86_64-cygwin "
done
for pkg in ${TEXLIVE_DOC_PKGS//,/ }
do
@@ -172,7 +169,7 @@ texlive_install() {
*.bat)
# only needed for native Win32
continue ;;
- bin/${TEXLIVE_ARCH}/*)
+ bin/i386-cygwin/*)
if [ ! -L ${f} ]
then
dobin $f
@@ -185,6 +182,9 @@ texlive_install() {
esac
fi
continue ;;
+ bin/x86_64-cygwin/*)
+ # duplicate to i386-cygwin handled above
+ continue ;;
*doc/info/dir)
# system-managed file
continue ;;
--
2.8.0
