re PR other/79046 (g++ -print-file-name=plugin uses full version number in path)
PR other/79046 * aclocal.m4: Include ../config/acx.m4. * configure: Regenerated. * Makefile.in: Regenerated. * mpxrt/Makefile.in: Regenerated. * mpxwrap/Makefile.in: Regenerated. From-SVN: r244627
This commit is contained in:
Jakub Jelinek
Jakub Jelinek
parent
54740d7d82
commit
f67f94b8e2
|
|
@ -1,3 +1,12 @@
|
|||
2017-01-19 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR other/79046
|
||||
* aclocal.m4: Include ../config/acx.m4.
|
||||
* configure: Regenerated.
|
||||
* Makefile.in: Regenerated.
|
||||
* mpxrt/Makefile.in: Regenerated.
|
||||
* mpxwrap/Makefile.in: Regenerated.
|
||||
|
||||
2017-01-17 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR other/79046
|
||||
|
|
|
|||
|
|
@ -59,7 +59,8 @@ DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
|||
$(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \
|
||||
$(srcdir)/libmpx.spec.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
|
|
@ -216,6 +217,7 @@ dvidir = @dvidir@
|
|||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
exec_prefix = @exec_prefix@
|
||||
get_gcc_base_ver = @get_gcc_base_ver@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
|
|
|
|||
|
|
@ -705,6 +705,7 @@ AC_SUBST([am__tar])
|
|||
AC_SUBST([am__untar])
|
||||
]) # _AM_PROG_TAR
|
||||
|
||||
m4_include([../config/acx.m4])
|
||||
m4_include([../config/lead-dot.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
|
|
|
|||
|
|
@ -603,6 +603,7 @@ ac_subst_vars='am__EXEEXT_FALSE
|
|||
am__EXEEXT_TRUE
|
||||
LTLIBOBJS
|
||||
LIBOBJS
|
||||
get_gcc_base_ver
|
||||
XCFLAGS
|
||||
enable_static
|
||||
enable_shared
|
||||
|
|
@ -731,6 +732,7 @@ with_pic
|
|||
enable_fast_install
|
||||
with_gnu_ld
|
||||
enable_libtool_lock
|
||||
with_gcc_major_version_only
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
host_alias
|
||||
|
|
@ -1377,6 +1379,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
|
||||
|
|
@ -11230,7 +11234,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11233 "configure"
|
||||
#line 11237 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -11336,7 +11340,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11339 "configure"
|
||||
#line 11343 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -11586,7 +11590,19 @@ else
|
|||
fi
|
||||
|
||||
# Determine what GCC version number to use in filesystem paths.
|
||||
GCC_BASE_VER
|
||||
|
||||
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_files="$ac_config_files Makefile libmpx.spec"
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,8 @@ target_triplet = @target@
|
|||
subdir = mpxrt
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
|
|
@ -210,6 +211,7 @@ dvidir = @dvidir@
|
|||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
exec_prefix = @exec_prefix@
|
||||
get_gcc_base_ver = @get_gcc_base_ver@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
|
|
|
|||
|
|
@ -55,7 +55,8 @@ target_triplet = @target@
|
|||
subdir = mpxwrap
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/lead-dot.m4 \
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
|
|
@ -209,6 +210,7 @@ dvidir = @dvidir@
|
|||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
exec_prefix = @exec_prefix@
|
||||
get_gcc_base_ver = @get_gcc_base_ver@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
|
|
|
|||
Loading…
Reference in New Issue