diff options
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog | 12 | ||||
| -rw-r--r-- | libffi/Makefile.in | 1 | ||||
| -rwxr-xr-x | libffi/configure | 23 | ||||
| -rw-r--r-- | libffi/configure.ac | 3 | ||||
| -rw-r--r-- | libffi/include/Makefile.am | 2 | ||||
| -rw-r--r-- | libffi/include/Makefile.in | 3 | ||||
| -rw-r--r-- | libffi/man/Makefile.in | 1 | ||||
| -rw-r--r-- | libffi/testsuite/Makefile.in | 1 |
8 files changed, 42 insertions, 4 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index a0ed590c8a5..e73b93b5470 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,15 @@ +2017-01-21 Jakub Jelinek <jakub@redhat.com> + + PR other/79046 + * configure.ac: Add GCC_BASE_VER. + * include/Makefile.am (gcc_version): Use @get_gcc_base_ver@ instead + of cat to get version from BASE-VER file. + * configure: Regenerated. + * testsuite/Makefile.in: Regenerated. + * include/Makefile.in: Regenerated. + * Makefile.in: Regenerated. + * man/Makefile.in: Regenerated. + 2016-11-15 Matthias Klose <doko@ubuntu.com> * configure: Regenerate. diff --git a/libffi/Makefile.in b/libffi/Makefile.in index f4292b5dd80..8a99ee58b68 100644 --- a/libffi/Makefile.in +++ b/libffi/Makefile.in @@ -293,6 +293,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +get_gcc_base_ver = @get_gcc_base_ver@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/libffi/configure b/libffi/configure index 4648c43e903..74b747b3b7e 100755 --- a/libffi/configure +++ b/libffi/configure @@ -604,6 +604,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +get_gcc_base_ver LIBAT_BUILD_VERSIONED_SHLIB_SUN_FALSE LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE LIBAT_BUILD_VERSIONED_SHLIB_GNU_FALSE @@ -777,6 +778,7 @@ enable_structs enable_raw_api enable_purify_safety enable_symvers +with_gcc_major_version_only ' ac_precious_vars='build_alias host_alias @@ -1434,6 +1436,8 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-gcc-major-version-only + use only GCC major number in filesystem paths Some influential environment variables: CC C compiler command @@ -11386,7 +11390,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11389 "configure" +#line 11393 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11492,7 +11496,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11495 "configure" +#line 11499 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16433,6 +16437,21 @@ fi $as_echo "$as_me: versioning on shared library symbols is $enable_symvers" >&6;} +# Determine what GCC version number to use in filesystem paths. + + get_gcc_base_ver="cat" + +# Check whether --with-gcc-major-version-only was given. +if test "${with_gcc_major_version_only+set}" = set; then : + withval=$with_gcc_major_version_only; if test x$with_gcc_major_version_only = xyes ; then + get_gcc_base_ver="sed -e 's/^\([0-9]*\).*\$\$/\1/'" + fi + +fi + + + + ac_config_commands="$ac_config_commands include" ac_config_commands="$ac_config_commands src" diff --git a/libffi/configure.ac b/libffi/configure.ac index 6205a10c36b..a01d8ac16b0 100644 --- a/libffi/configure.ac +++ b/libffi/configure.ac @@ -358,6 +358,9 @@ fi # Check linker support. LIBAT_ENABLE_SYMVERS +# Determine what GCC version number to use in filesystem paths. +GCC_BASE_VER + AC_CONFIG_COMMANDS(include, [test -d include || mkdir include]) AC_CONFIG_COMMANDS(src, [ test -d src || mkdir src diff --git a/libffi/include/Makefile.am b/libffi/include/Makefile.am index 79f222c482c..37fde6e9680 100644 --- a/libffi/include/Makefile.am +++ b/libffi/include/Makefile.am @@ -7,7 +7,7 @@ noinst_HEADERS=ffi_common.h ffi_cfi.h EXTRA_DIST=ffi.h.in # Where generated headers like ffitarget.h get installed. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include toollibffi_HEADERS = ffi.h ffitarget.h diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in index 82b25d7267e..e0c75992327 100644 --- a/libffi/include/Makefile.in +++ b/libffi/include/Makefile.in @@ -211,6 +211,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +get_gcc_base_ver = @get_gcc_base_ver@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -252,7 +253,7 @@ noinst_HEADERS = ffi_common.h ffi_cfi.h EXTRA_DIST = ffi.h.in # Where generated headers like ffitarget.h get installed. -gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER) toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include toollibffi_HEADERS = ffi.h ffitarget.h all: all-am diff --git a/libffi/man/Makefile.in b/libffi/man/Makefile.in index be296a57db9..0243bdbedfa 100644 --- a/libffi/man/Makefile.in +++ b/libffi/man/Makefile.in @@ -209,6 +209,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +get_gcc_base_ver = @get_gcc_base_ver@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff --git a/libffi/testsuite/Makefile.in b/libffi/testsuite/Makefile.in index 0e244202326..b7da4b0b3e7 100644 --- a/libffi/testsuite/Makefile.in +++ b/libffi/testsuite/Makefile.in @@ -180,6 +180,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +get_gcc_base_ver = @get_gcc_base_ver@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ |