| 1 |
pacho 13/12/25 11:05:20 |
| 2 |
|
| 3 |
Added: gjs-1.38.1-fix-unittests.patch |
| 4 |
Log: |
| 5 |
Add forgotten patch |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/gjs/files/gjs-1.38.1-fix-unittests.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gjs/files/gjs-1.38.1-fix-unittests.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/gjs/files/gjs-1.38.1-fix-unittests.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gjs-1.38.1-fix-unittests.patch |
| 16 |
=================================================================== |
| 17 |
From f87c38787640f639da5ebf73014bbcf3b98cd9fc Mon Sep 17 00:00:00 2001 |
| 18 |
From: Colin Walters <walters@××××××.org> |
| 19 |
Date: Fri, 25 Oct 2013 16:56:37 +0100 |
| 20 |
Subject: [PATCH] tests: Force generation of shared libraries |
| 21 |
|
| 22 |
If installed tests are disabled, we need to force libtool |
| 23 |
to generate .so files that can be dlopened by introspection. |
| 24 |
|
| 25 |
https://bugzilla.gnome.org/710697 |
| 26 |
--- |
| 27 |
Makefile-insttest.am | 11 ++++++++--- |
| 28 |
1 file changed, 8 insertions(+), 3 deletions(-) |
| 29 |
|
| 30 |
diff --git a/Makefile-insttest.am b/Makefile-insttest.am |
| 31 |
index 2ebdc77..e63709f 100644 |
| 32 |
--- a/Makefile-insttest.am |
| 33 |
+++ b/Makefile-insttest.am |
| 34 |
@@ -37,10 +37,15 @@ else |
| 35 |
check_LTLIBRARIES += libregress.la libwarnlib.la libgimarshallingtests.la |
| 36 |
endif |
| 37 |
|
| 38 |
+# This rpath /nowhere thing is the libtool upstream recommended way to |
| 39 |
+# force generation of shared libraries, which we need in order for the |
| 40 |
+# tests to work uninstalled. |
| 41 |
+common_test_ldflags = -avoid-version -rpath /nowhere $(GJS_LIBS) |
| 42 |
+ |
| 43 |
nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h |
| 44 |
libregress_la_CPPFLAGS = $(AM_CPPFLAGS) |
| 45 |
libregress_la_CFLAGS = $(GJS_CFLAGS) |
| 46 |
-libregress_la_LDFLAGS = -avoid-version $(GJS_LIBS) |
| 47 |
+libregress_la_LDFLAGS = $(common_test_ldflags) |
| 48 |
libregress_scannerflags_includes = --include=Gio-2.0 |
| 49 |
if ENABLE_CAIRO |
| 50 |
libregress_la_CFLAGS += $(GJS_CAIRO_CFLAGS) |
| 51 |
@@ -51,10 +56,10 @@ libregress_la_CPPFLAGS += -D_GI_DISABLE_CAIRO |
| 52 |
endif |
| 53 |
nodist_libwarnlib_la_SOURCES = $(GI_DATADIR)/tests/warnlib.c $(GI_DATADIR)/tests/warnlib.h |
| 54 |
libwarnlib_la_CFLAGS = $(GJS_CFLAGS) |
| 55 |
-libwarnlib_la_LDFLAGS = -avoid-version $(GJS_LIBS) |
| 56 |
+libwarnlib_la_LDFLAGS = $(common_test_ldflags) |
| 57 |
nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h |
| 58 |
libgimarshallingtests_la_CFLAGS = $(GJS_CFLAGS) |
| 59 |
-libgimarshallingtests_la_LDFLAGS = -avoid-version $(GJS_LIBS) |
| 60 |
+libgimarshallingtests_la_LDFLAGS = $(common_test_ldflags) |
| 61 |
|
| 62 |
Regress-1.0.gir: libregress.la |
| 63 |
Regress_1_0_gir_LIBS = libregress.la |
| 64 |
-- |
| 65 |
1.8.3.2 |
Archives