packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Various bugfixes for embedded-dependencies

This commit is contained in:
Colin Walters 2012-06-19 16:15:00 -04:00
parent ee98a0b4f7
commit 33ee6e2fa4
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -118,10 +118,10 @@ endif
release-tag: release-tag:
git tag -m "Release $(VERSION)" v$(VERSION) git tag -m "Release $(VERSION)" v$(VERSION)
embed_dependency=tar --append --exclude='.git/*' --transform='s,^embedded-dependencies/,ostree-embeddeps-$(VERSION)/embedded-dependencies/,' --file=ostree-embeddeps-$(VERSION).tar.tmp embed_dependency=tar -C $(srcdir) --append --exclude='.git/*' --transform='s,^embedded-dependencies/,ostree-embeddeps-$(VERSION)/embedded-dependencies/,' --file=ostree-embeddeps-$(VERSION).tar.tmp
release-tarball-embedded: release-tarball-embedded:
git archive --format=tar --prefix=ostree-embeddeps-$(VERSION)/ HEAD > ostree-embeddeps-$(VERSION).tar.tmp (cd $(srcdir); git archive --format=tar --prefix=ostree-embeddeps-$(VERSION)/ HEAD) > ostree-embeddeps-$(VERSION).tar.tmp
$(embed_dependency) embedded-dependencies/glib $(embed_dependency) embedded-dependencies/glib
$(embed_dependency) embedded-dependencies/libsoup $(embed_dependency) embedded-dependencies/libsoup
mv ostree-embeddeps-$(VERSION).tar{.tmp,} mv ostree-embeddeps-$(VERSION).tar{.tmp,}

19
embedded-dependencies/Makefile.am
View File

@ -17,13 +17,19 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
glib_config_opts = --disable-silent-rules --disable-static --disable-gtk-doc \
--disable-man --disable-modular-tests --disable-libelf
libsoup_config_opts = --disable-silent-rules --disable-static --disable-gtk-doc \
--disable-introspection --without-gnome --disable-tls-check \
--without-apache-httpd --without-ntlm-auth
build-glib/gio/libgio-2.0.la: build-glib/gio/libgio-2.0.la:
mkdir -p build-glib mkdir -p build-glib
(srcdir=$$(cd $(srcdir) && pwd); \ (srcdir=$$(cd $(srcdir) && pwd); \
builddir=$$(pwd); \ builddir=$$(pwd); \
cd build-glib; \ cd build-glib; \
$${srcdir}/glib/autogen.sh --prefix=$${builddir}/EMBEDDEPS --disable-introspection \ $${srcdir}/glib/autogen.sh --prefix=$${builddir}/EMBEDDEPS $(glib_config_opts) && \
--disable-man --disable-gtk-doc && \
$(MAKE)) $(MAKE))
EMBEDDEPS/include/glib-2.0/glib.h: build-glib/gio/libgio-2.0.la EMBEDDEPS/include/glib-2.0/glib.h: build-glib/gio/libgio-2.0.la
@ -38,10 +44,11 @@ build-libsoup/libsoup/libsoup-2.4.la: EMBEDDEPS/include/glib-2.0/glib.h
builddir=$$(pwd); \ builddir=$$(pwd); \
cd build-libsoup; \ cd build-libsoup; \
env PATH=$${builddir}/EMBEDDEPS/bin:$$PATH \ env PATH=$${builddir}/EMBEDDEPS/bin:$$PATH \
PKG_CONFIG_PATH=$${builddir}/EMBEDDEPS/lib/pkg-config \ LD_LIBRARY_PATH=$${builddir}/EMBEDDEPS/lib:$$LD_LIBRARY_PATH \
$${srcdir}/libsoup/autogen.sh --prefix=$${builddir}/EMBEDDEPS --disable-introspection \ C_INCLUDE_PATH=$${builddir}/EMBEDDEPS/include:$$C_INCLUDE_PATH \
--disable-soup-gnome --disable-gtk-doc --disable-tls-check --without-apache-httpd \ LDFLAGS=-L$${builddir}/EMBEDDEPS/lib:$$LDFLAGS \
--without-ntlm-auth && \ PKG_CONFIG_PATH=$${builddir}/EMBEDDEPS/lib/pkgconfig \
$${srcdir}/libsoup/autogen.sh --prefix=$${builddir}/EMBEDDEPS $(libsoup_config_opts) && \
$(MAKE)) $(MAKE))
EMBEDDEPS/include/libsoup-2.4/libsoup/soup.h: build-libsoup/libsoup/libsoup-2.4.la EMBEDDEPS/include/libsoup-2.4/libsoup/soup.h: build-libsoup/libsoup/libsoup-2.4.la