ncurses 6.1 - patch 20190831

[ncurses.git] / mk-1st.awk

diff --git a/mk-1st.awk b/mk-1st.awk
index 2762fc39a53b6d9b4e3f3d3fa9f45c89554eec15..e374594108ca32978aa804fb51d6ae658c0a14c0 100644 (file)
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,6 +1,6 @@
-# $Id: mk-1st.awk,v 1.95 2013/03/12 11:09:40 tom Exp $
+# $Id: mk-1st.awk,v 1.105 2018/08/18 16:03:51 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -46,6 +46,7 @@
 #      TermlibRoot       ("tinfo" or other root for libterm.so)
 #      TermlibSuffix (".so" or other suffix for libterm.so)
 #      ReLink            ("yes", or "no", flag to rebuild shared libs on install)
+#      ReRanlib          ("yes", or "no", flag to rerun ranlib for installing static)
 #      DoLinks           ("yes", "reverse" or "no", flag to add symbolic links)
 #      rmSoLocs          ("yes" or "no", flag to add extra clean target)
 #      ldconfig          (path for this tool, if used)
@@ -71,7 +72,7 @@ function lib_name_of(a_name) {
        }
 # see imp_name
 function imp_name_of(a_name) {
-               if (ShlibVerInfix == "cygdll" || ShlibVerInfix == "mingw") {
+               if (ShlibVerInfix == "cygdll" || ShlibVerInfix == "msysdll" || ShlibVerInfix == "mingw") {
                        result = sprintf("%s%s%s.a", prefix, a_name, suffix);
                } else {
                        result = "";
@@ -82,6 +83,8 @@ function imp_name_of(a_name) {
 function abi_name_of(a_name) {
                if (ShlibVerInfix == "cygdll") {
                        result = sprintf("%s%s$(ABI_VERSION)%s", "cyg", a_name, suffix);
+               } else if (ShlibVerInfix == "msysdll") {
+                       result = sprintf("%s%s$(ABI_VERSION)%s", "msys-", a_name, suffix);
                } else if (ShlibVerInfix == "mingw") {
                        result = sprintf("%s%s$(ABI_VERSION)%s", prefix, a_name, suffix);
                } else if (ShlibVerInfix == "yes") {
@@ -95,6 +98,8 @@ function abi_name_of(a_name) {
 function rel_name_of(a_name) {
                if (ShlibVerInfix == "cygdll") {
                        result = sprintf("%s%s$(REL_VERSION)%s", "cyg", a_name, suffix);
+               } else if (ShlibVerInfix == "msysdll") {
+                       result = sprintf("%s%s$(ABI_VERSION)%s", "msys-", a_name, suffix);
                } else if (ShlibVerInfix == "mingw") {
                        result = sprintf("%s%s$(REL_VERSION)%s", prefix, a_name, suffix);
                } else if (ShlibVerInfix == "yes") {
@@ -113,7 +118,7 @@ function end_name_of(a_name) {
                } else {
                        if ( ShlibVer == "rel" ) {
                                result = rel_name_of(a_name);
-                       } else if ( ShlibVer == "abi" || ShlibVer == "cygdll" || ShlibVer == "mingw" ) {
+                       } else if ( ShlibVer == "abi" || ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw" ) {
                                result = abi_name_of(a_name);
                        } else {
                                result = lib_name_of(a_name);
@@ -166,10 +171,10 @@ function removelinks(directory) {
                }
        }
 function make_shlib(objs, shlib_list) {
-               printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s) $(LDFLAGS)\n", objs, shlib_list
+               printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s)\n", objs, shlib_list
        }
 function sharedlinks(directory) {
-               if ( ShlibVer != "auto" && ShlibVer != "cygdll" && ShlibVer != "mingw" ) {
+               if ( ShlibVer != "auto" && ShlibVer != "cygdll" && ShlibVer != "msysdll" && ShlibVer != "mingw" ) {
                        printf "\tcd %s && (", directory
                        if ( DoLinks == "reverse" ) {
                                if ( ShlibVer == "rel" ) {
@@ -201,7 +206,6 @@ function termlib_end_of() {
 function shlib_build(directory) {
                dst_libs = sprintf("%s/%s", directory, end_name);
                printf "%s : \\\n", dst_libs
-               printf "\t\t%s \\\n", directory
                if (subset == "ticlib" && driver == "yes" ) {
                        base = name;
                        sub(/^tic/, "ncurses", base); # workaround for "w"
@@ -216,8 +220,12 @@ function shlib_build(directory) {
                        printf "\t\t%s/%s \\\n", directory, termlib_end_of();
                        suffix = save_suffix
                }
-               printf "\t\t$(%s_OBJS)\n", OBJS
+               printf "\t\t$(RESULTING_SYMS) $(%s_OBJS)\n", OBJS
                printf "\t@echo linking $@\n"
+               printf "\t@mkdir -p %s\n", directory
+               if ( ReLink != "yes" ) {
+                       printf "\t@sleep 1\n"
+               }
                if ( is_ticlib() ) {
                        make_shlib(OBJS, "TICS_LIST")
                } else if ( is_termlib() ) {
@@ -286,6 +294,7 @@ BEGIN       {
                                        printf "#  TermlibRoot:   %s\n", TermlibRoot 
                                        printf "#  TermlibSuffix: %s\n", TermlibSuffix 
                                        printf "#  ReLink:        %s\n", ReLink 
+                                       printf "#  ReRanlib:      %s\n", ReRanlib 
                                        printf "#  DoLinks:       %s\n", DoLinks 
                                        printf "#  rmSoLocs:      %s\n", rmSoLocs 
                                        printf "#  ldconfig:      %s\n", ldconfig 
@@ -365,7 +374,7 @@ END {
                                print  "install \\"
                                print  "install.libs \\"
 
-                               if ( ShlibVer == "cygdll" || ShlibVer == "mingw") {
+                               if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw") {
 
                                        dst_dirs = "$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)";
                                        printf "install.%s :: %s $(LIBRARIES)\n", name, dst_dirs
@@ -386,7 +395,7 @@ END {
 
                                if ( overwrite == "yes" && name == "ncurses" )
                                {
-                                       if ( ShlibVer == "cygdll" || ShlibVer == "mingw") {
+                                       if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw") {
                                                ovr_name = sprintf("libcurses%s.a", suffix)
                                                printf "\t@echo linking %s to %s\n", imp_name, ovr_name
                                                printf "\tcd $(DESTDIR)$(libdir) && ("
@@ -407,7 +416,7 @@ END {
                                print  "uninstall \\"
                                print  "uninstall.libs \\"
                                printf "uninstall.%s ::\n", name
-                               if ( ShlibVer == "cygdll" || ShlibVer == "mingw") {
+                               if ( ShlibVer == "cygdll" || ShlibVer == "msysdll" || ShlibVer == "mingw") {
 
                                        printf "\t@echo uninstalling $(DESTDIR)$(bindir)/%s\n", end_name
                                        printf "\t-@rm -f $(DESTDIR)$(bindir)/%s\n", end_name
@@ -444,7 +453,7 @@ END {
                                }
                                printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) $(%s) \\\n", CC_NAME, CC_FLAG;
                                printf "\t\t-o %s $(%s_OBJS:$o=.lo) \\\n", lib_name, OBJS;
-                               printf "\t\t-rpath $(DESTDIR)$(libdir) \\\n";
+                               printf "\t\t-rpath $(libdir) \\\n";
                                printf "\t\t%s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", libtool_version, which_list;
                                print  ""
                                print  "install \\"
@@ -463,6 +472,12 @@ END        {
                        {
                                end_name = lib_name;
                                printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
+                               # workaround: binutils' ranlib tries to be clever with
+                               # timestamps, by pretending its update took no time, confusing
+                               # the make utility.
+                               if ( ReLink != "yes" ) {
+                                       printf "\t@sleep 1\n"
+                               }
                                printf "\t$(%sAR) $(%sARFLAGS) $@ $?\n", TOOL_PREFIX, TOOL_PREFIX;
                                printf "\t$(RANLIB) $@\n"
                                if ( host == "vxworks" )
@@ -483,7 +498,10 @@ END        {
                                        symlink("libncurses.a", "libcurses.a")
                                        printf ")\n"
                                }
-                               printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
+                               if ( ReRanlib == "yes" )
+                               {
+                                       printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
+                               }
                                if ( host == "vxworks" )
                                {
                                        printf "\t@echo installing ../lib/lib%s$o as $(DESTDIR)$(libdir)/lib%s$o\n", name, name