mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-12 07:26:15 +01:00
Bug 586675 – Runtime library location
Introduce an option to specify the runtime location for libraries via a relative path to libdir. Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen
parent
7662c86611
commit
0ccd18bc83
11
configure.in
11
configure.in
@ -245,6 +245,17 @@ else
|
||||
AC_MSG_RESULT([yes])
|
||||
fi
|
||||
|
||||
dnl location to install runtime libraries, e.g. ../../lib to install
|
||||
dnl to /lib if libdir is /usr/lib
|
||||
AC_ARG_WITH(runtime-libdir,
|
||||
[AC_HELP_STRING([--with-runtime-libdir=RELPATH],
|
||||
[Install runtime libraries relative to libdir])],
|
||||
[],
|
||||
[with_runtime_libdir=""])
|
||||
GLIB_RUNTIME_LIBDIR=$with_runtime_libdir
|
||||
AC_SUBST(GLIB_RUNTIME_LIBDIR)
|
||||
AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
|
||||
@ -234,6 +234,9 @@ How to compile GLib itself
|
||||
<arg>--disable-selinux</arg>
|
||||
<arg>--enable-selinux</arg>
|
||||
</group>
|
||||
<group>
|
||||
<arg>--with-runtime-libdir=RELPATH</arg>
|
||||
</group>
|
||||
</cmdsynopsis>
|
||||
</para>
|
||||
|
||||
@ -555,6 +558,24 @@ How to compile GLib itself
|
||||
be included.
|
||||
</para>
|
||||
</formalpara>
|
||||
|
||||
<formalpara>
|
||||
<title><systemitem>--with-runtime-libdir=RELPATH</systemitem></title>
|
||||
|
||||
<para>
|
||||
Allows specifying a relative path to where to install the runtime
|
||||
libraries (meaning library files used for running, not developing,
|
||||
GLib applications). This can be used in operating system setups where
|
||||
programs using GLib needs to run before e.g. <filename>/usr</filename>
|
||||
is mounted.
|
||||
For example, if LIBDIR is <filename>/usr/lib</filename> and
|
||||
<filename>../../lib</filename> is passed to
|
||||
<systemitem>--with-runtime-libdir</systemitem> then the
|
||||
runtime libraries are installed into <filename>/lib</filename> rather
|
||||
than <filename>/usr/lib</filename>.
|
||||
</para>
|
||||
</formalpara>
|
||||
|
||||
</refsect1>
|
||||
|
||||
</refentry>
|
||||
|
||||
@ -294,6 +294,23 @@ not be accessed directly.
|
||||
@Returns:
|
||||
|
||||
|
||||
<!-- ##### FUNCTION g_mapped_file_ref ##### -->
|
||||
<para>
|
||||
|
||||
</para>
|
||||
|
||||
@file:
|
||||
@Returns:
|
||||
|
||||
|
||||
<!-- ##### FUNCTION g_mapped_file_unref ##### -->
|
||||
<para>
|
||||
|
||||
</para>
|
||||
|
||||
@file:
|
||||
|
||||
|
||||
<!-- ##### FUNCTION g_mapped_file_free ##### -->
|
||||
<para>
|
||||
|
||||
|
||||
@ -424,3 +424,12 @@ gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
|
||||
|
||||
gio-2.0.lib: libgio-2.0.la gio.def
|
||||
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gio.def -out:$@
|
||||
|
||||
if HAVE_GLIB_RUNTIME_LIBDIR
|
||||
install-data-hook:
|
||||
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
mv $(DESTDIR)$(libdir)/libgio-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
mv $(DESTDIR)$(libdir)/libgio-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
rm -f $(DESTDIR)$(libdir)/libgio-2.0.so
|
||||
ln -s $(GLIB_RUNTIME_LIBDIR)/libgio-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libgio-2.0.so
|
||||
endif
|
||||
|
||||
@ -364,3 +364,12 @@ dist-hook: $(BUILT_EXTRA_DIST)
|
||||
for f in $$files; do \
|
||||
if test -f $$f; then d=.; else d=$(srcdir); fi; \
|
||||
cp $$d/$$f $(distdir) || exit 1; done
|
||||
|
||||
if HAVE_GLIB_RUNTIME_LIBDIR
|
||||
install-data-hook:
|
||||
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
rm -f $(DESTDIR)$(libdir)/libglib-2.0.so
|
||||
ln -s $(GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libglib-2.0.so
|
||||
endif
|
||||
|
||||
@ -116,3 +116,12 @@ dist-hook: $(BUILT_EXTRA_DIST)
|
||||
install-data-local: install-ms-lib install-def-file
|
||||
|
||||
uninstall-local: uninstall-ms-lib uninstall-def-file
|
||||
|
||||
if HAVE_GLIB_RUNTIME_LIBDIR
|
||||
install-data-hook:
|
||||
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
mv $(DESTDIR)$(libdir)/libgmodule-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
mv $(DESTDIR)$(libdir)/libgmodule-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
rm -f $(DESTDIR)$(libdir)/libgmodule-2.0.so
|
||||
ln -s $(GLIB_RUNTIME_LIBDIR)/libgmodule-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libgmodule-2.0.so
|
||||
endif
|
||||
|
||||
@ -260,3 +260,12 @@ distclean-local:
|
||||
if test $(srcdir) = .; then :; else \
|
||||
rm -f $(BUILT_EXTRA_DIST); \
|
||||
fi
|
||||
|
||||
if HAVE_GLIB_RUNTIME_LIBDIR
|
||||
install-data-hook:
|
||||
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
rm -f $(DESTDIR)$(libdir)/libgobject-2.0.so
|
||||
ln -s $(GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libgobject-2.0.so
|
||||
endif
|
||||
|
||||
@ -92,3 +92,11 @@ install-data-local: install-ms-lib install-def-file
|
||||
|
||||
uninstall-local: uninstall-ms-lib uninstall-def-file
|
||||
|
||||
if HAVE_GLIB_RUNTIME_LIBDIR
|
||||
install-data-hook:
|
||||
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
mv $(DESTDIR)$(libdir)/libgthread-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
mv $(DESTDIR)$(libdir)/libgthread-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||
rm -f $(DESTDIR)$(libdir)/libgthread-2.0.so
|
||||
ln -s $(GLIB_RUNTIME_LIBDIR)/libgthread-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/libgthread-2.0.so
|
||||
endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user