From 592a191ccc8e58cdc7fc3b425fb018c5436b6662 Mon Sep 17 00:00:00 2001
From: Rob Carnell <bertcarnell@gmail.com>
Date: Tue, 7 Sep 2021 19:58:55 -0400
Subject: [PATCH] Update to correct an error on Solaris due to build flags not
 being portable

---
 ChangeLog                        |  8 +++++++-
 DESCRIPTION                      |  2 +-
 etc/CRAN_submission_checklist.md | 15 ++++++++-------
 src/Makevars                     | 10 ----------
 src/Makevars.win                 |  2 +-
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7f5b25..6584816 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,5 +78,11 @@ Version 1.1.0
   Fixed underlying C++ for bosebushl orthogonal array algorithm.
   Added regression tests
 
-Verion 1.1.1
+Version 1.1.1
   Corrected memory leak and read out-of-bounds
+
+Version 1.1.2
+  Exposed functions related to Galois fields from the oa C++ library
+
+Version 1.1.3
+  Corrected compilation flag issue on Solaris
diff --git a/DESCRIPTION b/DESCRIPTION
index 9bcaddb..18ffbbb 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: lhs
 Title: Latin Hypercube Samples
-Version: 1.1.2
+Version: 1.1.3
 Authors@R: 
     person(given = "Rob",
            family = "Carnell",
diff --git a/etc/CRAN_submission_checklist.md b/etc/CRAN_submission_checklist.md
index 9425e4f..ef9a880 100644
--- a/etc/CRAN_submission_checklist.md
+++ b/etc/CRAN_submission_checklist.md
@@ -24,22 +24,23 @@
 - RStudio
   - [ ] Document with `roxygen2` by running `Document` in the UI
   - [ ] Run `testthat` tests by running `Test Package` in the UI
-  - [ ] Build the `.tar.gz` or `R CMD build`
-  - [ ] Run `check` or `R CMD check --as-cran`
+  - [ ] Build the `.tar.gz` or `R CMD build lhs`
+  - [ ] Run `check` or `R CMD check --as-cran lhs_<version>.tar.gz`
   - [ ] In R, create the `pkgdown` site with `pkgdown::build_site()`
 - [ ] `commit` and `push` all updates to `github`
 
 #### rhub
 
 - from R or RStudio
-  - [ ] `rhub::check_for_cran(path="path-to-package/lhs-<version>.tar.gz")`
-  - [ ] `rhub::check_with_valgrind(path="path-to-package/lhs-<version>.tar.gz")`
-  - [ ] `rhub::check_with_sanitizers(path="path-to-package/lhs-<version>.tar.gz")`
+  - [ ] `rhub::check_for_cran(path="path-to-package/lhs_<version>.tar.gz")`
+  - [ ] `rhub::check_with_valgrind(path="path-to-package/lhs_<version>.tar.gz")`
+  - [ ] `rhub::check_with_sanitizers(path="path-to-package/lhs_<version>.tar.gz")`
+  - [ ] `rhub::check_on_solaris(path="path-to-package/lhs_<version>.tar.gz", env_vars = c("_R_CHECK_FORCE_SUGGESTS_" = "false"))`
 
 #### win-builder
 
 - https://win-builder.r-project.org/upload.aspx
-- [ ] upload the `lhs-<version>.tar.gz` from the step above
+- [ ] upload the `lhs_<version>.tar.gz` from the step above
 
 ## Travis and Appveyor
 
@@ -66,7 +67,7 @@
 - [ ] `sh developmentBuild.sh`
 - [ ] `sh cmakeshell.sh`
 - [ ] `R CMD build lhs`
-- [ ] `R CMD check --as-cran --use-valgrind`
+- [ ] `R CMD check --as-cran --use-valgrind lhs_<version>.tar.gz`
 
 ## Reverse Dependencies
 
diff --git a/src/Makevars b/src/Makevars
index 29120b0..4b622c2 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -1,12 +1,2 @@
 PKG_CPPFLAGS=-DRCOMPILE
 CXX_STD=CXX11
-PKG_LIBS=-Wl,-S
-
-#ifeq ($(CXX),g++)
-#PKG_LIBS=-Wl,--strip-debug
-#endif
-
-#ifeq ($(CXX),clang++)
-#PKG_LIBS=-Wl,-strip-debug
-#endif
-
diff --git a/src/Makevars.win b/src/Makevars.win
index 9f116bc..37deb64 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,4 +1,4 @@
 PKG_CPPFLAGS=-DRCOMPILE
-CXX_STD = CXX11
+CXX_STD=CXX11