shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-09 01:18:35 +03:00
Code Issues Projects Releases Wiki Activity

Use external libgsystem 2014.2

Browse Source 
It's been split off for a while, let's kill the code duplication.

Among other things, this fixes the systemd detection for the journal
logging.
This commit is contained in:
Colin Walters 2014-04-04 16:52:36 -04:00
parent 4bd8b5c850
commit 1bdabda5f3
8 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "src/libgsystem"]
path = src/libgsystem
url = git://git.gnome.org/libgsystem

2
Makefile-libostree.am
View File

@ -83,7 +83,7 @@ libostree_1_la_SOURCES += src/libostree/ostree-libarchive-input-stream.h \
$(NULL) $(NULL)
endif endif
libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -DLOCALEDIR=\"$(datadir)/locale\" -DGPGVPATH=\"$(GPGVPATH)\" $(OT_INTERNAL_GIO_UNIX_CFLAGS) libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -DLOCALEDIR=\"$(datadir)/locale\" -DGPGVPATH=\"$(GPGVPATH)\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_' libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_'
libostree_1_la_LIBADD = libotutil.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) libostree_1_la_LIBADD = libotutil.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS)

2
Makefile-ostree.am
View File

@ -70,7 +70,7 @@ ostree_SOURCES += \
src/ostree/ot-admin-functions.c \ src/ostree/ot-admin-functions.c \
$(NULL) $(NULL)
ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(srcdir)/src/ostree -DLOCALEDIR=\"$(datadir)/locale\" ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(srcdir)/src/ostree -DLOCALEDIR=\"$(datadir)/locale\"
ostree_bin_shared_ldadd = libotutil.la libostree-kernel-args.la libostree-1.la ostree_bin_shared_ldadd = libotutil.la libostree-kernel-args.la libostree-1.la
ostree_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS) ostree_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)

4
Makefile-otutil.am
View File

@ -39,5 +39,5 @@ libotutil_la_SOURCES = \
src/libotutil/otutil.c \ src/libotutil/otutil.c \
src/libotutil/otutil.h \ src/libotutil/otutil.h \
$(NULL) $(NULL)
libotutil_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS) libotutil_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
libotutil_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS) libgsystem.la libotutil_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS)

7
Makefile.am
View File

@ -65,13 +65,6 @@ OT_INTERNAL_SOUP_CFLAGS = $(OT_DEP_SOUP_CFLAGS)
OT_INTERNAL_SOUP_LIBS = $(OT_DEP_SOUP_LIBS) OT_INTERNAL_SOUP_LIBS = $(OT_DEP_SOUP_LIBS)
endif endif
libgsystem_srcpath := src/libgsystem
libgsystem_cflags = $(OT_INTERNAL_GIO_UNIX_CFLAGS) -I$(srcdir)/src/libgsystem -DGSYSTEM_CONFIG_XATTRS
libgsystem_libs = $(OT_INTERNAL_GIO_UNIX_LIBS)
include src/libgsystem/Makefile-libgsystem.am
noinst_LTLIBRARIES += libgsystem.la
if BUILDOPT_INTROSPECTION if BUILDOPT_INTROSPECTION
include $(INTROSPECTION_MAKEFILE) include $(INTROSPECTION_MAKEFILE)
GIRS = GIRS =

8
autogen.sh
View File

@ -16,14 +16,6 @@ set -e
mkdir -p m4 mkdir -p m4
# Fetch submodules if needed
if test ! -f src/libgsystem/README;
then
echo "+ Setting up submodules"
git submodule init
git submodule update
fi
GTKDOCIZE=$(which gtkdocize 2>/dev/null) GTKDOCIZE=$(which gtkdocize 2>/dev/null)
if test -z $GTKDOCIZE; then if test -z $GTKDOCIZE; then
echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."

2
configure.ac
View File

@ -50,7 +50,7 @@ AS_IF([test x$enable_embedded_dependencies = xyes], [
echo "NOTICE: Embedded dependencies (GLib and libsoup) enabled" echo "NOTICE: Embedded dependencies (GLib and libsoup) enabled"
with_soup=yes with_soup=yes
], [ ], [
GIO_DEPENDENCY="gio-unix-2.0 >= 2.34.0" GIO_DEPENDENCY="gio-unix-2.0 >= 2.34.0 libgsystem >= 2014.2"
PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY) PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1" SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1"

1
src/libgsystem

@ -1 +0,0 @@
Subproject commit 7a2499708b6aa0be5a67e4a75de66fb9c18516af