From 4d9511243cd7d643879bbd9ad0b666e00890e300 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 23 May 2017 02:16:52 -0700 Subject: [PATCH] Prepare for version 2.12.6.0 --- CHANGES | 40 ++++++++++++++++++++++++++++------------ Makefile.ship | 2 +- custom/Makefile | 2 +- custom/Makefile.head | 2 +- version.c | 6 +++--- 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/CHANGES b/CHANGES index 0a93e12..9994e14 100644 --- a/CHANGES +++ b/CHANGES @@ -1,12 +1,23 @@ -The following are the changes from calc version 2.12.5.6 to date: +The following are the changes from calc version 2.12.6.0 to date: - Fixed a crash that showed up on Mac OS that was reported - by Richard Outerbridge and - fixed by Stuart Henderson . - Thanks goes to both! + Added the makefile variable ${COMMON_ADD} that will add flags + to all compile and link commands. The ${COMMON_ADD} flags are + appended to both ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}. This + facility is available to nearly all platforms except those with + very old make comamnds that do not understand the += operator. + + Example on masOS (Darwin), one may invoke clang's -fsanitize + facility by: + + make clobber all \ + COMMON_ADD='-fsanitize=undefined -fsanitize=address' + + Another example. To force C warnings to be treated as errors: + + make COMMON_ADD='-Werror' -The following are the changes from calc version 2.12.5.4 to 2.12.5.5: +The following are the changes from calc version 2.12.5.4 to 2.12.5.6: Recompile to match current RHEL7.2 libc and friends. @@ -60,18 +71,23 @@ The following are the changes from calc version 2.12.5.4 to 2.12.5.5: that the BUILDROOT directory had been improperly put into various paths and binaries. This has been fixed in 2.12.5.5. + Fixed a crash that showed up on macOS (Darwin) that was reported + by Richard Outerbridge and + fixed by Stuart Henderson . + Thanks goes to both! + The following are the changes from calc version 2.12.5.3 to 2.12.5.3: - Calc version 2.12.5.2 for Darwin (Mac OS X) users, code to installed + Calc version 2.12.5.2 for macOS (Darwin) users, code to installed calc under /opt/calc. Moreover the CHANGES file did not mention /opt/calc. Sorry about that!. - A much better tree for Darwin (Mac OS X) users would have been - to install cal under /opt/calc. This release ONLY changes the Darwin - (Mac OS X) install tree to /usr/local. + A much better tree for masOS (Darwin) users would have been + to install cal under /opt/calc. This release ONLY changes the + macOS (Darwin) install tree to /usr/local. - Darwin (Mac OS X) users who installed calc version 2.12.5.2 + macOS (Darwin) users who installed calc version 2.12.5.2 should, after installing version 2.12.5.3: rm -rf /opt/calc @@ -79,7 +95,7 @@ The following are the changes from calc version 2.12.5.3 to 2.12.5.3: The following are the changes from calc version 2.12.5.1 to 2.12.5.2: - NOTE: calc version 2.12.5.2, for Darwin (Mac OS X) users, + NOTE: calc version 2.12.5.2, for macOS (Darwin) users, installed under /opt/calc. We neglected to mention this AND /usr/local would have been a better choice. Sorry! Fixed in calc version 2.12.5.3. diff --git a/Makefile.ship b/Makefile.ship index b5ad548..e1b8f3e 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -990,7 +990,7 @@ EXT= # The default calc versions # -VERSION= 2.12.5.6 +VERSION= 2.12.6.0 # Names of shared libraries with versions # diff --git a/custom/Makefile b/custom/Makefile index 2973e1e..12a6750 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -348,7 +348,7 @@ EXT= # The default calc versions # -VERSION= 2.12.5.6 +VERSION= 2.12.6.0 # Names of shared libraries with versions # diff --git a/custom/Makefile.head b/custom/Makefile.head index b0abed6..7985621 100644 --- a/custom/Makefile.head +++ b/custom/Makefile.head @@ -348,7 +348,7 @@ EXT= # The default calc versions # -VERSION= 2.12.5.6 +VERSION= 2.12.6.0 # Names of shared libraries with versions # diff --git a/version.c b/version.c index d316bed..0db4c67 100644 --- a/version.c +++ b/version.c @@ -44,8 +44,8 @@ static char *program; #define MAJOR_VER 2 /* major library version */ #define MINOR_VER 12 /* minor library version */ -#define MAJOR_PATCH 5 /* major software level under library version */ -#define MINOR_PATCH 6 /* minor software level or 0 if not patched */ +#define MAJOR_PATCH 6 /* major software level under library version */ +#define MINOR_PATCH 0 /* minor software level or 0 if not patched */ /* @@ -69,7 +69,7 @@ STATIC char *stored_version = NULL; /* version formed if != NULL */ char *Copyright = "\n" "calc - arbitrary precision calculator\n" "\n" - "Copyright (C) 1999-2014 David I. Bell, Landon Curt Noll " + "Copyright (C) 1999-2017 David I. Bell, Landon Curt Noll " "and Ernest Bowen\n" "\n" "Initial author: David I. Bell\n"