prepare v12.1.0-2

Author: ilg-ul

CHANGELOG.md

@@ -3,6 +3,11 @@
 
 Entries in this file are in reverse chronological order.
 
+## 2022-05-17
+
+- v12.1.0-2 prepared
+- patch nano.specs to use C++ nano libraries
+
 ## 2022-05-15
 
 - v12.1.0-1.1 published on npmjs.com

README-BUILD.md

@@ -107,7 +107,7 @@ not be accepted by bash.
 
 ## Versioning
 
-The version string is an extension to semver, the format looks like `12.1.0-1`.
+The version string is an extension to semver, the format looks like `12.1.0-2`.
 It includes the three digits with the original GCC version, a fourth
 digit with the xPack release number.
 
@@ -209,10 +209,10 @@ their SHA signatures, created in the `deploy` folder:
 ```console
 $ ls -l ~/Work/riscv-none-elf-gcc-*/deploy
 total 940080
--rw-rw-rw- 1 ilg ilg 476486985 May 13 18:05 xpack-riscv-none-elf-gcc-12.1.0-1-linux-x64.tar.gz
--rw-rw-rw- 1 ilg ilg       117 May 13 18:05 xpack-riscv-none-elf-gcc-12.1.0-1-linux-x64.tar.gz.sha
--rw-rw-rw- 1 ilg ilg 486134774 May 13 18:29 xpack-riscv-none-elf-gcc-12.1.0-1-win32-x64.zip
--rw-rw-rw- 1 ilg ilg       114 May 13 18:29 xpack-riscv-none-elf-gcc-12.1.0-1-win32-x64.zip.sha
+-rw-rw-rw- 1 ilg ilg 476486985 May 13 18:05 xpack-riscv-none-elf-gcc-12.1.0-2-linux-x64.tar.gz
+-rw-rw-rw- 1 ilg ilg       117 May 13 18:05 xpack-riscv-none-elf-gcc-12.1.0-2-linux-x64.tar.gz.sha
+-rw-rw-rw- 1 ilg ilg 486134774 May 13 18:29 xpack-riscv-none-elf-gcc-12.1.0-2-win32-x64.zip
+-rw-rw-rw- 1 ilg ilg       114 May 13 18:29 xpack-riscv-none-elf-gcc-12.1.0-2-win32-x64.zip.sha
 ```
 
 ### Build the Arm GNU/Linux binaries
@@ -285,17 +285,17 @@ archives and their SHA signatures, created in the `deploy` folder:
 ```console
 $ ls -l ~/Work/riscv-none-elf-gcc-*/deploy
 total 462200
--rw-rw-rw- 1 ilg ilg 473282190 May 14 03:11 xpack-riscv-none-elf-gcc-12.1.0-1-linux-arm64.tar.gz
--rw-rw-rw- 1 ilg ilg       119 May 14 03:11 xpack-riscv-none-elf-gcc-12.1.0-1-linux-arm64.tar.gz.sha
+-rw-rw-rw- 1 ilg ilg 473282190 May 14 03:11 xpack-riscv-none-elf-gcc-12.1.0-2-linux-arm64.tar.gz
+-rw-rw-rw- 1 ilg ilg       119 May 14 03:11 xpack-riscv-none-elf-gcc-12.1.0-2-linux-arm64.tar.gz.sha
 ```
 
 and:
 
 ```console
 $ ls -l ~/Work/riscv-none-elf-gcc-*/deploy
 total 457292
--rw-rw-rw- 1 ilg ilg 468260455 May 14 04:00 xpack-riscv-none-elf-gcc-12.1.0-1-linux-arm.tar.gz
--rw-rw-rw- 1 ilg ilg       117 May 14 04:00 xpack-riscv-none-elf-gcc-12.1.0-1-linux-arm.tar.gz.sha
+-rw-rw-rw- 1 ilg ilg 468260455 May 14 04:00 xpack-riscv-none-elf-gcc-12.1.0-2-linux-arm.tar.gz
+-rw-rw-rw- 1 ilg ilg       117 May 14 04:00 xpack-riscv-none-elf-gcc-12.1.0-2-linux-arm.tar.gz.sha
 ```
 
 ### Build the macOS binaries
