mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-26 05:56:14 +01:00
build: Calculate ABS_GLIB_RUNTIME_LIBDIR at build time
Rather than calculating it at configure time. This means it can expand $libdir properly, and use the Make $(realpath) function rather than invoking the non-portable `readlink -f`. This fixes problems where `readlink` would be called on an invalid path (due to a variable not being expanded) and would evaluate to "", which would then cause things to be installed in the wrong place. https://bugzilla.gnome.org/show_bug.cgi?id=744772
This commit is contained in:
parent
57f9c590f9
commit
8c263008bb
@ -282,9 +282,7 @@ AC_ARG_WITH(runtime-libdir,
|
|||||||
[],
|
[],
|
||||||
[with_runtime_libdir=""])
|
[with_runtime_libdir=""])
|
||||||
GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
|
GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
|
||||||
ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
|
|
||||||
AC_SUBST(GLIB_RUNTIME_LIBDIR)
|
AC_SUBST(GLIB_RUNTIME_LIBDIR)
|
||||||
AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
|
|
||||||
AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
|
AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
|
||||||
|
|
||||||
dnl Check for a working C++ compiler, but do not bail out, if none is found.
|
dnl Check for a working C++ compiler, but do not bail out, if none is found.
|
||||||
@ -3395,7 +3393,6 @@ build/win32/vs11/Makefile
|
|||||||
build/win32/vs12/Makefile
|
build/win32/vs12/Makefile
|
||||||
build/win32/vs14/Makefile
|
build/win32/vs14/Makefile
|
||||||
glib/Makefile
|
glib/Makefile
|
||||||
glib/glib.stp
|
|
||||||
glib/libcharset/Makefile
|
glib/libcharset/Makefile
|
||||||
glib/gnulib/Makefile
|
glib/gnulib/Makefile
|
||||||
glib/pcre/Makefile
|
glib/pcre/Makefile
|
||||||
@ -3404,7 +3401,6 @@ glib/tests/Makefile
|
|||||||
gmodule/Makefile
|
gmodule/Makefile
|
||||||
gmodule/gmoduleconf.h
|
gmodule/gmoduleconf.h
|
||||||
gobject/Makefile
|
gobject/Makefile
|
||||||
gobject/gobject.stp
|
|
||||||
gobject/glib-mkenums
|
gobject/glib-mkenums
|
||||||
gobject/tests/Makefile
|
gobject/tests/Makefile
|
||||||
gthread/Makefile
|
gthread/Makefile
|
||||||
|
@ -828,6 +828,12 @@ dist-hook: \
|
|||||||
if test -f $$f; then d=.; else d=$(srcdir); fi; \
|
if test -f $$f; then d=.; else d=$(srcdir); fi; \
|
||||||
cp $$d/$$f $(distdir) || exit 1; done
|
cp $$d/$$f $(distdir) || exit 1; done
|
||||||
|
|
||||||
|
if HAVE_GLIB_RUNTIME_LIBDIR
|
||||||
|
ABS_GLIB_RUNTIME_LIBDIR = $(realpath $(libdir)/$(GLIB_RUNTIME_LIBDIR))
|
||||||
|
else
|
||||||
|
ABS_GLIB_RUNTIME_LIBDIR = $(libdir)
|
||||||
|
endif
|
||||||
|
|
||||||
if HAVE_GLIB_RUNTIME_LIBDIR
|
if HAVE_GLIB_RUNTIME_LIBDIR
|
||||||
install-data-hook:
|
install-data-hook:
|
||||||
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
||||||
|
@ -382,6 +382,14 @@ tapset_in_files = glib.stp.in
|
|||||||
tapsetdir = @ABS_TAPSET_DIR@
|
tapsetdir = @ABS_TAPSET_DIR@
|
||||||
tapset_DATA = $(tapset_in_files:.stp.in=.stp)
|
tapset_DATA = $(tapset_in_files:.stp.in=.stp)
|
||||||
EXTRA_DIST += $(tapset_in_files)
|
EXTRA_DIST += $(tapset_in_files)
|
||||||
|
CLEANFILES += $(tapset_in_files:.stp.in=.stp)
|
||||||
|
|
||||||
|
$(tapset_DATA): %.stp: %.stp.in Makefile
|
||||||
|
$(AM_V_GEN)$(SED) \
|
||||||
|
-e 's|[@]ABS_GLIB_RUNTIME_LIBDIR[@]|$(ABS_GLIB_RUNTIME_LIBDIR)|g' \
|
||||||
|
-e 's|[@]LT_CURRENT[@]|$(LT_CURRENT)|g' \
|
||||||
|
-e 's|[@]LT_REVISION[@]|$(LT_REVISION)|g' \
|
||||||
|
$< > $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
gspawn-win32-helper-console.c:
|
gspawn-win32-helper-console.c:
|
||||||
@ -473,6 +481,11 @@ dist_gdb_SCRIPTS = glib.py
|
|||||||
libglib-gdb.py: libglib-gdb.py.in
|
libglib-gdb.py: libglib-gdb.py.in
|
||||||
$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
|
$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
|
||||||
|
|
||||||
|
if HAVE_GLIB_RUNTIME_LIBDIR
|
||||||
|
ABS_GLIB_RUNTIME_LIBDIR = $(realpath $(libdir)/$(GLIB_RUNTIME_LIBDIR))
|
||||||
|
else
|
||||||
|
ABS_GLIB_RUNTIME_LIBDIR = $(libdir)
|
||||||
|
endif
|
||||||
|
|
||||||
install-data-hook: libglib-gdb.py
|
install-data-hook: libglib-gdb.py
|
||||||
mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
|
mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
|
||||||
|
@ -130,6 +130,14 @@ tapset_in_files = gobject.stp.in
|
|||||||
tapsetdir = @ABS_TAPSET_DIR@
|
tapsetdir = @ABS_TAPSET_DIR@
|
||||||
tapset_DATA = $(tapset_in_files:.stp.in=.stp)
|
tapset_DATA = $(tapset_in_files:.stp.in=.stp)
|
||||||
EXTRA_DIST += $(tapset_in_files)
|
EXTRA_DIST += $(tapset_in_files)
|
||||||
|
CLEANFILES += $(tapset_in_files:.stp.in=.stp)
|
||||||
|
|
||||||
|
$(tapset_DATA): %.stp: %.stp.in Makefile
|
||||||
|
$(AM_V_GEN)$(SED) \
|
||||||
|
-e 's|[@]ABS_GLIB_RUNTIME_LIBDIR[@]|$(ABS_GLIB_RUNTIME_LIBDIR)|g' \
|
||||||
|
-e 's|[@]LT_CURRENT[@]|$(LT_CURRENT)|g' \
|
||||||
|
-e 's|[@]LT_REVISION[@]|$(LT_REVISION)|g' \
|
||||||
|
$< > $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# non-header sources (headers should be specified in the above variables)
|
# non-header sources (headers should be specified in the above variables)
|
||||||
@ -260,6 +268,12 @@ libgobject-gdb.py: libgobject-gdb.py.in
|
|||||||
uninstall-gdb:
|
uninstall-gdb:
|
||||||
-rm -r $(DESTDIR)$(datadir)/gdb
|
-rm -r $(DESTDIR)$(datadir)/gdb
|
||||||
|
|
||||||
|
if HAVE_GLIB_RUNTIME_LIBDIR
|
||||||
|
ABS_GLIB_RUNTIME_LIBDIR = $(realpath $(libdir)/$(GLIB_RUNTIME_LIBDIR))
|
||||||
|
else
|
||||||
|
ABS_GLIB_RUNTIME_LIBDIR = $(libdir)
|
||||||
|
endif
|
||||||
|
|
||||||
install-data-hook: libgobject-gdb.py
|
install-data-hook: libgobject-gdb.py
|
||||||
mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
|
mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
|
||||||
$(INSTALL) $(builddir)/libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
|
$(INSTALL) $(builddir)/libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
|
||||||
|
Loading…
Reference in New Issue
Block a user