mirror of
https://github.com/ostreedev/ostree.git
synced 2024-10-26 17:25:36 +03:00
build: Various bugfixes for embedded-dependencies
This commit is contained in:
parent
ee98a0b4f7
commit
33ee6e2fa4
@ -118,10 +118,10 @@ endif
|
||||
release-tag:
|
||||
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:
|
||||
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/libsoup
|
||||
mv ostree-embeddeps-$(VERSION).tar{.tmp,}
|
||||
|
@ -17,13 +17,19 @@
|
||||
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
# 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:
|
||||
mkdir -p build-glib
|
||||
(srcdir=$$(cd $(srcdir) && pwd); \
|
||||
builddir=$$(pwd); \
|
||||
cd build-glib; \
|
||||
$${srcdir}/glib/autogen.sh --prefix=$${builddir}/EMBEDDEPS --disable-introspection \
|
||||
--disable-man --disable-gtk-doc && \
|
||||
$${srcdir}/glib/autogen.sh --prefix=$${builddir}/EMBEDDEPS $(glib_config_opts) && \
|
||||
$(MAKE))
|
||||
|
||||
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); \
|
||||
cd build-libsoup; \
|
||||
env PATH=$${builddir}/EMBEDDEPS/bin:$$PATH \
|
||||
PKG_CONFIG_PATH=$${builddir}/EMBEDDEPS/lib/pkg-config \
|
||||
$${srcdir}/libsoup/autogen.sh --prefix=$${builddir}/EMBEDDEPS --disable-introspection \
|
||||
--disable-soup-gnome --disable-gtk-doc --disable-tls-check --without-apache-httpd \
|
||||
--without-ntlm-auth && \
|
||||
LD_LIBRARY_PATH=$${builddir}/EMBEDDEPS/lib:$$LD_LIBRARY_PATH \
|
||||
C_INCLUDE_PATH=$${builddir}/EMBEDDEPS/include:$$C_INCLUDE_PATH \
|
||||
LDFLAGS=-L$${builddir}/EMBEDDEPS/lib:$$LDFLAGS \
|
||||
PKG_CONFIG_PATH=$${builddir}/EMBEDDEPS/lib/pkgconfig \
|
||||
$${srcdir}/libsoup/autogen.sh --prefix=$${builddir}/EMBEDDEPS $(libsoup_config_opts) && \
|
||||
$(MAKE))
|
||||
|
||||
EMBEDDEPS/include/libsoup-2.4/libsoup/soup.h: build-libsoup/libsoup/libsoup-2.4.la
|
||||
|
Loading…
Reference in New Issue
Block a user