Committed to branch dmalcolm/jit:
pkg-config appears to be controversial, so don't provide a .pc file.
gcc/ChangeLog.jit:
* Makefile.in (pkgconfigdir): Drop this.
(installdirs): Likewise.
* configure.ac (gcc_version): Don't AC_SUBST this.
* configure: Regenerate.
gcc/jit/ChangeLog.jit:
* Make-lang.in (jit.install-common): Drop installation of
libgccjit.pc.
* config-lang.in (outputs): Drop jit/libgccjit.pc.
* libgccjit.pc.in: Delete.
---
gcc/ChangeLog.jit | 7 +++++++
gcc/Makefile.in | 3 ---
gcc/configure | 6 ++----
gcc/configure.ac | 1 -
gcc/jit/ChangeLog.jit | 7 +++++++
gcc/jit/Make-lang.in | 2 --
gcc/jit/config-lang.in | 4 ----
gcc/jit/libgccjit.pc.in | 11 -----------
8 files changed, 16 insertions(+), 25 deletions(-)
delete mode 100644 gcc/jit/libgccjit.pc.in
diff --git a/gcc/ChangeLog.jit b/gcc/ChangeLog.jit
index bf2d6d2..8dec312 100644
--- a/gcc/ChangeLog.jit
+++ b/gcc/ChangeLog.jit
@@ -1,3 +1,10 @@
+2014-10-20 David Malcolm <dmalc...@redhat.com>
+
+ * Makefile.in (pkgconfigdir): Drop this.
+ (installdirs): Likewise.
+ * configure.ac (gcc_version): Don't AC_SUBST this.
+ * configure: Regenerate.
+
2014-10-17 David Malcolm <dmalc...@redhat.com>
* Makefile.in (FULL_DRIVER_NAME): New variable, adapted from the
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 523d1db..954a1eb 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -570,8 +570,6 @@ bindir = @bindir@
libdir = @libdir@
# Directory in which GCC puts its executables.
libexecdir = @libexecdir@
-# Directory in which to install .pc files for pkgconfig
-pkgconfigdir = @libdir@/pkgconfig
# --------
# UNSORTED
@@ -3141,7 +3139,6 @@ installdirs:
$(mkinstalldirs) $(DESTDIR)$(infodir)
$(mkinstalldirs) $(DESTDIR)$(man1dir)
$(mkinstalldirs) $(DESTDIR)$(man7dir)
- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
PLUGIN_HEADERS = $(TREE_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
toplev.h $(DIAGNOSTIC_CORE_H) $(BASIC_BLOCK_H) $(HASH_TABLE_H) \
diff --git a/gcc/configure b/gcc/configure
index 81634f2..0024ece 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -825,7 +825,6 @@ build_os
build_vendor
build_cpu
build
-gcc_version
target_alias
host_alias
build_alias
@@ -3042,7 +3041,6 @@ ac_config_headers="$ac_config_headers
auto-host.h:config.in"
gcc_version=`cat $srcdir/BASE-VER`
-
# Determine the host, build, and target systems
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -18093,7 +18091,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18096 "configure"
+#line 18094 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18199,7 +18197,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18202 "configure"
+#line 18200 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 0af7a77..37db6ab 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -29,7 +29,6 @@ AC_CONFIG_SRCDIR(tree.c)
AC_CONFIG_HEADER(auto-host.h:config.in)
gcc_version=`cat $srcdir/BASE-VER`
-AC_SUBST(gcc_version)
# Determine the host, build, and target systems
AC_CANONICAL_BUILD
diff --git a/gcc/jit/ChangeLog.jit b/gcc/jit/ChangeLog.jit
index 0c55258..9a36dfd 100644
--- a/gcc/jit/ChangeLog.jit
+++ b/gcc/jit/ChangeLog.jit
@@ -1,3 +1,10 @@
+2014-10-20 David Malcolm <dmalc...@redhat.com>
+
+ * Make-lang.in (jit.install-common): Drop installation of
+ libgccjit.pc.
+ * config-lang.in (outputs): Drop jit/libgccjit.pc.
+ * libgccjit.pc.in: Delete.
+
2014-10-17 David Malcolm <dmalc...@redhat.com>
* Make-lang.in (jit): Add $(FULL_DRIVER_NAME) as a dependency, so
diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in
index ac179f4..167fcad 100644
--- a/gcc/jit/Make-lang.in
+++ b/gcc/jit/Make-lang.in
@@ -260,8 +260,6 @@ jit.install-common: installdirs
$(DESTDIR)/$(includedir)/libgccjit.h
$(INSTALL_PROGRAM) $(srcdir)/jit/libgccjit++.h \
$(DESTDIR)/$(includedir)/libgccjit++.h
- $(INSTALL_PROGRAM) jit/libgccjit.pc \
- $(DESTDIR)/$(libdir)/pkgconfig/libgccjit.pc
jit.install-man:
diff --git a/gcc/jit/config-lang.in b/gcc/jit/config-lang.in
index b22a5ee..7a32afe 100644
--- a/gcc/jit/config-lang.in
+++ b/gcc/jit/config-lang.in
@@ -36,7 +36,3 @@ gtfiles="\$(srcdir)/jit/dummy-frontend.c"
# Hence to get the jit, one must configure with:
# --enable-host-shared --enable-languages=jit
build_by_default="no"
-
-# Ensure that libgccjit.pc is built from libgccjit.pc.in
-# via AC_CONFIG_FILES in gcc/configure.ac
-outputs="jit/libgccjit.pc"
diff --git a/gcc/jit/libgccjit.pc.in b/gcc/jit/libgccjit.pc.in
deleted file mode 100644
index faafea5..0000000
--- a/gcc/jit/libgccjit.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libgccjit
-Description: Library for embedding GCC for Just-In-Time compilation
-URL: https://gcc.gnu.org/wiki/JIT
-Version: @gcc_version@
-Cflags: -I${includedir}
-Libs: -lgccjit -L${libdir}
--
1.7.11.7
