From 0a9f4e3e59f842d5ad638d7a55232c9b557451ab Mon Sep 17 00:00:00 2001 From: Damien Stuart Date: Mon, 26 Oct 2015 21:20:16 -0400 Subject: [PATCH 1/3] Minor tweak for format fix in the gpl texinfo file --- doc/gpl-2.0.texi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/gpl-2.0.texi b/doc/gpl-2.0.texi index e8d15daa..150a5d10 100644 --- a/doc/gpl-2.0.texi +++ b/doc/gpl-2.0.texi @@ -293,6 +293,8 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. +@end enumerate + @iftex @heading NO WARRANTY @end iftex @@ -301,6 +303,7 @@ of promoting the sharing and reuse of software generally. @end ifinfo +@enumerate @item BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN From 0ef8ba5259f9bd346a60ce3be2bf685c35b5fd36 Mon Sep 17 00:00:00 2001 From: Damien Stuart Date: Mon, 2 Nov 2015 21:41:26 -0500 Subject: [PATCH 2/3] Added use of --whole-archive for linking libfko_util.a to libfko.so. This takes care of the unresolved symbols (from libfko_util) when linking libfko.so. --- lib/Makefile.am | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 691394e1..af42f6e2 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -18,14 +18,18 @@ if WANT_C_UNIT_TESTS fko_utests_CPPFLAGS = -I $(top_builddir)/lib -I $(top_builddir)/common $(GPGME_CFLAGS) fko_utests_LDADD = $(top_builddir)/lib/libfko.la $(top_builddir)/common/libfko_util.a fko_utests_LDFLAGS = -lcunit $(GPGME_LIBS) + libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) -export-symbols-regex '^fko_' +else + libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) \ + -export-symbols-regex '^fko_' \ + -Wl,--whole-archive,$(top_builddir)/common/libfko_util.a,--no-whole-archive endif -libfko_la_SOURCES = $(libfko_source_files) -libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) -export-symbols-regex '^fko_' +libfko_la_SOURCES = $(libfko_source_files) -AM_CPPFLAGS = $(GPGME_CFLAGS) -I $(top_srcdir)/common +AM_CPPFLAGS = $(GPGME_CFLAGS) -I $(top_srcdir)/common -include_HEADERS = fko.h +include_HEADERS = fko.h clean-local: rm -f fko_utests *.gcno *.gcda From 02049cb47390cfb1c7c9fa6b59f9b14fdb9c616d Mon Sep 17 00:00:00 2001 From: Damien Stuart Date: Mon, 2 Nov 2015 23:02:22 -0500 Subject: [PATCH 3/3] Added AM_CONDITIONAL to check if OS is Darwin (Apple) and not use the --whole-archive option if it is. --- configure.ac | 4 ++++ lib/Makefile.am | 30 +++++++++++++++++------------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 88c476bc..52e470c2 100644 --- a/configure.ac +++ b/configure.ac @@ -120,6 +120,10 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_LIBTOOL +dnl Detect if we are on and Apple platform +dnl +AM_CONDITIONAL([APPLE_PLATFORM], [test `uname -s` = Darwin]) + dnl Decide whether or not to build binaries with profiling coverage support dnl want_profile_coverage=no diff --git a/lib/Makefile.am b/lib/Makefile.am index af42f6e2..1dfe9b99 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -12,24 +12,28 @@ libfko_source_files = \ if WANT_C_UNIT_TESTS - libfko_la_LIBADD = $(top_builddir)/common/cunit_common.o - noinst_PROGRAMS = fko_utests - fko_utests_SOURCES = fko_utests.c $(libfko_source_files) - fko_utests_CPPFLAGS = -I $(top_builddir)/lib -I $(top_builddir)/common $(GPGME_CFLAGS) - fko_utests_LDADD = $(top_builddir)/lib/libfko.la $(top_builddir)/common/libfko_util.a - fko_utests_LDFLAGS = -lcunit $(GPGME_LIBS) - libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) -export-symbols-regex '^fko_' +libfko_la_LIBADD = $(top_builddir)/common/cunit_common.o +noinst_PROGRAMS = fko_utests +fko_utests_SOURCES = fko_utests.c $(libfko_source_files) +fko_utests_CPPFLAGS = -I $(top_builddir)/lib -I $(top_builddir)/common $(GPGME_CFLAGS) +fko_utests_LDADD = $(top_builddir)/lib/libfko.la $(top_builddir)/common/libfko_util.a +fko_utests_LDFLAGS = -lcunit $(GPGME_LIBS) +libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) -export-symbols-regex '^fko_' else - libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) \ - -export-symbols-regex '^fko_' \ - -Wl,--whole-archive,$(top_builddir)/common/libfko_util.a,--no-whole-archive +if APPLE_PLATFORM +libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) -export-symbols-regex '^fko_' +else +libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) \ + -export-symbols-regex '^fko_' \ + -Wl,--whole-archive,$(top_builddir)/common/libfko_util.a,--no-whole-archive +endif endif -libfko_la_SOURCES = $(libfko_source_files) +libfko_la_SOURCES = $(libfko_source_files) -AM_CPPFLAGS = $(GPGME_CFLAGS) -I $(top_srcdir)/common +AM_CPPFLAGS = $(GPGME_CFLAGS) -I $(top_srcdir)/common -include_HEADERS = fko.h +include_HEADERS = fko.h clean-local: rm -f fko_utests *.gcno *.gcda