[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] gawk branch, master, updated. gawk-4.1.0-4742-gae879ed7
From: |
Arnold Robbins |
Subject: |
[SCM] gawk branch, master, updated. gawk-4.1.0-4742-gae879ed7 |
Date: |
Fri, 17 Jun 2022 07:14:17 -0400 (EDT) |
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, master has been updated
via ae879ed7654680f4348cc918c86225ec7f4ec824 (commit)
from 6b97a4f7948407dcc4cb24ed79d11528b5e9202f (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=ae879ed7654680f4348cc918c86225ec7f4ec824
commit ae879ed7654680f4348cc918c86225ec7f4ec824
Author: Arnold D. Robbins <arnold@skeeve.com>
Date: Fri Jun 17 14:14:01 2022 +0300
Cygwin fixes.
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 03cfa145..29d7b2da 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,10 @@
+2022-06-17 Corinna Vinschen <vinschen@redhat.com>
+
+ Changes required on Cygwin to build extension DLLs successfully.
+
+ * Makefile.am: Add $(LIBMPFR) to rwarray and testext LIBADD.
+ * Makefile.in: Regenerate.
+
2022-06-06 Andrew J. Schorr <aschorr@telemetry-investments.com>
* rwarray.c (free_value): For arrays, we actually need to call
diff --git a/extension/Makefile.am b/extension/Makefile.am
index ce290857..2a15f9f7 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -98,9 +98,10 @@ revtwoway_la_SOURCES = revtwoway.c
revtwoway_la_LDFLAGS = $(MY_MODULE_FLAGS)
revtwoway_la_LIBADD = $(MY_LIBS)
+# On Cygwin, rwarray has to be linked with the MPFR and GMP libraries.
rwarray_la_SOURCES = rwarray.c
rwarray_la_LDFLAGS = $(MY_MODULE_FLAGS)
-rwarray_la_LIBADD = $(MY_LIBS)
+rwarray_la_LIBADD = $(MY_LIBS) $(LIBMPFR)
time_la_SOURCES = time.c
time_la_LDFLAGS = $(MY_MODULE_FLAGS)
@@ -109,9 +110,10 @@ time_la_LIBADD = $(MY_LIBS)
# N.B. Becaues we are not installing testext, we must specify -rpath in
# LDFLAGS to get automake to build a shared library, since it needs
# an installation path.
+# On Cygwin, testext has to be linked with the MPFR and GMP libraries.
testext_la_SOURCES = testext.c
testext_la_LDFLAGS = $(MY_MODULE_FLAGS) -rpath /foo
-testext_la_LIBADD = $(MY_LIBS)
+testext_la_LIBADD = $(MY_LIBS) $(LIBMPFR)
# N.B. Because we are not installing readdir_test, we must specify -rpath in
# LDFLAGS to get automake to build a shared library, since it needs
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 987f48c6..afd3fd79 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -244,13 +244,13 @@ revtwoway_la_OBJECTS = $(am_revtwoway_la_OBJECTS)
revtwoway_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(revtwoway_la_LDFLAGS) $(LDFLAGS) -o $@
-rwarray_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+rwarray_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
am_rwarray_la_OBJECTS = rwarray.lo
rwarray_la_OBJECTS = $(am_rwarray_la_OBJECTS)
rwarray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(rwarray_la_LDFLAGS) $(LDFLAGS) -o $@
-testext_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+testext_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
am_testext_la_OBJECTS = testext.lo
testext_la_OBJECTS = $(am_testext_la_OBJECTS)
testext_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -624,9 +624,11 @@ revoutput_la_LIBADD = $(MY_LIBS)
revtwoway_la_SOURCES = revtwoway.c
revtwoway_la_LDFLAGS = $(MY_MODULE_FLAGS)
revtwoway_la_LIBADD = $(MY_LIBS)
+
+# On Cygwin, rwarray has to be linked with the MPFR and GMP libraries.
rwarray_la_SOURCES = rwarray.c
rwarray_la_LDFLAGS = $(MY_MODULE_FLAGS)
-rwarray_la_LIBADD = $(MY_LIBS)
+rwarray_la_LIBADD = $(MY_LIBS) $(LIBMPFR)
time_la_SOURCES = time.c
time_la_LDFLAGS = $(MY_MODULE_FLAGS)
time_la_LIBADD = $(MY_LIBS)
@@ -634,9 +636,10 @@ time_la_LIBADD = $(MY_LIBS)
# N.B. Becaues we are not installing testext, we must specify -rpath in
# LDFLAGS to get automake to build a shared library, since it needs
# an installation path.
+# On Cygwin, testext has to be linked with the MPFR and GMP libraries.
testext_la_SOURCES = testext.c
testext_la_LDFLAGS = $(MY_MODULE_FLAGS) -rpath /foo
-testext_la_LIBADD = $(MY_LIBS)
+testext_la_LIBADD = $(MY_LIBS) $(LIBMPFR)
# N.B. Because we are not installing readdir_test, we must specify -rpath in
# LDFLAGS to get automake to build a shared library, since it needs
-----------------------------------------------------------------------
Summary of changes:
extension/ChangeLog | 7 +++++++
extension/Makefile.am | 6 ++++--
extension/Makefile.in | 11 +++++++----
3 files changed, 18 insertions(+), 6 deletions(-)
hooks/post-receive
--
gawk
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] gawk branch, master, updated. gawk-4.1.0-4742-gae879ed7,
Arnold Robbins <=