gnomeos: Pull in NSS and SQLite as tarball-from-git imports
This commit is contained in:
Colin Walters
parent
f84d0db9a1
commit
48f789d381
|
|
@ -0,0 +1,23 @@
|
|||
From 13cb6d93e84dd47f13c6ca4ea1dfed78c6dc1ae1 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
Date: Mon, 9 Jan 2012 17:36:05 -0500
|
||||
Subject: [PATCH] autogen.sh: Add developer bootstrap script
|
||||
|
||||
See people.gnome.org/~walters/docs/build-api.txt
|
||||
---
|
||||
autogen.sh | 3 +++
|
||||
1 files changed, 3 insertions(+), 0 deletions(-)
|
||||
create mode 100755 autogen.sh
|
||||
|
||||
diff --git a/autogen.sh b/autogen.sh
|
||||
new file mode 100755
|
||||
index 0000000..bc46fd5
|
||||
--- /dev/null
|
||||
+++ b/autogen.sh
|
||||
@@ -0,0 +1,3 @@
|
||||
+#!/bin/sh
|
||||
+exec autoreconf -ifv
|
||||
+
|
||||
--
|
||||
1.7.6.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -10,6 +10,7 @@
|
|||
"fd-dbus": "git:git://anongit.freedesktop.org/git/dbus/",
|
||||
"fd-NM": "git:git://anongit.freedesktop.org/git/NetworkManager/",
|
||||
"fedora": "git:git://git.fedorahosted.org/",
|
||||
"savannah": "git:git://git.savannah.gnu.org/",
|
||||
"cgwalters": "git:git://github.com/cgwalters/"},
|
||||
|
||||
"components": [
|
||||
|
|
@ -268,9 +269,19 @@
|
|||
{"src": "fedora:hwdata.git",
|
||||
"patches": ["hwdata-buildapi.patch"]},
|
||||
|
||||
{"src": "cgwalters:texinfo-git-mirror",
|
||||
"branch": "TEXI2HTML_1_82",
|
||||
"config-opts": ["--disable-man-pages"],
|
||||
"patches": ["texinfo-disable-man.patch"]},
|
||||
|
||||
{"src": "savannah:gperf.git",
|
||||
"branch": "v3.0.4",
|
||||
"patches": ["gperf-autotools.patch"]},
|
||||
|
||||
{"src": "git:git://git.kernel.org/pub/scm/linux/hotplug/udev.git",
|
||||
"branch": "175",
|
||||
"patches": ["udev-autogen.patch"]},
|
||||
"config-opts": ["--disable-documentation"],
|
||||
"patches": ["udev-autogen.patch", "udev-docs.patch"]},
|
||||
|
||||
{"src": "cgwalters:expat-git-mirror.git",
|
||||
"patches": ["expat-autogen.patch"]},
|
||||
|
|
@ -286,8 +297,11 @@
|
|||
"config-opts": ["--disable-gtk-doc"]},
|
||||
|
||||
{"src": "git:git://git.infradead.org/users/tgr/libnl.git",
|
||||
"name": "libnl3",
|
||||
"branch": "libnl3_1"},
|
||||
"name": "libnl3"},
|
||||
|
||||
{"src": "cgwalters:nspr-tarballs-as-git"},
|
||||
|
||||
{"src": "cgwalters:sqlite-tarballs-as-git"},
|
||||
|
||||
{"src": "fd-NM:NetworkManager",
|
||||
"config-opts": ["--with-distro=generic"],
|
||||
|
|
|
|||
|
|
@ -0,0 +1,76 @@
|
|||
From 2fc37f3c696d7ffa9a3dbf6c6f5e1b10f81753a8 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
Date: Mon, 9 Jan 2012 13:13:57 -0500
|
||||
Subject: [PATCH] build: Add --disable-man-pages option
|
||||
|
||||
There's a circular build dependency between texinfo and help2man
|
||||
now. Allow operating system builders to manually break the cycle
|
||||
by disabling man page generation in texinfo.
|
||||
---
|
||||
configure.ac | 8 +++++++-
|
||||
doc/Makefile.am | 11 ++++++++++-
|
||||
2 files changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3ca8b64..31f0c7e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -36,7 +36,13 @@ gl_INIT
|
||||
|
||||
# Since we make a helper library.
|
||||
AC_PROG_RANLIB
|
||||
-AM_MISSING_PROG(HELP2MAN, help2man)
|
||||
+AC_ARG_ENABLE([man-pages],
|
||||
+ [AS_HELP_STRING([--enable-man-pages],
|
||||
+ [Build man pages with help2man])],, enable_man_pages=yes)
|
||||
+AM_CONDITIONAL(ENABLE_MAN_PAGES, test x$enable_man_pages = xyes)
|
||||
+if test x$enable_man_pages = xyes; then
|
||||
+ AM_MISSING_PROG(HELP2MAN, help2man)
|
||||
+fi
|
||||
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_MAKE_SET
|
||||
diff --git a/doc/Makefile.am b/doc/Makefile.am
|
||||
index 54c490e..7ce2cee 100644
|
||||
--- a/doc/Makefile.am
|
||||
+++ b/doc/Makefile.am
|
||||
@@ -14,8 +14,10 @@
|
||||
info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
|
||||
DISTCLEANFILES = texinfo texinfo-* info*.info*
|
||||
|
||||
+if ENABLE_MAN_PAGES
|
||||
man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 \
|
||||
info.5 texinfo.5
|
||||
+endif
|
||||
|
||||
# Use the programs built in our distribution, taking account of possible
|
||||
# cross-compiling.
|
||||
@@ -36,9 +38,14 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \
|
||||
# Include our texinfo.tex, not Automake's.
|
||||
EXTRA_DIST = epsf.tex texinfo.tex \
|
||||
fdl.texi \
|
||||
- $(man_MANS) $(TXI_XLATE)
|
||||
+ $(TXI_XLATE)
|
||||
$(refcard_files)
|
||||
|
||||
+if ENABLE_MAN_PAGES
|
||||
+EXTRA_DIST += $(man_MANS)
|
||||
+endif
|
||||
+
|
||||
+
|
||||
if INSTALL_WARNINGS
|
||||
install-data-local:
|
||||
@echo
|
||||
@@ -108,7 +115,9 @@ $(srcdir)/texindex.1: $(util_srcdir)/texindex.c $(common_mandeps)
|
||||
## texi2dvi. ##
|
||||
## ---------- ##
|
||||
|
||||
+if ENABLE_MAN_PAGES
|
||||
man_MANS += texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
|
||||
+endif
|
||||
util_srcdir = $(top_srcdir)/util
|
||||
|
||||
# Do not depend on the current user's settings.
|
||||
--
|
||||
1.7.6.4
|
||||
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
From 1d6d869d498227d6f13b312a6a00ab31de5996a9 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
Date: Mon, 9 Jan 2012 14:34:24 -0500
|
||||
Subject: [PATCH] build: Add --disable-documentation configure option
|
||||
|
||||
Documentation is the source of many cyclical build loops. Allow
|
||||
operating system builders to manually cut these cycles initially
|
||||
by disabling documentation for a first pass.
|
||||
---
|
||||
Makefile.am | 10 ++++++++--
|
||||
configure.ac | 9 ++++++++-
|
||||
2 files changed, 16 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 7a35395..08213ce 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -191,12 +191,15 @@ udev_udevadm_LDADD = libudev/libudev-private.la
|
||||
# ------------------------------------------------------------------------------
|
||||
# udev man pages
|
||||
# ------------------------------------------------------------------------------
|
||||
-dist_man_MANS = \
|
||||
+dist_man_MANS =
|
||||
+dist_noinst_DATA =
|
||||
+if ENABLE_DOCUMENTATION
|
||||
+dist_man_MANS += \
|
||||
udev/udev.7 \
|
||||
udev/udevadm.8 \
|
||||
udev/udevd.8
|
||||
|
||||
-dist_noinst_DATA = \
|
||||
+dist_noinst_DATA += \
|
||||
udev/udev.html \
|
||||
udev/udevadm.html \
|
||||
udev/udevd.html
|
||||
@@ -205,6 +208,7 @@ EXTRA_DIST += \
|
||||
udev/udev.xml \
|
||||
udev/udevadm.xml \
|
||||
udev/udevd.xml
|
||||
+endif
|
||||
|
||||
udev/%.7 udev/%.8 : udev/%.xml
|
||||
$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
|
||||
@@ -270,7 +274,9 @@ extras_scsi_id_scsi_id_SOURCES =\
|
||||
extras/scsi_id/scsi_id.h
|
||||
extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
|
||||
libexec_PROGRAMS += extras/scsi_id/scsi_id
|
||||
+if ENABLE_DOCUMENTATION
|
||||
dist_man_MANS += extras/scsi_id/scsi_id.8
|
||||
+endif
|
||||
EXTRA_DIST += extras/scsi_id/README
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e387fac..3c7b830 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -15,7 +15,6 @@ LT_INIT([disable-static])
|
||||
AC_PROG_AWK
|
||||
GTK_DOC_CHECK(1.10)
|
||||
AC_PREFIX_DEFAULT([/usr])
|
||||
-AC_PATH_PROG([XSLTPROC], [xsltproc])
|
||||
|
||||
AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([POSIX RT library not found])])
|
||||
|
||||
@@ -39,6 +38,14 @@ AS_IF([test "x$with_selinux" = "xyes"], [
|
||||
AC_SUBST([SELINUX_LIBS])
|
||||
AM_CONDITIONAL(WITH_SELINUX, [test "x$with_selinux" = "xyes"])
|
||||
|
||||
+AC_ARG_ENABLE([documentation],
|
||||
+ AS_HELP_STRING([--enable-documentation], [enable man pages and HTML]),
|
||||
+ [], [enable_documentation=yes])
|
||||
+AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
|
||||
+if test x$enable_documentation = xyes; then
|
||||
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
|
||||
+fi
|
||||
+
|
||||
AC_ARG_ENABLE([debug],
|
||||
AS_HELP_STRING([--enable-debug], [enable debug messages @<:@default=disabled@:>@]),
|
||||
[], [enable_debug=no])
|
||||
--
|
||||
1.7.6.4
|
||||
|
||||
Loading…
Reference in New Issue