From a36c89d7cd7c48484a8ec320049cff146ef7ec74 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 13 Jan 2012 16:46:22 -0500 Subject: [PATCH] gnomeos: Build ostree inside self-hosting system too --- gnomeos/3.4/acl-2.2.39-build.patch | 54 ++++++++++++++++++++++++++++ gnomeos/3.4/acl-add-autogen.patch | 55 ++++++++++++++++++++++++++++ gnomeos/3.4/acl-makeinstall.patch | 28 +++++++++++++++ gnomeos/3.4/acl-no-builddir.patch | 26 ++++++++++++++ gnomeos/3.4/attr-2.4.32-build.patch | 56 +++++++++++++++++++++++++++++ gnomeos/3.4/attr-add-autogen.patch | 55 ++++++++++++++++++++++++++++ gnomeos/3.4/attr-makeinstall.patch | 28 +++++++++++++++ gnomeos/3.4/attr-no-builddir.patch | 26 ++++++++++++++ gnomeos/3.4/manifest.json | 21 +++++++++-- 9 files changed, 347 insertions(+), 2 deletions(-) create mode 100644 gnomeos/3.4/acl-2.2.39-build.patch create mode 100644 gnomeos/3.4/acl-add-autogen.patch create mode 100644 gnomeos/3.4/acl-makeinstall.patch create mode 100644 gnomeos/3.4/acl-no-builddir.patch create mode 100644 gnomeos/3.4/attr-2.4.32-build.patch create mode 100644 gnomeos/3.4/attr-add-autogen.patch create mode 100644 gnomeos/3.4/attr-makeinstall.patch create mode 100644 gnomeos/3.4/attr-no-builddir.patch diff --git a/gnomeos/3.4/acl-2.2.39-build.patch b/gnomeos/3.4/acl-2.2.39-build.patch new file mode 100644 index 00000000..80c92b7c --- /dev/null +++ b/gnomeos/3.4/acl-2.2.39-build.patch @@ -0,0 +1,54 @@ +From b525b062317d3174c8fa802302a498beb7d8d111 Mon Sep 17 00:00:00 2001 +From: Thomas Woerner +Date: Fri, 13 Jan 2012 15:49:46 -0500 +Subject: [PATCH] build: Support makeinstall DESTDIR= + +Signed-off-by: Colin Walters +--- + include/builddefs.in | 16 ++++++++-------- + include/buildmacros | 2 +- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/include/builddefs.in b/include/builddefs.in +index d054a56..10b0cd4 100644 +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -28,14 +28,14 @@ PKG_RELEASE = @pkg_release@ + PKG_VERSION = @pkg_version@ + PKG_PLATFORM = @pkg_platform@ + PKG_DISTRIBUTION= @pkg_distribution@ +-PKG_BIN_DIR = @bindir@ +-PKG_SBIN_DIR = @sbindir@ +-PKG_LIB_DIR = @libdir@@libdirsuffix@ +-PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ +-PKG_INC_DIR = @includedir@ +-PKG_MAN_DIR = @mandir@ +-PKG_DOC_DIR = @datadir@/doc/@pkg_name@ +-PKG_LOCALE_DIR = @datadir@/locale ++PKG_BIN_DIR = $(DESTDIR)@bindir@ ++PKG_SBIN_DIR = $(DESTDIR)@sbindir@ ++PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@ ++PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@ ++PKG_INC_DIR = $(DESTDIR)@includedir@ ++PKG_MAN_DIR = $(DESTDIR)@mandir@ ++PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@ ++PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale + + CC = @cc@ + AWK = @awk@ +diff --git a/include/buildmacros b/include/buildmacros +index ab89182..9c4fd50 100644 +--- a/include/buildmacros ++++ b/include/buildmacros +@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \ + $(LFILES:.l=.o) \ + $(YFILES:%.y=%.tab.o) + +-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++INSTALL = $(TOPDIR)/include/install-sh + + SHELL = /bin/sh + IMAGES_DIR = $(TOPDIR)/all-images +-- +1.7.6.4 + diff --git a/gnomeos/3.4/acl-add-autogen.patch b/gnomeos/3.4/acl-add-autogen.patch new file mode 100644 index 00000000..499dd804 --- /dev/null +++ b/gnomeos/3.4/acl-add-autogen.patch @@ -0,0 +1,55 @@ +From 41c1c78f462aa8bd254c28de0d6dd0b68c6f6571 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Fri, 13 Jan 2012 15:16:08 -0500 +Subject: [PATCH] autogen.sh: Add developer bootstrap script + +This gives us a standard way to build from git. Move the relevant +code out of the Makefile. + +See http://people.gnome.org/~walters/docs/build-api.txt +--- + Makefile | 10 +--------- + autogen.sh | 9 +++++++++ + 2 files changed, 10 insertions(+), 9 deletions(-) + create mode 100755 autogen.sh + +diff --git a/Makefile b/Makefile +index 6969443..26fdbc8 100644 +--- a/Makefile ++++ b/Makefile +@@ -57,16 +57,8 @@ else + clean: # if configure hasn't run, nothing to clean + endif + +-# Recent versions of libtool require the -i option for copying auxiliary +-# files (config.sub, config.guess, install-sh, ltmain.sh), while older +-# versions will copy those files anyway, and don't understand -i. +-LIBTOOLIZE_INSTALL = `libtoolize -n -i >/dev/null 2>/dev/null && echo -i` +- + configure include/builddefs: +- libtoolize -c $(LIBTOOLIZE_INSTALL) -f +- cp include/install-sh . +- aclocal -I m4 +- autoconf ++ ./autogen.sh + ./configure \ + --prefix=/ \ + --exec-prefix=/ \ +diff --git a/autogen.sh b/autogen.sh +new file mode 100755 +index 0000000..58fa0d6 +--- /dev/null ++++ b/autogen.sh +@@ -0,0 +1,9 @@ ++#!/bin/sh ++# Recent versions of libtool require the -i option for copying auxiliary ++# files (config.sub, config.guess, install-sh, ltmain.sh), while older ++# versions will copy those files anyway, and don't understand -i. ++libtoolize_install=`libtoolize -n -i >/dev/null 2>/dev/null && echo -i` ++libtoolize -c ${libtoolize_install} ++cp include/install-sh . ++aclocal -I m4 ++autoconf +-- +1.7.6.4 + diff --git a/gnomeos/3.4/acl-makeinstall.patch b/gnomeos/3.4/acl-makeinstall.patch new file mode 100644 index 00000000..d8171675 --- /dev/null +++ b/gnomeos/3.4/acl-makeinstall.patch @@ -0,0 +1,28 @@ +From a29218ba1ee9664ce250b7b1b749cb9dc8cc4811 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Fri, 13 Jan 2012 15:39:24 -0500 +Subject: [PATCH] build: make install install everything + +The make install-dev target is nice, but it'd be better eventually to +convert this to Automake after we land patches to do +buildapi-install-devel. +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 26fdbc8..1c9f0d6 100644 +--- a/Makefile ++++ b/Makefile +@@ -80,7 +80,7 @@ include/config.h: include/builddefs + $(MAKE) $(AM_MAKEFLAGS) include/builddefs; \ + fi + +-install: default $(addsuffix -install,$(SUBDIRS)) ++install: default install-dev install-lib $(addsuffix -install,$(SUBDIRS)) + $(INSTALL) -m 755 -d $(PKG_DOC_DIR) + $(INSTALL) -m 644 README $(PKG_DOC_DIR) + +-- +1.7.6.4 + diff --git a/gnomeos/3.4/acl-no-builddir.patch b/gnomeos/3.4/acl-no-builddir.patch new file mode 100644 index 00000000..e2bc6ab4 --- /dev/null +++ b/gnomeos/3.4/acl-no-builddir.patch @@ -0,0 +1,26 @@ +From 384d1ed0af7922804d3f6b83d94490b4d69dc963 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Fri, 13 Jan 2012 15:45:43 -0500 +Subject: [PATCH] build: Note that we don't support srcdir != builddir + +--- + configure.in | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/configure.in b/configure.in +index 7af2e8d..75853e3 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,6 +19,9 @@ AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADER(include/config.h) + AC_PREFIX_DEFAULT(/usr) + ++dnl http://people.gnome.org/~walters/docs/build-api.txt +++echo \#buildapi-variable-no-builddir >/dev/null ++ + AC_PROG_LIBTOOL + + AC_ARG_ENABLE(shared, +-- +1.7.6.4 + diff --git a/gnomeos/3.4/attr-2.4.32-build.patch b/gnomeos/3.4/attr-2.4.32-build.patch new file mode 100644 index 00000000..238d0a08 --- /dev/null +++ b/gnomeos/3.4/attr-2.4.32-build.patch @@ -0,0 +1,56 @@ +From 8bb41c30cddb806a944fd3811d9c3e5ab9062d9c Mon Sep 17 00:00:00 2001 +From: Thomas Woerner +Date: Fri, 13 Jan 2012 15:12:33 -0500 +Subject: [PATCH] build: Honor DESTDIR + +Patch imported from Fedora. + +Signed-off-by: Colin Walters +--- + include/builddefs.in | 16 ++++++++-------- + include/buildmacros | 2 +- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/include/builddefs.in b/include/builddefs.in +index 6df0f5a..575a6df 100644 +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -40,14 +40,14 @@ PKG_RELEASE = @pkg_release@ + PKG_VERSION = @pkg_version@ + PKG_PLATFORM = @pkg_platform@ + PKG_DISTRIBUTION= @pkg_distribution@ +-PKG_BIN_DIR = @bindir@ +-PKG_SBIN_DIR = @sbindir@ +-PKG_LIB_DIR = @libdir@@libdirsuffix@ +-PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ +-PKG_INC_DIR = @includedir@/attr +-PKG_MAN_DIR = @mandir@ +-PKG_DOC_DIR = @datadir@/doc/@pkg_name@ +-PKG_LOCALE_DIR = @datadir@/locale ++PKG_BIN_DIR = $(DESTDIR)@bindir@ ++PKG_SBIN_DIR = $(DESTDIR)@sbindir@ ++PKG_LIB_DIR = $(DESTDIR)@libdir@@libdirsuffix@ ++PKG_DEVLIB_DIR = $(DESTDIR)@libexecdir@@libdirsuffix@ ++PKG_INC_DIR = $(DESTDIR)@includedir@/attr ++PKG_MAN_DIR = $(DESTDIR)@mandir@ ++PKG_DOC_DIR = $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@ ++PKG_LOCALE_DIR = $(DESTDIR)@datadir@/locale + + CC = @cc@ + AWK = @awk@ +diff --git a/include/buildmacros b/include/buildmacros +index ab89182..9c4fd50 100644 +--- a/include/buildmacros ++++ b/include/buildmacros +@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \ + $(LFILES:.l=.o) \ + $(YFILES:%.y=%.tab.o) + +-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++INSTALL = $(TOPDIR)/include/install-sh + + SHELL = /bin/sh + IMAGES_DIR = $(TOPDIR)/all-images +-- +1.7.6.4 + diff --git a/gnomeos/3.4/attr-add-autogen.patch b/gnomeos/3.4/attr-add-autogen.patch new file mode 100644 index 00000000..c9f4e115 --- /dev/null +++ b/gnomeos/3.4/attr-add-autogen.patch @@ -0,0 +1,55 @@ +From 8ef45b305b45ed22d7508046344bce53a84323ea Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Fri, 13 Jan 2012 11:04:34 -0500 +Subject: [PATCH] autogen.sh: Add developer bootstrap script + +This gives us a standard way to build from git. Move the relevant +code out of the Makefile. + +See http://people.gnome.org/~walters/docs/build-api.txt +--- + Makefile | 10 +--------- + autogen.sh | 9 +++++++++ + 2 files changed, 10 insertions(+), 9 deletions(-) + create mode 100755 autogen.sh + +diff --git a/Makefile b/Makefile +index 080daba..8a9e777 100644 +--- a/Makefile ++++ b/Makefile +@@ -58,16 +58,8 @@ else + clean: # if configure hasn't run, nothing to clean + endif + +-# Recent versions of libtool require the -i option for copying auxiliary +-# files (config.sub, config.guess, install-sh, ltmain.sh), while older +-# versions will copy those files anyway, and don't understand -i. +-LIBTOOLIZE_INSTALL = `libtoolize -n -i >/dev/null 2>/dev/null && echo -i` +- + configure include/builddefs: +- libtoolize -c $(LIBTOOLIZE_INSTALL) -f +- cp include/install-sh . +- aclocal -I m4 +- autoconf ++ ./autogen.sh + ./configure \ + --prefix=/ \ + --exec-prefix=/ \ +diff --git a/autogen.sh b/autogen.sh +new file mode 100755 +index 0000000..58fa0d6 +--- /dev/null ++++ b/autogen.sh +@@ -0,0 +1,9 @@ ++#!/bin/sh ++# Recent versions of libtool require the -i option for copying auxiliary ++# files (config.sub, config.guess, install-sh, ltmain.sh), while older ++# versions will copy those files anyway, and don't understand -i. ++libtoolize_install=`libtoolize -n -i >/dev/null 2>/dev/null && echo -i` ++libtoolize -c ${libtoolize_install} ++cp include/install-sh . ++aclocal -I m4 ++autoconf +-- +1.7.6.4 + diff --git a/gnomeos/3.4/attr-makeinstall.patch b/gnomeos/3.4/attr-makeinstall.patch new file mode 100644 index 00000000..78996d47 --- /dev/null +++ b/gnomeos/3.4/attr-makeinstall.patch @@ -0,0 +1,28 @@ +From eaea8d256aecd395a46594b291dbfc2172e0ac45 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Fri, 13 Jan 2012 15:35:00 -0500 +Subject: [PATCH] build: make install install everything + +The make install-dev target is nice, but it'd be better eventually to +convert this to Automake after we land patches to do +buildapi-install-devel. +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 8a9e777..6bf2365 100644 +--- a/Makefile ++++ b/Makefile +@@ -81,7 +81,7 @@ include/config.h: include/builddefs + $(MAKE) $(AM_MAKEFLAGS) include/builddefs; \ + fi + +-install: default $(addsuffix -install,$(SUBDIRS)) ++install: default install-dev install-lib $(addsuffix -install,$(SUBDIRS)) + $(INSTALL) -m 755 -d $(PKG_DOC_DIR) + $(INSTALL) -m 644 README $(PKG_DOC_DIR) + +-- +1.7.6.4 + diff --git a/gnomeos/3.4/attr-no-builddir.patch b/gnomeos/3.4/attr-no-builddir.patch new file mode 100644 index 00000000..90753650 --- /dev/null +++ b/gnomeos/3.4/attr-no-builddir.patch @@ -0,0 +1,26 @@ +From 9bd0610a1deb725e80270e050ab14c600d484bfa Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Fri, 13 Jan 2012 14:23:28 -0500 +Subject: [PATCH] build: Note that we don't support srcdir != builddir + +--- + configure.in | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/configure.in b/configure.in +index b966d0e..b539275 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,6 +19,9 @@ AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADER(include/config.h) + AC_PREFIX_DEFAULT(/usr) + ++dnl http://people.gnome.org/~walters/docs/build-api.txt +++echo \#buildapi-variable-no-builddir >/dev/null ++ + AC_PROG_LIBTOOL + + AC_ARG_ENABLE(shared, +-- +1.7.6.4 + diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json index 1880f67b..62d64c87 100644 --- a/gnomeos/3.4/manifest.json +++ b/gnomeos/3.4/manifest.json @@ -16,6 +16,25 @@ "cgwalters": "git:git://github.com/cgwalters/"}, "components": [ + {"src": "savannah:attr", + "branch": "v2.4.46", + "patches": ["attr-add-autogen.patch", + "attr-no-builddir.patch", + "attr-2.4.32-build.patch", + "attr-makeinstall.patch"]}, + + {"src": "savannah:acl", + "branch": "v2.2.51", + "patches": ["acl-add-autogen.patch", + "acl-no-builddir.patch", + "acl-2.2.39-build.patch", + "attr-makeinstall.patch"]}, + + {"src": "gnome:linux-user-chroot"}, + + {"src": "gnome:ostree", + "config-opts": ["--disable-documentation"]}, + {"src": "gnome:gtk-doc-stub", "component": "devel"}, @@ -27,8 +46,6 @@ {"src": "gnome:glib"}, - {"src": "gnome:linux-user-chroot"}, - {"src": "fd:pixman"}, {"src": "git:git://git.sv.nongnu.org/freetype/freetype2.git",