@@ -337,17 +337,17 @@ and its SHA signature, created in the `deploy` folder:
 ```console
 $ ls -l ~/Work/riscv-none-elf-gcc-*/deploy
 total 951048
--rw-r--r--  1 ilg  staff  472518625 May 14 02:20 xpack-riscv-none-elf-gcc-12.1.0-1-darwin-x64.tar.gz
--rw-r--r--  1 ilg  staff        118 May 14 02:20 xpack-riscv-none-elf-gcc-12.1.0-1-darwin-x64.tar.gz.sha
+-rw-r--r--  1 ilg  staff  472518625 May 14 02:20 xpack-riscv-none-elf-gcc-12.1.0-2-darwin-x64.tar.gz
+-rw-r--r--  1 ilg  staff        118 May 14 02:20 xpack-riscv-none-elf-gcc-12.1.0-2-darwin-x64.tar.gz.sha
 ```
 
 and:
 
 ```console
 $ ls -l ~/Work/riscv-none-elf-gcc-*/deploy
 total 951816
--rw-r--r--  1 ilg  staff  471723612 May 13 17:37 xpack-riscv-none-elf-gcc-12.1.0-1-darwin-arm64.tar.gz
--rw-r--r--  1 ilg  staff        120 May 13 17:37 xpack-riscv-none-elf-gcc-12.1.0-1-darwin-arm64.tar.gz.sha
+-rw-r--r--  1 ilg  staff  471723612 May 13 17:37 xpack-riscv-none-elf-gcc-12.1.0-2-darwin-arm64.tar.gz
+-rw-r--r--  1 ilg  staff        120 May 13 17:37 xpack-riscv-none-elf-gcc-12.1.0-2-darwin-arm64.tar.gz.sha
 ```
 
 ## Subsequent runs
