After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 712538 - srcdir != builddir fixes to build in Continuous
srcdir != builddir fixes to build in Continuous
Status: RESOLVED FIXED
Product: seahorse
Classification: Applications
Component: general
unspecified
Other All
: Normal normal
: ---
Assigned To: Seahorse Maintainer
Seahorse Maintainer
Depends on:
Blocks:
 
 
Reported: 2013-11-17 15:03 UTC by Colin Walters
Modified: 2014-01-04 16:13 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
common: Work around vala srcdir != builddir from git issues (1.26 KB, patch)
2013-11-17 15:03 UTC, Colin Walters
reviewed Details | Review
build: Update includes to work with srcdir != builddir from git (2.50 KB, patch)
2013-11-17 15:03 UTC, Colin Walters
committed Details | Review
common: Work around vala srcdir != builddir from git issues (1.23 KB, patch)
2013-11-20 20:35 UTC, Colin Walters
committed Details | Review

Description Colin Walters 2013-11-17 15:03:27 UTC
I'd like to add Seahorse to the Continuous manifest.
Comment 1 Colin Walters 2013-11-17 15:03:29 UTC
Created attachment 260037 [details] [review]
common: Work around vala srcdir != builddir from git issues

gnome-continuous uses srcdir != builddir *from git*.  This differs
from tarballs where generated source lives in $(srcdir).

Anyways, vala's AM_PROG_VALAC generates some makefile rules that do
"cd $(srcdir) && valac ...".

See: https://bugzilla.gnome.org/show_bug.cgi?id=694153

The problem is this actively breaks the $(srcdir) and $(builddir)
automake macros when doing srcdir != builddir from git.

We can work around it this way.
Comment 2 Colin Walters 2013-11-17 15:03:32 UTC
Created attachment 260038 [details] [review]
build: Update includes to work with srcdir != builddir from git

seahorse-common.h is in $(builddir) when doing srcdir != builddir from
git.
Comment 3 Stef Walter 2013-11-19 09:32:47 UTC
Review of attachment 260037 [details] [review]:

::: common/Makefile.am
@@ +33,3 @@
 	--use-header \
+	--header=$(shell cd $(builddir) && pwd)/seahorse-internal.h \
+	--vapidir=$(shell cd $(srcdir) && pwd) \

Why can't we use $(abs_builddir) and $(abs_srcdir)?
Comment 4 Stef Walter 2013-11-19 14:02:32 UTC
Comment on attachment 260038 [details] [review]
build: Update includes to work with srcdir != builddir from git

Pushed as 6a70791e8033fbc37f95beb1673d31a70eaf9a4a
Comment 5 Colin Walters 2013-11-20 20:35:32 UTC
Created attachment 260386 [details] [review]
common: Work around vala srcdir != builddir from git issues

Now using $(abs_) variants.
Comment 6 Colin Walters 2014-01-04 16:13:52 UTC
Attachment 260386 [details] pushed as a8ab0f0 - common: Work around vala srcdir != builddir from git issues