From 5b31f27f6def8848c4ec934c63b7ecb19031a915 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 7 Nov 2012 16:32:08 +0000 Subject: [PATCH] winsup: * Makefile.common (zlib_source): Remove. (zlib_build): Remove. (bz2lib_source): Remove. (bz2lib_build): Remove. (w32api_source): Remove. (w32api_build): Remove. (w32api_lib): Remove. (mingw_build): Remove. (mingw_source): Remove. ($(w32api_lib)/%.a): Remove rule. * Makefile.in (ZLIB): Remove. ($(SUBDIRS)): Drop mingw check. (mingw): Remove rule. (install_mingw): Ditto. * configure.in: Remove support for mingw as build target. * configure: Regenerate. utils: * Makefile.in ($(MINGW_BINS)): Drop -B$(mingw_build)/ from build expression. --- winsup/Makefile.common | 18 ------------------ winsup/Makefile.in | 6 ------ winsup/configure | 41 ++++++++++++++-------------------------- winsup/configure.in | 9 --------- winsup/utils/ChangeLog | 5 +++++ winsup/utils/Makefile.in | 4 ++-- 6 files changed, 21 insertions(+), 62 deletions(-) diff --git a/winsup/Makefile.common b/winsup/Makefile.common index 06526c394..5bdcd79b2 100644 --- a/winsup/Makefile.common +++ b/winsup/Makefile.common @@ -50,19 +50,10 @@ else endif endif -zlib_source:=$(updir)/zlib -zlib_build:=$(bupdir)/zlib -bz2lib_source:=$(updir)/bz2lib -bz2lib_build:=$(bupdir)/bz2lib -w32api_source:=$(updir)/w32api -w32api_build:=$(bupdir)/w32api -w32api_lib:=$(w32api_build)/lib newlib_source:=$(updir1)/newlib newlib_build:=$(bupdir1)/newlib cygwin_build:=$(bupdir)/cygwin cygwin_source:=$(updir)/cygwin -mingw_build:=$(bupdir)/mingw -mingw_source:=$(updir)/mingw utils_build:=$(bupdir)/utils utils_source:=$(updir)/utils ifeq (,${findstring $(newlib_source)/libc/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)}) @@ -157,15 +148,6 @@ endif $(bupdir1)/libiberty/%.o: $(updir1)/libiberty/%.c @$(MAKE) -C $(@D) $(@F) -$(w32api_lib)/%.a: $(w32api_lib)/Makefile - @$(MAKE) --no-print-dir -C $(@D) $(@F) - -$(bz2lib)/%.a: $(bz2lib)/Makefile - @$(MAKE) --no-print-dir -C $(@D) $(@F) - -$(zlib)/%.a: $(zlib)/Makefile - @$(MAKE) --no-print-dir -C $(@D) $(@F) - all: # For auto-rebuilding the Makefile diff --git a/winsup/Makefile.in b/winsup/Makefile.in index e339055cb..218d5b071 100644 --- a/winsup/Makefile.in +++ b/winsup/Makefile.in @@ -45,7 +45,6 @@ INSTALL_DATA:=@INSTALL_DATA@ SUBDIRS=@subdirs@ INSTALL_SUBDIRS=${patsubst %,install_%,$(SUBDIRS)} CLEAN_SUBDIRS=${patsubst %,clean_%,$(SUBDIRS)} -ZLIB=${findstring zlib,$(SUBDIRS)} INSTALL_LICENSE:=@INSTALL_LICENSE@ @@ -82,7 +81,6 @@ info: $(SUBDIRS): @if cd $@ 2>/dev/null; then \ - test "$@" = "mingw" && export DISTCC_HOSTS=localhost;\ $(MAKE) all || exit 1; \ fi || exit 0 @@ -123,16 +121,12 @@ check: cygwin utils: cygwin -mingw: w32api - cygwin: cygserver: cygwin install_utils: cygwin -install_mingw: w32api - install_cygwin: install_cygserver: cygwin diff --git a/winsup/configure b/winsup/configure index d2884a441..28f14070d 100755 --- a/winsup/configure +++ b/winsup/configure @@ -646,9 +646,7 @@ CPPFLAGS CXX CXXFLAGS CCC' -ac_subdirs_all='cygwin cygserver lsaauth utils doc -mingw -w32api' +ac_subdirs_all='cygwin cygserver lsaauth utils doc' # Initialize some variables set by options. ac_init_help= @@ -1687,7 +1685,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1923,7 +1921,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -1956,7 +1954,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -1989,7 +1987,7 @@ fi $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -2409,7 +2407,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -2552,7 +2550,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -2595,7 +2593,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -2654,7 +2652,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -2707,7 +2705,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3398,17 +3396,6 @@ subdirs="$subdirs cygwin cygserver lsaauth utils doc" INSTALL_LICENSE="install-license" ;; - *mingw*) - if ! test -d $srcdir/mingw; then - as_fn_error $? "\"No mingw dir. Can't build Mingw. Exiting...\"" "$LINENO" 5 - fi - subdirs="$subdirs mingw" - - if test -d $srcdir/w32api; then - subdirs="$subdirs w32api" - - fi - ;; esac @@ -4167,7 +4154,7 @@ do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -4375,7 +4362,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -4403,7 +4390,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -4430,7 +4417,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac diff --git a/winsup/configure.in b/winsup/configure.in index a1625d514..293f84a4f 100755 --- a/winsup/configure.in +++ b/winsup/configure.in @@ -35,15 +35,6 @@ case "$target" in AC_CONFIG_SUBDIRS(cygwin cygserver lsaauth utils doc) INSTALL_LICENSE="install-license" ;; - *mingw*) - if ! test -d $srcdir/mingw; then - AC_MSG_ERROR("No mingw dir. Can't build Mingw. Exiting...") - fi - AC_CONFIG_SUBDIRS(mingw) - if test -d $srcdir/w32api; then - AC_CONFIG_SUBDIRS(w32api) - fi - ;; esac AC_SUBST(INSTALL_LICENSE) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 594a2fc3c..abb726f43 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2012-11-07 Corinna Vinschen + + * Makefile.in ($(MINGW_BINS)): Drop -B$(mingw_build)/ from build + expression. + 2012-11-05 Corinna Vinschen * Makefile.in (MINGW_CXX): Attach $(CFLAGS) to allow providing diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index a935d4d08..76f79f1e3 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -138,10 +138,10 @@ endif # how to link a MinGW binary $(MINGW_BINS): %.exe: %.o ifdef VERBOSE - $(MINGW_CXX) $(MINGW_CXXFLAGS) -o $@ ${filter %.o,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) + $(MINGW_CXX) $(MINGW_CXXFLAGS) -o $@ ${filter %.o,$^} $(MINGW_LDFLAGS) else @echo $(MINGW_CXX) -o $@ ${filter %.o,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\ - $(MINGW_CXX) $(MINGW_CXXFLAGS) -o $@ ${filter %.o,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) + $(MINGW_CXX) $(MINGW_CXXFLAGS) -o $@ ${filter %.o,$^} $(MINGW_LDFLAGS) endif # how to link a Cygwin binary