From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-patches@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH 6/7] Remove rules for building libcygwin_s.a
Date: Sat, 31 Oct 2020 15:08:20 +0000 [thread overview]
Message-ID: <20201031150821.18041-7-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20201031150821.18041-1-jon.turney@dronecode.org.uk>
Untouched since added in 66a83f3e, and described as 'non-working'.
---
winsup/cygwin/Makefile.in | 13 --------
winsup/cygwin/mkstatic | 63 ---------------------------------------
2 files changed, 76 deletions(-)
delete mode 100755 winsup/cygwin/mkstatic
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index c3aa7a186..0add2320b 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -105,7 +105,6 @@ RUNTESTFLAGS =
DLL_NAME:=cygwin1.dll
TEST_DLL_NAME:=${patsubst %1.dll,%0.dll,$(DLL_NAME)}
TEST_LIB_NAME:=libcygwin0.a
-STATIC_LIB_NAME:=libcygwin_s.a
DIN_FILE=@DIN_FILE@ common.din
DEF_FILE:=cygwin.def
TLSOFFSETS_H:=@TLSOFFSETS_H@
@@ -413,15 +412,6 @@ DLL_OFILES:= \
$(MATH_OFILES) \
$(TZCODE_OFILES)
-EXCLUDE_STATIC_OFILES:=$(addprefix --exclude=,\
- cygtls.o \
- dcrt0.o \
- exceptions.o \
- fork.o \
- signal.o \
- spawn.o \
-)
-
VERSION_OFILES:=version.o winver.o
ifeq ($(target_cpu),x86_64)
@@ -675,9 +665,6 @@ $(TEST_DLL_NAME): $(LDSCRIPT) dllfixdbg $(DLL_OFILES) $(LIBSERVER) $(LIBC) $(LIB
$(LIB_NAME): $(DEF_FILE) $(LIBCOS) | $(TEST_DLL_NAME)
${srcdir}/mkimport ${toolopts} ${NEW_FUNCTIONS} $@ cygdll.a $(wordlist 2,99,$^)
-${STATIC_LIB_NAME}: mkstatic ${TEST_DLL_NAME}
- perl -d $< -x ${EXCLUDE_STATIC_OFILES} --library=${LIBC} --library=${LIBM} --ar=${AR} $@ cygwin.map
-
# Rule to make stub library used by testsuite
# dependency set to $(LIB_NAME) to accommodate make -j2.
$(TEST_LIB_NAME): $(LIB_NAME)
diff --git a/winsup/cygwin/mkstatic b/winsup/cygwin/mkstatic
deleted file mode 100755
index 1a488f80c..000000000
--- a/winsup/cygwin/mkstatic
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/perl
-use strict;
-use Cwd;
-use Getopt::Long;
-use File::Temp qw/tempdir/;
-use File::Basename;
-
-sub xsystem(@);
-
-my @exclude = ();
-my @library = ();
-my $ar;
-our $x;
-GetOptions('exclude=s'=>\@exclude, 'library=s'=>\@library, 'ar=s'=>\$ar, 'x!'=>\$x);
-
-die "$0: must specify --ar\n" unless defined $ar;
-my $lib = shift or die "$0: missing lib argument\nusage: $0 lib [map-file]\n";
-$lib = Cwd::abs_path($lib);
-
-my %excludes = map {($_, 1)} @exclude;
-my $libraries = join('|', map {quotemeta} @library);
-
-my %sources = ();
-while (<>) {
- my ($source, $file, $absfile);
- if (m%^($libraries)\(([^)]*)\)%o) {
- $source = $1;
- $absfile = $file = $2;
- } elsif (/^LOAD\s+(.*\.o)$/o) {
- $source = '.';
- $file = $1;
- $absfile = Cwd::abs_path($file);
- } else {
- next;
- }
- push @{$sources{$source}}, $absfile unless $excludes{$file} || $excludes{$source};
-}
-
-my $here = getcwd();
-my $dir = tempdir(CLEANUP=>1);
-chdir $dir;
-my @files = ();
-for (sort keys %sources) {
- if ($_ eq '.') {
- xsystem '/bin/cp', '-a', @{$sources{$_}}, '.';
- } else {
- xsystem $ar, 'x', $_, @{$sources{$_}}, '.';
- }
- push @files, map {basename($_)} @{$sources{$_}};
-}
-
-unlink $lib;
-xsystem $ar, 'crs', $lib, sort @files;
-exit 0;
-
-sub xsystem(@) {
- print join(' ', 'x', @_), "\n" if $x;
- system(@_) == 0 or die "$0: $_[0] $_[1] $_[2]... exited with non-zero status\n";
-}
-
-END {
- chdir '/tmp'; # Allow $dir directory removal on Windows
-}
--
2.29.0
next prev parent reply other threads:[~2020-10-31 15:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-31 15:08 [PATCH 0/7] Yet more Makefile/configure cleanups Jon Turney
2020-10-31 15:08 ` [PATCH 1/7] Remove intro2man.stamp on clean Jon Turney
2020-10-31 15:08 ` [PATCH 2/7] Drop AC_SUBST(build_exeext) Jon Turney
2020-10-31 15:08 ` [PATCH 3/7] Remove autoconf variable DLL_NAME Jon Turney
2020-10-31 15:08 ` [PATCH 4/7] Drop autoconf variable all_host Jon Turney
2020-10-31 15:08 ` [PATCH 5/7] Remove Makefile contents conditional on PREPROCESS, which is never defined Jon Turney
2020-10-31 15:08 ` Jon Turney [this message]
2020-10-31 15:08 ` [PATCH 7/7] Drop passing '-c' compiler flag into gentls_offsets Jon Turney
2020-11-02 11:21 ` [PATCH 0/7] Yet more Makefile/configure cleanups Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201031150821.18041-7-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-patches@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).