[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, feature/api-parser, updated. gawk-4.1.0-
From: |
Andrew J. Schorr |
Subject: |
[gawk-diffs] [SCM] gawk branch, feature/api-parser, updated. gawk-4.1.0-2448-gde08cb2 |
Date: |
Tue, 7 Mar 2017 09:07:56 -0500 (EST) |
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, feature/api-parser has been updated
via de08cb2b36073987fe86dfcc8c66c2f0e8711ef8 (commit)
via b39a138b9e445073f5f70ece80fa8a5393b1ea50 (commit)
from ba399f4366c1a43fe7975f8df70664397d804cc4 (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=de08cb2b36073987fe86dfcc8c66c2f0e8711ef8
commit de08cb2b36073987fe86dfcc8c66c2f0e8711ef8
Merge: ba399f4 b39a138
Author: Andrew J. Schorr <address@hidden>
Date: Tue Mar 7 09:07:33 2017 -0500
Merge branch 'master' into feature/api-parser
diff --cc extension/ChangeLog
index 44fccd5,f1622b6..5d9a194
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@@ -1,10 -1,15 +1,22 @@@
+ 2017-03-07 Andrew J. Schorr <address@hidden>
+
+ * Makefile.am (pkgextension_LTLIBRARIES): Remove testext.la, since it
+ does not make sense to install this library.
+ (noinst_LTLIBRARIES): New variable containing list of libraries to
+ build for testing purposes only. These libraries will not be installed.
+ Initially, it contains only testext.la.
+ (testext_la_LDFLAGS): Add "-rpath /foo" to convince automake/libtool
+ to build a shared version of this library. Since it is not being
+ installed, automake cannot use the final destination directory to
+ determine -rpath by itself. The value doesn't matter.
+
+2017-03-06 Andrew J. Schorr <address@hidden>
+
+ * readdir_test.c: Test extension using new get_record field_width
+ parsing feature.
+ * Makefile.am (noinst_LTLIBRARIES): Add readdir_test.la.
+ (readdir_test_la_*): Configure building of new extension library.
+
2017-01-21 Eli Zaretskii <address@hidden>
* testext.c (getuid) [__MINGW32__]: New function, mirrors what
diff --cc extension/Makefile.am
index d1cd225,185bc79..6ea16f5
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@@ -48,8 -48,7 +48,8 @@@ pkgextension_LTLIBRARIES =
time.la
noinst_LTLIBRARIES = \
- readdir_test.la
++ readdir_test.la \
+ testext.la
MY_MODULE_FLAGS = -module -avoid-version -no-undefined
# on Cygwin, gettext requires that we link with -lintl
@@@ -100,17 -99,13 +100,20 @@@ time_la_SOURCES = time.
time_la_LDFLAGS = $(MY_MODULE_FLAGS)
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.
testext_la_SOURCES = testext.c
- testext_la_LDFLAGS = $(MY_MODULE_FLAGS)
+ testext_la_LDFLAGS = $(MY_MODULE_FLAGS) -rpath /foo
testext_la_LIBADD = $(MY_LIBS)
+# 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
+# an installation path.
+readdir_test_la_SOURCES = readdir_test.c
+readdir_test_la_LDFLAGS = $(MY_MODULE_FLAGS) -rpath /foo
+readdir_test_la_LIBADD = $(MY_LIBS)
+
install-data-hook:
for i in $(pkgextension_LTLIBRARIES) ; do \
$(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \
diff --cc extension/Makefile.in
index c3aba97,6557693..c0e2676
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@@ -529,8 -520,7 +529,8 @@@ pkgextension_LTLIBRARIES =
time.la
noinst_LTLIBRARIES = \
- readdir_test.la
++ readdir_test.la \
+ testext.la
MY_MODULE_FLAGS = -module -avoid-version -no-undefined
# on Cygwin, gettext requires that we link with -lintl
@@@ -570,16 -560,13 +570,20 @@@ rwarray_la_LIBADD = $(MY_LIBS
time_la_SOURCES = time.c
time_la_LDFLAGS = $(MY_MODULE_FLAGS)
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.
testext_la_SOURCES = testext.c
- testext_la_LDFLAGS = $(MY_MODULE_FLAGS)
+ testext_la_LDFLAGS = $(MY_MODULE_FLAGS) -rpath /foo
testext_la_LIBADD = $(MY_LIBS)
+
+# 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
+# an installation path.
+readdir_test_la_SOURCES = readdir_test.c
+readdir_test_la_LDFLAGS = $(MY_MODULE_FLAGS) -rpath /foo
+readdir_test_la_LIBADD = $(MY_LIBS)
EXTRA_DIST = build-aux/config.rpath \
ChangeLog \
ChangeLog.0 \
-----------------------------------------------------------------------
Summary of changes:
extension/ChangeLog | 12 ++++++++++++
extension/Makefile.am | 9 ++++++---
extension/Makefile.in | 12 ++++++++----
3 files changed, 26 insertions(+), 7 deletions(-)
hooks/post-receive
--
gawk
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, feature/api-parser, updated. gawk-4.1.0-2448-gde08cb2,
Andrew J. Schorr <=