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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sandbox:master commit in: /
Date: Sat, 17 Nov 2012 19:16:23 +0000 (UTC)	[thread overview]
Message-ID: <1353179758.f2500f5954611d110ac18e9990f42d5a915f8101.vapier@gentoo> (raw)

commit:     f2500f5954611d110ac18e9990f42d5a915f8101
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 28 16:19:56 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 19:15:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sandbox.git;a=commit;h=f2500f59

add a configure option to control pch usage

Mostly for testing purposes.  This also tweaks the dependency to fix a
warning when generating the headers.h.pch in subdirs when the toplevel
headers.h.pch already exists.

URL: http://bugs.gentoo.org/425524
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 Makefile.am  |   25 +++++++++++++++++++------
 configure.ac |   12 ++++++++++--
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 475c8c0..eb54f42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,9 @@ SUBDIRS = \
 	src        \
 	tests
 
+noinst_LTLIBRARIES =
+
 SANDBOX_PCH = headers.h.gch libsandbox/headers.h.gch libsbutil/headers.h.gch
-BUILT_SOURCES = $(SANDBOX_PCH)
-noinst_LTLIBRARIES = libpch.la
 nodist_libpch_la_SOURCES = $(SANDBOX_PCH)
 GCH_CP = ( \
 	src=`dirname $@`/.libs/`basename $@`.o; \
@@ -30,10 +30,23 @@ $(builddir)/libsandbox/headers.h.gch: headers.h
 $(builddir)/headers.h.gch: headers.h
 	$(AM_V_GEN)$(COMPILE) -c -o $@.o $< && $(GCH_CP)
 
-libsbutil: libsbutil/headers.h.gch
-libsandbox: libsbutil libsandbox/headers.h.gch
-src: libsbutil headers.h.gch
-tests: src headers.h.gch
+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)
 
 EXTRA_DIST = headers.h localdecls.h ChangeLog.0
 

diff --git a/configure.ac b/configure.ac
index 661b494..ca0d3ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.61])
 AC_INIT([sandbox], [2.7], [sandbox@gentoo.org])
-AM_INIT_AUTOMAKE([1.11.6 dist-xz no-dist-gzip silent-rules -Wall])
+AM_INIT_AUTOMAKE([1.11.1 dist-xz no-dist-gzip silent-rules -Wall])
 AM_SILENT_RULES([yes]) # AM_INIT_AUTOMAKE([silent-rules]) is broken atm
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -26,7 +26,7 @@ AC_ISC_POSIX
 AC_USE_SYSTEM_EXTENSIONS
 
 dnl Checks for programs.
-AM_PROG_AR
+#AM_PROG_AR
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_AWK
@@ -38,6 +38,14 @@ 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],

next             reply	other threads:[~2012-11-17 19:16 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-17 19:16 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-24 15:56 [gentoo-commits] proj/sandbox:master commit in: / Mike Gilbert
2025-02-23 20:11 Mike Gilbert
2025-02-22 19:55 Mike Gilbert
2025-01-19 21:21 Mike Gilbert
2025-01-17 21:27 Mike Gilbert
2025-01-17 21:08 Mike Gilbert
2025-01-17 18:35 Mike Gilbert
2025-01-17 18:28 Mike Gilbert
2025-01-17 17:58 Mike Gilbert
2025-01-08  2:12 [gentoo-commits] proj/sandbox:stable-2.x " Mike Gilbert
2025-01-14  4:38 ` [gentoo-commits] proj/sandbox:master " Mike Gilbert
2024-12-22 19:19 [gentoo-commits] proj/sandbox:stable-2.x " Mike Gilbert
2025-01-14  4:38 ` [gentoo-commits] proj/sandbox:master " Mike Gilbert
2024-12-22  3:49 [gentoo-commits] proj/sandbox:stable-2.x " Mike Gilbert
2025-01-14  4:38 ` [gentoo-commits] proj/sandbox:master " Mike Gilbert
2024-11-04 19:27 [gentoo-commits] proj/sandbox:stable-2.x " Mike Gilbert
2025-01-14  4:38 ` [gentoo-commits] proj/sandbox:master " Mike Gilbert
2024-05-04 12:03 Sam James
2023-08-05  4:32 Sam James
2023-08-05  4:32 Sam James
2023-06-23 17:25 Mike Gilbert
2023-02-16 22:59 Sam James
2021-11-06  3:51 Mike Frysinger
2021-11-06  3:51 Mike Frysinger
2021-11-03  6:59 Mike Frysinger
2021-11-03  0:34 Mike Frysinger
2021-11-03  0:34 Mike Frysinger
2021-10-28  7:38 Mike Frysinger
2021-10-24  4:16 Mike Frysinger
2021-10-22 17:49 Mike Frysinger
2021-10-22  2:48 Mike Frysinger
2021-10-21 20:37 Mike Frysinger
2021-10-21  7:57 Mike Frysinger
2021-10-21  6:10 Michał Górny
2021-10-18  8:48 Mike Frysinger
2021-10-18  8:48 Mike Frysinger
2021-09-07 15:58 Michał Górny
2021-05-04 22:13 Sergei Trofimovich
2021-05-04  8:00 Sergei Trofimovich
2021-04-10 20:17 Sergei Trofimovich
2021-03-27 11:45 Sergei Trofimovich
2021-03-27 11:45 Sergei Trofimovich
2021-03-11  9:08 Michał Górny
2021-03-11  8:04 Sergei Trofimovich
2020-05-31 10:52 Michał Górny
2020-02-28  7:00 Michał Górny
2019-07-12  6:47 Sergei Trofimovich
2019-03-13 10:12 Andreas K. Hüttel
2019-03-13 10:12 Andreas K. Hüttel
2019-03-11 12:48 Andreas K. Hüttel
2019-03-09 19:21 Sergei Trofimovich
2019-01-13 11:39 Michał Górny
2019-01-09 13:45 Michał Górny
2018-12-02 15:28 Michał Górny
2017-10-03 21:24 Michał Górny
2016-03-29 12:24 Mike Frysinger
2015-12-20 21:12 Mike Frysinger
2015-12-20  8:41 Mike Frysinger
2015-12-20  8:41 Mike Frysinger
2015-12-19 18:10 Mike Frysinger
2015-09-27  6:30 Mike Frysinger
2015-09-27  6:30 Mike Frysinger
2015-09-20  8:16 Mike Frysinger
2015-09-20  8:15 Mike Frysinger
2015-09-20  8:15 Mike Frysinger
2015-09-20  8:15 Mike Frysinger
2015-09-20  8:15 Mike Frysinger
2015-09-11  7:53 Mike Frysinger
2012-11-26 10:10 Mike Frysinger
2012-11-17 19:16 Mike Frysinger
2012-11-17 19:16 Mike Frysinger
2012-07-03 19:42 Mike Frysinger
2012-07-03 19:41 Mike Frysinger
2012-06-23 23:12 Mike Frysinger
2012-06-23 21:36 Mike Frysinger
2012-06-23 21:36 Mike Frysinger
2012-03-06  5:17 Mike Frysinger
2012-03-05  7:01 Mike Frysinger
2011-02-14  6:19 Mike Frysinger
2011-02-14  6:19 Mike Frysinger
2011-02-14  6:19 Mike Frysinger

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:475c8c0 dfblob:eb54f42 dfblob:661b494 dfblob:ca0d3ac )
 OR (
bs:"[gentoo-commits] proj/sandbox:master commit in: /" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1353179758.f2500f5954611d110ac18e9990f42d5a915f8101.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox