[med-svn] [Git][med-team/castxml][upstream] New upstream version 0.6.10
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Sun Dec 1 08:03:23 GMT 2024
Étienne Mollier pushed to branch upstream at Debian Med / castxml
Commits:
b251c3a6 by Étienne Mollier at 2024-11-30T18:33:33+01:00
New upstream version 0.6.10
- - - - -
11 changed files:
- CMakeLists.txt
- README.rst
- doc/conf.py.in
- src/RunClang.cxx
- src/Version.cmake
- test/CMakeLists.txt
- test/cc-gnu.c
- + test/expect/cmd.castxml-empty-c++98-c.stderr.txt
- + test/expect/cmd.cc-gnu-fsized-deallocation.stderr.txt
- + test/expect/cmd.gccxml-empty-c++98-c.stderr.txt
- test/run.cmake
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
project(CastXML)
include(src/Version.cmake)
=====================================
README.rst
=====================================
@@ -47,7 +47,8 @@ To build CastXML from source, first obtain the prerequisites:
* `LLVM/Clang`_ compiler SDK install tree built using the C++ compiler.
This version of CastXML has been tested with LLVM/Clang
- - Git ``main`` as of 2024-03-06 (``f7d354af57``)
+ - Git ``main`` as of 2024-10-10 (``545e0593f8``)
+ - Release ``19.1``
- Release ``18.1``
- Release ``17.0``
- Release ``16.0``
=====================================
doc/conf.py.in
=====================================
@@ -34,7 +34,7 @@ extensions = []
templates_path = ['@conf_path@/templates']
castxml_manuals = sorted(glob.glob(r'@conf_docs@/manual/*.rst'))
-castxml_manual_description = re.compile('^\.\. castxml-manual-description:(.*)$')
+castxml_manual_description = re.compile(r'^\.\. castxml-manual-description:(.*)$')
man_pages = []
for fpath in castxml_manuals:
try:
=====================================
src/RunClang.cxx
=====================================
@@ -52,6 +52,7 @@
#include "llvm/Support/raw_ostream.h"
#include <cstdlib>
+#include <fstream>
#include <iostream>
#include <memory>
#include <queue>
@@ -564,10 +565,37 @@ protected:
bool Need_Float(std::string const& pd) const
{
- // gcc >= 7 provides _Float## types in C.
- // g++ >= 13 provides _Float## types in C++.
- return (this->IsActualGNU(pd) &&
- this->GetGNUMajorVersion(pd) >= (this->IsCPlusPlus(pd) ? 13 : 7));
+ if (this->IsActualGNU(pd)) {
+ // gcc >= 7 provides _Float## types in C.
+ if (!this->IsCPlusPlus(pd)) {
+ return this->GetGNUMajorVersion(pd) >= 7;
+ }
+ // g++ >= 13 provides _Float## types in C++.
+ if (this->GetGNUMajorVersion(pd) < 13) {
+ return false;
+ }
+ // glibc 2.27 added bits/floatn-common.h to define _Float## types when
+ // the compiler does not, but only knew about GCC 7+ _Float## types in C.
+ // glibc 2.37 updated the conditions for GCC 13+ _Float## types in C++.
+ for (Options::Include const& i : this->Opts.Includes) {
+ if (i.Framework) {
+ continue;
+ }
+ if (std::ifstream f{ i.Directory + "/bits/floatn-common.h" }) {
+ std::string h{ std::istreambuf_iterator<char>(f),
+ std::istreambuf_iterator<char>() };
+ // If the header contains the pre-2.37 condition then
+ // let it handle defining the _Float## types.
+ if (h.find("if !__GNUC_PREREQ (7, 0) || defined __cplusplus") !=
+ std::string::npos) {
+ return false;
+ }
+ break;
+ }
+ }
+ return true;
+ }
+ return false;
}
#if LLVM_VERSION_MAJOR < 6
@@ -907,6 +935,9 @@ int runClang(const char* const* argBeg, const char* const* argEnd,
// Configure language options to match given compiler.
std::string const& pd = opts.Predefines;
+ if (pd.find("#define __cpp_sized_deallocation ") != std::string::npos) {
+ args.emplace_back("-fsized-deallocation");
+ }
if (pd.find("#define _MSC_EXTENSIONS ") != pd.npos) {
args.push_back("-fms-extensions");
}
=====================================
src/Version.cmake
=====================================
@@ -1,7 +1,7 @@
# CastXML version number components.
set(CastXML_VERSION_MAJOR 0)
set(CastXML_VERSION_MINOR 6)
-set(CastXML_VERSION_PATCH 8)
+set(CastXML_VERSION_PATCH 10)
#set(CastXML_VERSION_RC 0)
set(CastXML_VERSION_IS_DIRTY 0)
@@ -13,7 +13,7 @@ if(DEFINED CastXML_VERSION_RC)
endif()
# If this source was exported by 'git archive', use its commit info.
-set(git_info "1b6e933 CastXML 0.6.8")
+set(git_info "02934d8 CastXML 0.6.10")
# Otherwise, try to identify the current development source version.
if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* "
=====================================
test/CMakeLists.txt
=====================================
@@ -431,6 +431,7 @@ castxml_test_cmd(cc-gnu-c-std-gnu99 --castxml-cc-gnu-c "(" $<TARGET_FILE:cc-gnu>
castxml_test_cmd(cc-gnu-c-std-gnu11 --castxml-cc-gnu-c "(" $<TARGET_FILE:cc-gnu> -std=201112L ")" ${empty_c} "-###")
castxml_test_cmd(cc-gnu-c-tgt-i386-opt-E --castxml-cc-gnu-c "(" $<TARGET_FILE:cc-gnu> --cc-define=__i386__ --cc-define=__OPTIMIZE__ ")" ${empty_c} -E -dM)
castxml_test_cmd(cc-gnu-builtin-unique-object-representations --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> -std=201703L ")" ${input}/has_unique_object_representations.cxx)
+castxml_test_cmd(cc-gnu-fsized-deallocation --castxml-cc-gnu "(" $<TARGET_FILE:cc-gnu> -fsized-deallocation ")" ${empty_cxx} "-###")
# Test --castxml-cc-msvc detection.
add_executable(cc-msvc cc-msvc.c)
=====================================
test/cc-gnu.c
=====================================
@@ -16,6 +16,8 @@ int main(int argc, const char* argv[])
std_date = argv[i] + 5;
} else if (strcmp(argv[i], "-ansi") == 0) {
fprintf(stdout, "#define __STRICT_ANSI__ 1\n");
+ } else if (strcmp(argv[i], "-fsized-deallocation") == 0) {
+ fprintf(stdout, "#define __cpp_sized_deallocation 201309L\n");
} else if (strcmp(argv[i], "-tgt-armv7") == 0) {
fprintf(stdout, "#define __arm__ 1\n");
fprintf(stdout, "#define __ARM_ARCH 7\n");
=====================================
test/expect/cmd.castxml-empty-c++98-c.stderr.txt
=====================================
@@ -0,0 +1 @@
+^(warning: argument unused during compilation: '-c' \[-Wunused-command-line-argument\])?$
=====================================
test/expect/cmd.cc-gnu-fsized-deallocation.stderr.txt
=====================================
@@ -0,0 +1 @@
+"clang" .* "-fsized-deallocation"
=====================================
test/expect/cmd.gccxml-empty-c++98-c.stderr.txt
=====================================
@@ -0,0 +1 @@
+^(warning: argument unused during compilation: '-c' \[-Wunused-command-line-argument\])?$
=====================================
test/run.cmake
=====================================
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
if(xml)
file(REMOVE "${xml}")
View it on GitLab: https://salsa.debian.org/med-team/castxml/-/commit/b251c3a6c09f00f45bb612097ecfcb3fe6a5dfb1
--
View it on GitLab: https://salsa.debian.org/med-team/castxml/-/commit/b251c3a6c09f00f45bb612097ecfcb3fe6a5dfb1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20241201/ba803a32/attachment-0001.htm>
More information about the debian-med-commit
mailing list