@@ -442,8 +442,8 @@ After install, the package should create a structure like this (only the
 first two depth levels are shown):
 
 ```console
-$ tree -L 2 /Users/ilg/Library/xPacks/\@xpack-dev-tools/riscv-none-elf-gcc/12.1.0-1/.content/
-/Users/ilg/Library/xPacks/\@xpack-dev-tools/riscv-none-elf-gcc/12.1.0-1/.content/
+$ tree -L 2 /Users/ilg/Library/xPacks/\@xpack-dev-tools/riscv-none-elf-gcc/12.1.0-2/.content/
+/Users/ilg/Library/xPacks/\@xpack-dev-tools/riscv-none-elf-gcc/12.1.0-2/.content/
 ├── README.md
 ├── bin
 │   ├── riscv-none-elf-addr2line

README-RELEASE.md

@@ -17,7 +17,7 @@ Before starting the build, perform some checks and tweaks.
 ### Identify the main GCC version
 
 Determine the GCC version (like `12.1.0`) and update the `scripts/VERSION`
-file; the format is `12.1.0-1`. The fourth digit is the number of the
+file; the format is `12.1.0-2`. The fourth digit is the number of the
 the xPack GNU RISC-V Embedded GCC release number of this version.
 
 ### Update versions in `README` files
@@ -32,35 +32,13 @@ the xPack GNU RISC-V Embedded GCC release number of this version.
 - add a new `if` with the new version before the existing code
 - update the versions, branch names and commit ids
 
-### Update gcc
-
-With a git client in
-[xpack-dev-tools/gcc](https://github.com/xpack-dev-tools/gcc)
-
-- identify the tag with the latest release (like `gcc-12.1.0`)
-- create a new branch with the same name as the tag (like `gcc-12.1.0`)
-- create a new branch with name suffixed with `-riscv-none-elf-xpack`
-  (like `gcc-12.1.0-riscv-none-elf-xpack`
-- identify the commit which adds the xPack specific changes
-- cherry pick it; do not commit immediately
-- check the differences from the non-xpack branch; there should be three files:
-  - `elf-embed.h` with the `LIB_SPEC` definitions without libgloss
-  - `config.gcc` with `tm_file` definition that uses `elf-embed.h`
-  - `config.sub` which adds `*-embed)`
-- commit as **add support for riscv-none-embed-***
-- push both new branches to `origin`
-- checkout the `gcc-12.1.0` tag as HEAD
-- create patch from the commit
-- rename as `gcc-12.1.0.patch.diff`
-- copy to `patches`
-
 ### Fix possible open issues
 
 Check GitHub issues and pull requests:
 
 - <https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/issues/>
 
-and fix them; assign them to a milestone (like `12.1.0-1`).
+and fix them; assign them to a milestone (like `12.1.0-2`).
 
 ### Check `README.md`
 
@@ -72,8 +50,8 @@ but in the version specific release page.
 
 - open the `CHANGELOG.md` file
 - check if all previous fixed issues are in
-- add a new entry like _- v12.1.0-1 prepared_
-- commit with a message like _prepare v12.1.0-1_
+- add a new entry like _- v12.1.0-2 prepared_
+- commit with a message like _prepare v12.1.0-2_
 
 Note: if you missed to update the `CHANGELOG.md` before starting the build,
 edit the file and rerun the build, it should take only a few minutes to
@@ -322,7 +300,7 @@ git -C ${HOME}/Work/riscv-none-elf-gcc-xpack.git submodule update --init --recur
 
 ## Create a new GitHub pre-release draft
 
-- in `CHANGELOG.md`, add the release date and a message like _- v12.1.0-1 released_
+- in `CHANGELOG.md`, add the release date and a message like _- v12.1.0-2 released_
 - commit and push the `xpack-develop` branch
 - run the xPack action `trigger-workflow-publish-release`
 
@@ -331,8 +309,8 @@ The workflows results and logs are available from the
 
 The result is a
 [draft pre-release](https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/)
-tagged like **v12.1.0-1** (mind the dash in the middle!) and
-named like **xPack GNU RISC-V Embedded GCC v12.1.0-1** (mind the dash),
+tagged like **v12.1.0-2** (mind the dash in the middle!) and
+named like **xPack GNU RISC-V Embedded GCC v12.1.0-2** (mind the dash),
 with all binaries attached.
 
 - edit the draft and attach it to the `xpack-develop` branch (important!)
@@ -354,7 +332,7 @@ If any, refer to closed
 ## Update the preview Web
 
 - commit the `develop` branch of `xpack/web-jekyll` GitHub repo;
-  use a message like **xPack GNU RISC-V Embedded GCC v12.1.0-1 released**
+  use a message like **xPack GNU RISC-V Embedded GCC v12.1.0-2 released**
 - push to GitHub
 - wait for the GitHub Pages build to complete
 - the preview web is <https://xpack.github.io/web-preview/news/>
@@ -396,18 +374,18 @@ watching this project.
 - compare the SHA sums with those shown by `cat *.sha`
 - check the executable names
 - commit all changes, use a message like
-  `package.json: update urls for 12.1.0-1 release` (without `v`)
+  `package.json: update urls for 12.1.0-2 release` (without `v`)
 
 ## Publish on the npmjs.com server
 
 - select the `xpack-develop` branch
 - check the latest commits `npm run git-log`
-- update `CHANGELOG.md`, add a line like _- v12.1.0-1.1 published on npmjs.com_
-- commit with a message like _CHANGELOG: publish npm v12.1.0-1.1_
+- update `CHANGELOG.md`, add a line like _- v12.1.0-2.1 published on npmjs.com_
+- commit with a message like _CHANGELOG: publish npm v12.1.0-2.1_
 - `npm pack` and check the content of the archive, which should list
   only the `package.json`, the `README.md`, `LICENSE` and `CHANGELOG.md`;
   possibly adjust `.npmignore`
-- `npm version 12.1.0-1.1`; the first 4 numbers are the same as the
+- `npm version 12.1.0-2.1`; the first 4 numbers are the same as the
   GitHub release; the fifth number is the npm specific version
 - the commits and the tag should have been pushed by the `postversion` script;
   if not, push them with `git push origin --tags`
@@ -436,12 +414,12 @@ The tests results are available from the
 When the release is considered stable, promote it as `latest`:
 
 - `npm dist-tag ls @xpack-dev-tools/riscv-none-elf-gcc`
-- `npm dist-tag add @xpack-dev-tools/[email protected]1.1 latest`
+- `npm dist-tag add @xpack-dev-tools/[email protected]2.1 latest`
 - `npm dist-tag ls @xpack-dev-tools/riscv-none-elf-gcc`
 
 In case the previous version is not functional and needs to be unpublished:
 
-- `npm unpublish @xpack-dev-tools/[email protected]1.X`
+- `npm unpublish @xpack-dev-tools/[email protected]2.X`
 
 ## Update the Web
 
@@ -463,7 +441,7 @@ In case the previous version is not functional and needs to be unpublished:
 
 - in a separate browser windows, open [TweetDeck](https://tweetdeck.twitter.com/)
 - using the `@xpack_project` account
-- paste the release name like **xPack GNU RISC-V Embedded GCC v12.1.0-1 released**
+- paste the release name like **xPack GNU RISC-V Embedded GCC v12.1.0-2 released**
 - paste the link to the Web page
   [release](https://xpack.github.io/riscv-none-elf-gcc/releases/)
 - click the **Tweet** button
@@ -487,9 +465,9 @@ Add a new topic in the **Announcements** category of the
 [RISC-V forums]<https://groups.google.com/a/groups.riscv.org/g/sw-dev>).
 
 ```console
