Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
preprocessor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pablo Winant
preprocessor
Commits
0c0ea6b8
Verified
Commit
0c0ea6b8
authored
May 10, 2021
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
Update m4 macros from autoconf-archive
parent
80e10902
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
m4/ax_boost_base.m4
+4
-2
4 additions, 2 deletions
m4/ax_boost_base.m4
m4/ax_cxx_compile_stdcxx.m4
+13
-2
13 additions, 2 deletions
m4/ax_cxx_compile_stdcxx.m4
with
17 additions
and
4 deletions
m4/ax_boost_base.m4
+
4
−
2
View file @
0c0ea6b8
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
# and this notice are preserved. This file is offered as-is, without any
# and this notice are preserved. This file is offered as-is, without any
# warranty.
# warranty.
#serial 4
3
#serial 4
9
# example boost program (need to pass version)
# example boost program (need to pass version)
m4_define([_AX_BOOST_BASE_PROGRAM],
m4_define([_AX_BOOST_BASE_PROGRAM],
...
@@ -113,7 +113,8 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
...
@@ -113,7 +113,8 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
dnl are found, e.g. when only header-only libraries are installed!
dnl are found, e.g. when only header-only libraries are installed!
AS_CASE([${host_cpu}],
AS_CASE([${host_cpu}],
[x86_64],[libsubdirs="lib64 libx32 lib lib64"],
[x86_64],[libsubdirs="lib64 libx32 lib lib64"],
[ppc64|s390x|sparc64|aarch64|ppc64le],[libsubdirs="lib64 lib lib64"],
[mips*64*],[libsubdirs="lib64 lib32 lib lib64"],
[ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"],
[libsubdirs="lib"]
[libsubdirs="lib"]
)
)
...
@@ -122,6 +123,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
...
@@ -122,6 +123,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
dnl are almost assuredly the ones desired.
dnl are almost assuredly the ones desired.
AS_CASE([${host_cpu}],
AS_CASE([${host_cpu}],
[i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
[i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
[armv7l],[multiarch_libsubdir="lib/arm-${host_os}"],
[multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
[multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
)
)
...
...
...
...
This diff is collapsed.
Click to expand it.
m4/ax_cxx_compile_stdcxx.m4
+
13
−
2
View file @
0c0ea6b8
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
# The second argument, if specified, indicates whether you insist on an
# The second argument, if specified, indicates whether you insist on an
# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
# -std=c++11). If neither is specified, you get whatever works, with
# -std=c++11). If neither is specified, you get whatever works, with
# preference for an extended mode.
# preference for
no added switch, and then for
an extended mode.
#
#
# The third argument, if specified 'mandatory' or if left unspecified,
# The third argument, if specified 'mandatory' or if left unspecified,
# indicates that baseline support for the specified C++ standard is
# indicates that baseline support for the specified C++ standard is
...
@@ -35,13 +35,14 @@
...
@@ -35,13 +35,14 @@
# Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
# Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
# Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
# Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
# Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
# Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
# Copyright (c) 2020 Jason Merrill <jason@redhat.com>
#
#
# Copying and distribution of this file, with or without modification, are
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# and this notice are preserved. This file is offered as-is, without any
# warranty.
# warranty.
#serial 1
1
#serial 1
2
dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
dnl (serial version number 13).
dnl (serial version number 13).
...
@@ -62,6 +63,16 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
...
@@ -62,6 +63,16 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
AC_LANG_PUSH([C++])dnl
AC_LANG_PUSH([C++])dnl
ac_success=no
ac_success=no
m4_if([$2], [], [dnl
AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
ax_cv_cxx_compile_cxx$1,
[AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[ax_cv_cxx_compile_cxx$1=yes],
[ax_cv_cxx_compile_cxx$1=no])])
if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
ac_success=yes
fi])
m4_if([$2], [noext], [], [dnl
m4_if([$2], [noext], [], [dnl
if test x$ac_success = xno; then
if test x$ac_success = xno; then
for alternative in ${ax_cxx_compile_alternatives}; do
for alternative in ${ax_cxx_compile_alternatives}; do
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment