diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-06-27 06:17:11 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-06-27 06:17:11 +0300 |
| commit | 2d4dafd7cd5b9c11acfdf54c4ba04d53f361307e (patch) | |
| tree | 2da327fc7710b2e1b20544eff6f19bdfa7b5f25c | |
| parent | 09ae00a76b925945cffff657b02e69117a68b39e (diff) | |
| download | egawk-2d4dafd7cd5b9c11acfdf54c4ba04d53f361307e.tar.gz egawk-2d4dafd7cd5b9c11acfdf54c4ba04d53f361307e.tar.bz2 egawk-2d4dafd7cd5b9c11acfdf54c4ba04d53f361307e.zip | |
Fix intdiv extension to build on Cygwin.
| -rw-r--r-- | extension/ChangeLog | 5 | ||||
| -rw-r--r-- | extension/Makefile.am | 5 | ||||
| -rw-r--r-- | extension/Makefile.in | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 7c8a828a..9315f752 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,8 @@ +2017-06-27 Arnold D. Robbins <arnold@skeeve.com> + + * Makfile.am (intdiv_la_LIBADD): Add LIBMPFR for Cygwin. + Thanks to Eli Zaretskii for the tip that this is necessary. + 2017-06-22 Andrew J. Schorr <aschorr@telemetry-investments.com> * rwarray.c (read_value): Use malloc instead of calloc, since diff --git a/extension/Makefile.am b/extension/Makefile.am index 54975b8e..1d8e5b03 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -53,7 +53,7 @@ noinst_LTLIBRARIES = \ testext.la MY_MODULE_FLAGS = -module -avoid-version -no-undefined -# on Cygwin, gettext requires that we link with -lintl +# On Cygwin, gettext requires that we link with -lintl MY_LIBS = $(LTLIBINTL) filefuncs_la_SOURCES = filefuncs.c stack.h stack.c gawkfts.h \ @@ -73,9 +73,10 @@ inplace_la_SOURCES = inplace.c inplace_la_LDFLAGS = $(MY_MODULE_FLAGS) inplace_la_LIBADD = $(MY_LIBS) +# On Cygwin, intdiv has to be linked with the MPFR and GMP libraries intdiv_la_SOURCES = intdiv.c intdiv_la_LDFLAGS = $(MY_MODULE_FLAGS) -intdiv_la_LIBADD = $(MY_LIBS) +intdiv_la_LIBADD = $(MY_LIBS) $(LIBMPFR) ordchr_la_SOURCES = ordchr.c ordchr_la_LDFLAGS = $(MY_MODULE_FLAGS) diff --git a/extension/Makefile.in b/extension/Makefile.in index 000c3b78..6c0f2544 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -187,7 +187,7 @@ inplace_la_OBJECTS = $(am_inplace_la_OBJECTS) inplace_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(inplace_la_LDFLAGS) $(LDFLAGS) -o $@ -intdiv_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +intdiv_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_intdiv_la_OBJECTS = intdiv.lo intdiv_la_OBJECTS = $(am_intdiv_la_OBJECTS) intdiv_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -541,7 +541,7 @@ noinst_LTLIBRARIES = \ testext.la MY_MODULE_FLAGS = -module -avoid-version -no-undefined -# on Cygwin, gettext requires that we link with -lintl +# On Cygwin, gettext requires that we link with -lintl MY_LIBS = $(LTLIBINTL) filefuncs_la_SOURCES = filefuncs.c stack.h stack.c gawkfts.h \ gawkfts.c gawkdirfd.h @@ -557,9 +557,11 @@ fork_la_LIBADD = $(MY_LIBS) inplace_la_SOURCES = inplace.c inplace_la_LDFLAGS = $(MY_MODULE_FLAGS) inplace_la_LIBADD = $(MY_LIBS) + +# On Cygwin, intdiv has to be linked with the MPFR and GMP libraries intdiv_la_SOURCES = intdiv.c intdiv_la_LDFLAGS = $(MY_MODULE_FLAGS) -intdiv_la_LIBADD = $(MY_LIBS) +intdiv_la_LIBADD = $(MY_LIBS) $(LIBMPFR) ordchr_la_SOURCES = ordchr.c ordchr_la_LDFLAGS = $(MY_MODULE_FLAGS) ordchr_la_LIBADD = $(MY_LIBS) |