[gentoo-commits] proj/sandbox:master commit in: /

[Michał Górny]

commit:     0866b74c29402d3df89b698e760713ce49c41eb9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 13 11:21:43 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 13 11:38:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=0866b74c

Remove pointless .pch support

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 Makefile.am  | 38 +++-----------------------------------
 configure.ac |  9 ---------
 2 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index eb54f42..c730dba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,44 +13,12 @@ SUBDIRS = \
 
 noinst_LTLIBRARIES =
 
-SANDBOX_PCH = headers.h.gch libsandbox/headers.h.gch libsbutil/headers.h.gch
-nodist_libpch_la_SOURCES = $(SANDBOX_PCH)
-GCH_CP = ( \
-	src=`dirname $@`/.libs/`basename $@`.o; \
-	test -e "$$src" || src=$@.o; \
-	cp $$src $@ \
-	)
-# This is built as PIC
-$(builddir)/libsbutil/headers.h.gch: headers.h
-	$(AM_V_GEN)$(LTCOMPILE) -c -o $@.o $< && $(GCH_CP)
-# This is built as PIC + exceptions
-$(builddir)/libsandbox/headers.h.gch: headers.h
-	$(AM_V_GEN)$(LTCOMPILE) -c -o $@.o $< $(CFLAG_EXCEPTIONS) && $(GCH_CP)
-# This is built w/out PIC
-$(builddir)/headers.h.gch: headers.h
-	$(AM_V_GEN)$(COMPILE) -c -o $@.o $< && $(GCH_CP)
-
-if SB_BUILD_PCH
-BUILT_SOURCES = $(SANDBOX_PCH)
-noinst_LTLIBRARIES += libpch.la
-
-LIBSBUTIL_PCH = libsbutil/headers.h.gch
-LIBSANDBOX_PCH = libsandbox/headers.h.gch
-TOP_PCH = headers.h.gch
-
-# Make sure we build the subdirs before the top so they don't
-# try to use the top level headers.h.pch.
-$(TOP_PCH): $(LIBSBUTIL_PCH) $(LIBSANDBOX_PCH)
-endif
-
-libsbutil: $(LIBSBUTIL_PCH)
-libsandbox: libsbutil $(LIBSANDBOX_PCH)
-src: libsbutil $(TOP_PCH)
-tests: src $(TOP_PCH)
+libsandbox: libsbutil
+src: libsbutil
+tests: src
 
 EXTRA_DIST = headers.h localdecls.h ChangeLog.0
 
-CLEANFILES = $(SANDBOX_PCH)
 DISTCLEANFILES = $(CLEANFILES)
 
 ChangeLog:

diff --git a/configure.ac b/configure.ac
index d4886b3..191d096 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,14 +38,6 @@ LT_INIT([disable-static])
 
 AC_PREFIX_DEFAULT([/usr])
 
-dnl allow pch to be controlled
-AC_MSG_CHECKING([whether to use pre-compiled sandbox headers])
-AC_ARG_ENABLE([pch],
-	[AS_HELP_STRING([--disable-pch],[Disable pre-compiled headers])],
-	[],[enable_pch="yes"])
-AM_CONDITIONAL([SB_BUILD_PCH], test "$enable_pch" = "yes")
-AC_MSG_RESULT($enable_pch)
-
 dnl multiple personality support (x86 & x86_64: multilib)
 AC_MSG_CHECKING([for multiple personalities])
 AC_ARG_ENABLE([schizo],
@@ -425,7 +417,6 @@ AC_SUBST([CFLAG_EXCEPTIONS])
 CPPFLAGS="$CPPFLAGS -D_REENTRANT"
 AX_CFLAGS_WARN_ALL
 AC_DEFUN([SB_CHECK_CFLAG],[AX_CHECK_COMPILE_FLAG([$1],[CFLAGS="$CFLAGS $1"])])
-SB_CHECK_CFLAG([-Winvalid-pch])
 SB_CHECK_CFLAG([-fdata-sections])
 SB_CHECK_CFLAG([-ffunction-sections])
 dnl We have our own wrapped memory functions.