[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-481-gd268465

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-4.1-stable has been updated
       via  d268465c69afb15db91f9dd0cb07131ef7ba9c45 (commit)
       via  0a050fa206e5d899f553b6ac492d389cb39591a2 (commit)
      from  b4cf3cc470eb1200ec90fcc7ad5b2d069059cf7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=d268465c69afb15db91f9dd0cb07131ef7ba9c45

commit d268465c69afb15db91f9dd0cb07131ef7ba9c45
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Oct 12 18:47:54 2014 +0300

    Additional OS/2 fix suggested by Andreas Buening.

diff --git a/extension/ChangeLog b/extension/ChangeLog
index 51878ed..940f7f1 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-12         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (uninstall-so): Remove *.lib too, per suggestion
+       from Andreas Buening.
+
 2014-10-12         KO Myung-Hun          <address@hidden>
 
        Fixes for OS/2:
diff --git a/extension/Makefile.am b/extension/Makefile.am
index d0769a5..b9dabfe 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -111,6 +111,7 @@ uninstall-so:
        $(RM) $(DESTDIR)$(pkgextensiondir)/*.so
        $(RM) $(DESTDIR)$(pkgextensiondir)/*.dll
        $(RM) $(DESTDIR)$(pkgextensiondir)/*.a
+       $(RM) $(DESTDIR)$(pkgextensiondir)/*.lib
 
 uninstall-recursive: uninstall-so
 
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 945e553..e08c6de 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -1242,6 +1242,7 @@ uninstall-so:
        $(RM) $(DESTDIR)$(pkgextensiondir)/*.so
        $(RM) $(DESTDIR)$(pkgextensiondir)/*.dll
        $(RM) $(DESTDIR)$(pkgextensiondir)/*.a
+       $(RM) $(DESTDIR)$(pkgextensiondir)/*.lib
 
 uninstall-recursive: uninstall-so
 

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=0a050fa206e5d899f553b6ac492d389cb39591a2

commit 0a050fa206e5d899f553b6ac492d389cb39591a2
Author: Arnold D. Robbins <address@hidden>
Date:   Sun Oct 12 13:49:11 2014 +0300

    OS/2 fixes.

diff --git a/ChangeLog b/ChangeLog
index 3049827..543ddd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,15 @@
        more helpful - also used for unmatched [:, [., [=.
        Thanks to Davide Brini for raising the issue.
 
+2014-10-12         KO Myung-Hun          <address@hidden>
+
+       Fixes for OS/2:
+
+       * Makefile.am (install-exec-hook, uninstall-links): Use $(EXEEXT).
+       * getopt.h: Redefinitions if using KLIBC.
+       * io.c (_S_IFDIR, _S_IRWXU): Define if the more standard versions
+       are available.
+
 2014-10-12         Arnold D. Robbins     <address@hidden>
 
        * README: Remove Pat Rankin from VMS duties, per his request.
diff --git a/Makefile.am b/Makefile.am
index 3d1c883..a188378 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -157,14 +157,14 @@ RM = rm -f
 install-exec-hook:
        (cd $(DESTDIR)$(bindir); \
        $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
-       if [ ! -f awk ]; \
-       then    $(LN_S) gawk$(EXEEXT) awk; \
+       if [ ! -f awk$(EXEEXT) ]; \
+       then    $(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
        fi; exit 0)
 
 # Undo the above when uninstalling
 uninstall-links:
        (cd $(DESTDIR)$(bindir); \
-       if [ -f awk ] && cmp awk gawk$(EXEEXT) > /dev/null; then rm -f awk; fi 
; \
+       if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) gawk$(EXEEXT) > /dev/null; 
then rm -f awk$(EXEEXT); fi ; \
        rm -f gawk-$(VERSION)$(EXEEXT); exit 0)
 
 uninstall-recursive: uninstall-links
diff --git a/Makefile.in b/Makefile.in
index 4d50757..39143e2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1156,14 +1156,14 @@ uninstall-am: uninstall-binPROGRAMS 
uninstall-includeHEADERS
 install-exec-hook:
        (cd $(DESTDIR)$(bindir); \
        $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
-       if [ ! -f awk ]; \
-       then    $(LN_S) gawk$(EXEEXT) awk; \
+       if [ ! -f awk$(EXEEXT) ]; \
+       then    $(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
        fi; exit 0)
 
 # Undo the above when uninstalling
 uninstall-links:
        (cd $(DESTDIR)$(bindir); \
-       if [ -f awk ] && cmp awk gawk$(EXEEXT) > /dev/null; then rm -f awk; fi 
; \
+       if [ -f awk$(EXEEXT) ] && cmp awk$(EXEEXT) gawk$(EXEEXT) > /dev/null; 
then rm -f awk$(EXEEXT); fi ; \
        rm -f gawk-$(VERSION)$(EXEEXT); exit 0)
 
 uninstall-recursive: uninstall-links
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 3fee967..51878ed 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-12         KO Myung-Hun          <address@hidden>
+
+       Fixes for OS/2:
+
+       * Makefile.am (uninstall-so): Remove *.dll and *.a, also.
+
 2014-10-08         Arnold D. Robbins     <address@hidden>
 
        * inplace.c (do_inplace_begin): Use a cast to void in front
diff --git a/extension/Makefile.am b/extension/Makefile.am
index e6678c5..d0769a5 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -109,6 +109,8 @@ install-data-hook:
 # Keep the uninstall check working:
 uninstall-so:
        $(RM) $(DESTDIR)$(pkgextensiondir)/*.so
+       $(RM) $(DESTDIR)$(pkgextensiondir)/*.dll
+       $(RM) $(DESTDIR)$(pkgextensiondir)/*.a
 
 uninstall-recursive: uninstall-so
 
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 46168e4..945e553 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -1240,6 +1240,8 @@ install-data-hook:
 # Keep the uninstall check working:
 uninstall-so:
        $(RM) $(DESTDIR)$(pkgextensiondir)/*.so
+       $(RM) $(DESTDIR)$(pkgextensiondir)/*.dll
+       $(RM) $(DESTDIR)$(pkgextensiondir)/*.a
 
 uninstall-recursive: uninstall-so
 
diff --git a/getopt.h b/getopt.h
index da1a01f..4471bf5 100644
--- a/getopt.h
+++ b/getopt.h
@@ -48,6 +48,21 @@
 extern "C" {
 #endif
 
+#ifdef __KLIBC__
+/* OS/2 kLIBC has already getopt(). So to avoid name clash, rename
+   them here. */
+
+# define optarg                gawk_optarg
+# define optind                gawk_optind
+# define opterr                gawk_opterr
+# define optopt                gawk_optopt
+
+# define getopt                                gawk_getopt
+# define getopt_long           gawk_getopt_long
+# define getopt_long_only      gawk_getopt_long_only
+#endif
+
+
 /* For communication from `getopt' to the caller.
    When `getopt' finds an option that takes an argument,
    the argument value is returned here.
diff --git a/io.c b/io.c
index 32caadf..c584a0c 100644
--- a/io.c
+++ b/io.c
@@ -110,6 +110,14 @@
 
 #ifdef __EMX__
 #include <process.h>
+
+#if !defined(_S_IFDIR) && defined(S_IFDIR)
+#define _S_IFDIR       S_IFDIR
+#endif
+
+#if !defined(_S_IRWXU) && defined(S_IRWXU)
+#define _S_IRWXU       S_IRWXU
+#endif
 #endif
 
 #ifndef ENFILE
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 235f520..e22cb01 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-12         KO Myung-Hun          <address@hidden>
+
+       Fixes for OS/2:
+
+       * gawkmisc.pc (init_sockets): Add additional checks for __EMX__.
+
 2014-09-23         Scott Deifik  <address@hidden>
 
        * Makefile.tst: Sync with mainline.
diff --git a/pc/gawkmisc.pc b/pc/gawkmisc.pc
index 239f3f8..fdd32e7 100644
--- a/pc/gawkmisc.pc
+++ b/pc/gawkmisc.pc
@@ -850,12 +850,12 @@ w32_shutdown (int fd, int how)
 
 #endif /* __MINGW32__ */
 
-#if defined(__DJGPP__) || defined(__MINGW32__)
+#if defined(__DJGPP__) || defined(__MINGW32__) || defined(__EMX__)
 
 void
 init_sockets(void)
 {
-#ifdef HAVE_SOCKETS
+#if defined(HAVE_SOCKETS) && !defined(__EMX__)
   WSADATA  winsockData;
   int errcode;
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |    9 +++++++++
 Makefile.am           |    6 +++---
 Makefile.in           |    6 +++---
 extension/ChangeLog   |   11 +++++++++++
 extension/Makefile.am |    3 +++
 extension/Makefile.in |    3 +++
 getopt.h              |   15 +++++++++++++++
 io.c                  |    8 ++++++++
 pc/ChangeLog          |    6 ++++++
 pc/gawkmisc.pc        |    4 ++--
 10 files changed, 63 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
gawk