From 4cfbfa2afc6e43658dbf01cc9eb3ab34963d87f6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 18 Apr 2022 05:58:07 +0000 Subject: Revert "work on win64 support" This reverts commit daa265a214b9e12e2a9bab636398c2dd699f7cd4. git-svn-id: svn://tug.org/texlive/trunk@63068 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLPSRC.pm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Master/tlpkg/TeXLive/TLPSRC.pm') diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index 360064b0598..0a1146386ac 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -162,7 +162,7 @@ sub from_file { # - normal texlive specific packages: ^texlive.*\..*$ # - configuration texlive specific packages: ^00texlive.*\..*$ if ($line =~ /^name\s/) { - $line =~ /^name\s+([-\w]+(\.win(32|64))?|(00)?texlive\..*)$/; + $line =~ /^name\s+([-\w]+(\.win32)?|(00)?texlive\..*)$/; $foundnametag && die "$srcfile:$lineno: second name directive not allowed: $line" . "(have $name)\n"; @@ -494,16 +494,13 @@ sub make_tlpobj { if ($finalp =~ m! bin/win32/!) { @todoarchs = qw/win32/; } - if ($finalp =~ m! bin/win64/!) { - @todoarchs = qw/win64/; - } # now @todoarchs contains only those archs for which we want # to match the pattern foreach my $arch (@todoarchs) { # get only those files matching the pattern my @archfiles = $tltree->get_matching_files('bin',$finalp, $pkgname, $arch); if (!@archfiles) { - if ((($arch ne "win32") && ($arch ne "win64")) || defined($::tlpsrc_pattern_warn_win)) { + if (($arch ne "win32") || defined($::tlpsrc_pattern_warn_win)) { tlwarn("$self->{name} ($arch): no hit on binpattern $finalp\n"); } } @@ -540,7 +537,7 @@ sub make_tlpobj { # get only those files matching the pattern my @archfiles = $tltree->get_matching_files('bin', $finalp, $pkgname, $arch); if (!@archfiles) { - if ((($arch ne "win32") && ($arch ne "win64")) || defined($::tlpsrc_pattern_warn_win)) { + if (($arch ne "win32") || defined($::tlpsrc_pattern_warn_win)) { tlwarn("$self->{name} ($arch): no hit on negative binpattern $finalp\n") unless $::tlpsrc_pattern_no_warn_negative; # see comments in libexec/place script. -- cgit v1.2.3