mirror of
https://github.com/ostreedev/ostree.git
synced 2025-03-28 02:50:37 +03:00
build: Remove --enable-embedded-dependencies
This is going to bitrot too much; we'll figure out a better way to do this when someone if a RHEL6 port ever happens. Probably Software Collections.
This commit is contained in:
Colin Walters
parent
7cb7d8f741
commit
32663a5a50
27
Makefile.am
27
Makefile.am
@ -25,10 +25,6 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
|
||||
AM_CFLAGS += $(WARN_CFLAGS)
|
||||
DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode
|
||||
|
||||
if BUILD_EMBEDDED_DEPENDENCIES
|
||||
SUBDIRS += embedded-dependencies
|
||||
endif
|
||||
|
||||
SUBDIRS += .
|
||||
|
||||
if ENABLE_GTK_DOC
|
||||
@ -37,33 +33,10 @@ endif
|
||||
|
||||
EXTRA_DIST += autogen.sh COPYING README.md
|
||||
|
||||
if BUILD_EMBEDDED_DEPENDENCIES
|
||||
OT_INTERNAL_GIO_UNIX_CFLAGS = \
|
||||
-I$(top_builddir)/embedded-dependencies/EMBEDDEPS/include/glib-2.0 \
|
||||
-I$(top_builddir)/embedded-dependencies/EMBEDDEPS/include/gio-unix-2.0 \
|
||||
-I$(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/glib-2.0/include \
|
||||
$(NULL)
|
||||
OT_INTERNAL_GIO_UNIX_LIBS = \
|
||||
$(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libglib-2.0.so \
|
||||
$(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libgthread-2.0.so \
|
||||
$(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libgmodule-2.0.so \
|
||||
$(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libgobject-2.0.so \
|
||||
$(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libgio-2.0.so \
|
||||
$(NULL)
|
||||
OT_INTERNAL_SOUP_CFLAGS = \
|
||||
$(OT_INTERNAL_GIO_UNIX_CFLAGS) \
|
||||
-I$(top_builddir)/embedded-dependencies/EMBEDDEPS/include/libsoup-2.4 \
|
||||
$(NULL)
|
||||
OT_INTERNAL_SOUP_LIBS = \
|
||||
$(OT_INTERNAL_GIO_UNIX_LIBS) \
|
||||
$(top_builddir)/embedded-dependencies/EMBEDDEPS/lib/libsoup-2.4.so \
|
||||
$(NULL)
|
||||
else
|
||||
OT_INTERNAL_GIO_UNIX_CFLAGS = $(OT_DEP_GIO_UNIX_CFLAGS)
|
||||
OT_INTERNAL_GIO_UNIX_LIBS = $(OT_DEP_GIO_UNIX_LIBS)
|
||||
OT_INTERNAL_SOUP_CFLAGS = $(OT_DEP_SOUP_CFLAGS)
|
||||
OT_INTERNAL_SOUP_LIBS = $(OT_DEP_SOUP_LIBS)
|
||||
endif
|
||||
|
||||
if BUILDOPT_INTROSPECTION
|
||||
include $(INTROSPECTION_MAKEFILE)
|
||||
|
||||
45
configure.ac
45
configure.ac
@ -42,37 +42,28 @@ AC_CHECK_HEADER([attr/xattr.h],,[AC_MSG_ERROR([You must have attr/xattr.h from l
|
||||
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
||||
AC_ARG_ENABLE(embedded-dependencies,
|
||||
AS_HELP_STRING([--enable-embedded-dependencies], [Use embedded GLib and libsoup copies]),,
|
||||
enable_embedded_dependencies=no)
|
||||
AM_CONDITIONAL(BUILD_EMBEDDED_DEPENDENCIES, test x$enable_embedded_dependencies = xyes)
|
||||
AS_IF([test x$enable_embedded_dependencies = xyes], [
|
||||
echo "NOTICE: Embedded dependencies (GLib and libsoup) enabled"
|
||||
with_soup=yes
|
||||
], [
|
||||
GIO_DEPENDENCY="gio-unix-2.0 >= 2.34.0 libgsystem >= 2014.2"
|
||||
PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
|
||||
GIO_DEPENDENCY="gio-unix-2.0 >= 2.34.0 libgsystem >= 2014.2"
|
||||
PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
|
||||
|
||||
SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1"
|
||||
AC_ARG_WITH(soup,
|
||||
SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1"
|
||||
AC_ARG_WITH(soup,
|
||||
AS_HELP_STRING([--with-soup], [Use libsoup @<:@default=yes@:>@]),
|
||||
[], [with_soup=check])
|
||||
AS_IF([test x$with_soup != xno ], [
|
||||
AC_MSG_CHECKING([for $SOUP_DEPENDENCY])
|
||||
PKG_CHECK_EXISTS($SOUP_DEPENDENCY, have_soup=yes, have_soup=no)
|
||||
AC_MSG_RESULT([$have_soup])
|
||||
AS_IF([test x$with_soup != xno ], [
|
||||
AC_MSG_CHECKING([for $SOUP_DEPENDENCY])
|
||||
PKG_CHECK_EXISTS($SOUP_DEPENDENCY, have_soup=yes, have_soup=no)
|
||||
AC_MSG_RESULT([$have_soup])
|
||||
AS_IF([ test x$have_soup = xno && test x$with_soup != xcheck], [
|
||||
AC_MSG_ERROR([libsoup is enabled but could not be found])
|
||||
])
|
||||
AS_IF([test x$have_soup = xyes], [
|
||||
PKG_CHECK_MODULES(OT_DEP_SOUP, $SOUP_DEPENDENCY)
|
||||
AC_DEFINE(HAVE_LIBSOUP, 1, [Define if we have libsoup.pc])
|
||||
with_soup=yes
|
||||
], [
|
||||
with_soup=no
|
||||
])
|
||||
], [ with_soup=no ])
|
||||
])
|
||||
])
|
||||
AS_IF([test x$have_soup = xyes], [
|
||||
PKG_CHECK_MODULES(OT_DEP_SOUP, $SOUP_DEPENDENCY)
|
||||
AC_DEFINE(HAVE_LIBSOUP, 1, [Define if we have libsoup.pc])
|
||||
with_soup=yes
|
||||
], [
|
||||
with_soup=no
|
||||
])
|
||||
], [ with_soup=no ])
|
||||
if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES +libsoup"; fi
|
||||
AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno)
|
||||
|
||||
@ -201,7 +192,6 @@ AM_CONDITIONAL(BUILDOPT_GJS, test x$have_gjs = xyes)
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
embedded-dependencies/Makefile
|
||||
doc/Makefile
|
||||
src/libostree/ostree-1.pc
|
||||
])
|
||||
@ -212,7 +202,6 @@ echo "
|
||||
===============
|
||||
|
||||
|
||||
embedded dependencies: $enable_embedded_dependencies
|
||||
introspection: $found_introspection
|
||||
libsoup (retrieve remote HTTP repositories): $with_soup
|
||||
SELinux: $with_selinux
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
# Import GLib into local tree
|
||||
#
|
||||
# Copyright (C) 2012 Colin Walters <walters@verbum.org>
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
# License as published by the Free Software Foundation; either
|
||||
# version 2 of the License, or (at your option) any later version.
|
||||
#
|
||||
# This library is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Lesser General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, write to the
|
||||
# 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_environment = PATH=$${builddir}/EMBEDDEPS/bin$${PATH:+:$$PATH} \
|
||||
LD_LIBRARY_PATH="$${builddir}/EMBEDDEPS/lib$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \
|
||||
C_INCLUDE_PATH="$${builddir}/EMBEDDEPS/include$${C_INCLUDE_PATH:+:$$C_INCLUDE_PATH}" \
|
||||
LDFLAGS="-L$${builddir}/EMBEDDEPS/lib$${LDFLAGS:+:$$LDFLAGS}" \
|
||||
ACLOCAL_PATH="$${builddir}/EMBEDDEPS/share/aclocal$${ACLOCAL_PATH:+:$$ACLOCAL_PATH}" \
|
||||
ACLOCAL_FLAGS="-I $${builddir}/EMBEDDEPS/share/aclocal $${ACLOCAL_FLAGS}" \
|
||||
PKG_CONFIG_PATH="$${builddir}/EMBEDDEPS/lib/pkgconfig$${PKG_CONFIG_PATH:+:$$PKG_CONFIG_PATH}"
|
||||
|
||||
# aclocal aborts if the path doesn't exist yet. Lame. Let's also
|
||||
# make /bin just because.
|
||||
stamp-buildroot: Makefile
|
||||
mkdir -p EMBEDDEPS/bin
|
||||
mkdir -p EMBEDDEPS/share/aclocal
|
||||
touch stamp-buildroot
|
||||
|
||||
build-glib/gio/libgio-2.0.la: stamp-buildroot
|
||||
(srcdir=$$(cd $(srcdir) && pwd); \
|
||||
builddir=$$(pwd); \
|
||||
(cd $${srcdir}/glib; env NOCONFIGURE=1 $(build_environment) ./autogen.sh) && \
|
||||
mkdir -p build-glib && \
|
||||
cd build-glib && \
|
||||
env $(build_environment) $${srcdir}/glib/configure --prefix=$${builddir}/EMBEDDEPS $(glib_config_opts) && \
|
||||
env $(build_environment) $(MAKE))
|
||||
|
||||
EMBEDDEPS/include/glib-2.0/glib.h: build-glib/gio/libgio-2.0.la
|
||||
(top_srcdir=$$(cd $(top_srcdir) && pwd); \
|
||||
builddir=$$(pwd); \
|
||||
cd build-glib && \
|
||||
$(MAKE) install)
|
||||
|
||||
build-libsoup/libsoup/libsoup-2.4.la: EMBEDDEPS/include/glib-2.0/glib.h
|
||||
(srcdir=$$(cd $(srcdir) && pwd); \
|
||||
builddir=$$(pwd); \
|
||||
(cd $${srcdir}/libsoup; env NOCONFIGURE=1 $(build_environment) ./autogen.sh) && \
|
||||
mkdir -p build-libsoup && \
|
||||
cd build-libsoup && \
|
||||
env $(build_environment) $${srcdir}/libsoup/configure --prefix=$${builddir}/EMBEDDEPS $(libsoup_config_opts) && \
|
||||
env $(build_environment) $(MAKE))
|
||||
|
||||
EMBEDDEPS/include/libsoup-2.4/libsoup/soup.h: build-libsoup/libsoup/libsoup-2.4.la
|
||||
(top_srcdir=$$(cd $(top_srcdir) && pwd); \
|
||||
builddir=$$(pwd); \
|
||||
cd build-libsoup && \
|
||||
$(MAKE) install)
|
||||
|
||||
all-local: EMBEDDEPS/include/libsoup-2.4/libsoup/soup.h
|
||||
|
||||
install-exec-local:
|
||||
echo `pwd`
|
||||
$(MKDIR_P) $(DESTDIR)/$(pkglibdir)
|
||||
install EMBEDDEPS/lib/*.so.* $(DESTDIR)/$(pkglibdir)
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
embedded-deps-download:
|
||||
test -d glib || git clone --depth=1 git://git.gnome.org/glib -b master glib
|
||||
test -d libsoup || git clone --depth=1 git://git.gnome.org/libsoup -b master libsoup
|
||||
@ -1,19 +0,0 @@
|
||||
To support building on older systems, this infrastructure allows
|
||||
bundling libraries. At the moment, this is just GLib.
|
||||
|
||||
The intent of this system is that a "ostree-embeddeps.tar.gz" is
|
||||
created, which can be used as input to an RPM or Debian package, which
|
||||
can then be installed on older operating systems.
|
||||
|
||||
To create one, use:
|
||||
|
||||
$ cd embedded-dependencies
|
||||
$ make -f Makefile.bootstrap embedded-deps-download
|
||||
$ cd ..
|
||||
$ make release-tarball-embedded
|
||||
|
||||
To build it:
|
||||
|
||||
$ ./configure --enable-embedded-dependencies ...
|
||||
|
||||
as usual.
|
||||
Loading…
x
Reference in New Issue
Block a user