-Subject: xPack GNU RISC-V Embedded GCC v12.1.0-1 released
+Subject: xPack GNU RISC-V Embedded GCC v12.1.0-2 released
 
-Version 12.1.0-1 is a new release of the xPack GNU RISC-V Embedded GCC; it follows the GNU GCC release.
+Version 12.1.0-2 is a new release of the xPack GNU RISC-V Embedded GCC; it follows the GNU GCC release.
 
 https://xpack.github.io/blog/2022/05/14/riscv-none-elf-gcc-v11-3-0-1-released/
 ```

README.md

@@ -126,13 +126,13 @@ The version strings used by the GCC project are three number strings
 like `12.1.0`; to this string the xPack distribution adds a four number,
 but since semver allows only three numbers, all additional ones can
 be added only as pre-release strings, separated by a dash,
-like `12.1.0-1`.
+like `12.1.0-2`.
 When published as a npm package, the version gets
-a fifth number, like `12.1.0-1.1`.
+a fifth number, like `12.1.0-2.1`.
 
 Since adherence of third party packages to semver is not guaranteed,
 it is recommended to use semver expressions like `^12.1.0` and `~12.1.0`
-with caution, and prefer exact matches, like `12.1.0-1.1`.
+with caution, and prefer exact matches, like `12.1.0-2.1`.
 
 ## Maintainer info
 

scripts/VERSION

@@ -1 +1 @@
-12.1.0-1
+12.1.0-2

scripts/common-versions-source.sh

@@ -64,7 +64,7 @@ function build_versions()
   fi
 
   # In reverse chronological order.
-  if [[ ${RELEASE_VERSION} =~ 12\.1\.0-.* ]]
+  if [[ ${RELEASE_VERSION} =~ 12\.1\.0-[12] ]]
   then
 
     # -------------------------------------------------------------------------
@@ -292,6 +292,11 @@ function build_versions()
         NEWLIB_ARCHIVE_NAME="newlib-${NEWLIB_VERSION}.tar.gz"
         NEWLIB_ARCHIVE_URL="ftp://sourceware.org/pub/newlib/${NEWLIB_ARCHIVE_NAME}"
 
+        if [ "${RELEASE_VERSION}" != "12.1.0-1" ]
+        then
+          ENABLE_NEWLIB_RISCV_NANO_CXX_PATCH="y"
+        fi
+
         # Task [III-2] /$HOST_NATIVE/newlib/
         build_cross_newlib ""
         # exit 1