projects / scm / bb / tizen-distro.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 494796f)
gnome-vfs: Fix build error with new autotools
authorKhem Raj <raj.khem@gmail.com>
Thu, 17 Oct 2013 23:54:23 +0000 (23:54 +0000)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:34:04 +0000 (08:34 -0800)
Don't use srcdir with tests

(From meta-openembedded rev: 51a3367e88224a3f50a792010c63d446f5bec220)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch patch | blob | history
meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch [new file with mode: 0644] patch | blob
meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb patch | blob | history

diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
index d8f7e40..3833299 100644 (file)
--- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch
@@ -13,11 +13,11 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  libgnomevfs/Makefile.am |    1 -
  2 files changed, 0 insertions(+), 2 deletions(-)
 
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index ca57467..040484f 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -8,7 +8,6 @@ INCLUDES= \
+Index: gnome-vfs-2.24.4/daemon/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/daemon/Makefile.am   2013-10-17 16:39:39.081024798 -0700
++++ gnome-vfs-2.24.4/daemon/Makefile.am        2013-10-17 16:39:39.213024794 -0700
+@@ -8,7 +8,6 @@
        -D_LARGEFILE64_SOURCE                   \
        -D_POSIX_PTHREAD_SEMANTICS              \
        -D_REENTRANT                            \
@@ -25,11 +25,11 @@ index ca57467..040484f 100644
        -DGNOME_VFS_PREFIX=\"$(prefix)\"        \
        -DGNOME_VFS_DATADIR=\"$(datadir)\"      \
        -DGNOME_VFS_LIBDIR=\"$(libdir)\"        \
-diff --git a/libgnomevfs/Makefile.am b/libgnomevfs/Makefile.am
-index 69a02e0..5d7d759 100644
---- a/libgnomevfs/Makefile.am
-+++ b/libgnomevfs/Makefile.am
-@@ -19,7 +19,6 @@ INCLUDES =                                   \
+Index: gnome-vfs-2.24.4/libgnomevfs/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.am      2013-10-17 16:39:39.081024798 -0700
++++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am   2013-10-17 16:39:39.213024794 -0700
+@@ -19,7 +19,6 @@
        -D_LARGEFILE64_SOURCE                   \
        -D_POSIX_PTHREAD_SEMANTICS              \
        -D_REENTRANT                            \
@@ -37,6 +37,41 @@ index 69a02e0..5d7d759 100644
        -DGNOME_VFS_PREFIX=\"$(prefix)\"        \
        -DGNOME_VFS_BINDIR=\"$(bindir)\"        \
        -DGNOME_VFS_DATADIR=\"$(datadir)\"      \
--- 
-1.7.6.5
-
+Index: gnome-vfs-2.24.4/modules/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/modules/Makefile.am  2013-10-17 16:39:39.081024798 -0700
++++ gnome-vfs-2.24.4/modules/Makefile.am       2013-10-17 16:39:39.213024794 -0700
+@@ -18,7 +18,6 @@
+       -D_POSIX_PTHREAD_SEMANTICS              \
+       -D_REENTRANT                            \
+       -DSSH_PROGRAM=\"$(SSH_PROGRAM)\"        \
+-      -DG_DISABLE_DEPRECATED                  \
+       -DGNOME_VFS_PREFIX=\"$(prefix)\"        \
+       -DGNOME_VFS_DATADIR=\"$(datadir)\"      \
+       -DGNOME_VFS_LIBDIR=\"$(libdir)\"        \
+Index: gnome-vfs-2.24.4/programs/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/programs/Makefile.am 2013-10-17 16:39:39.081024798 -0700
++++ gnome-vfs-2.24.4/programs/Makefile.am      2013-10-17 16:39:39.213024794 -0700
+@@ -4,8 +4,7 @@
+       -I$(top_srcdir)                         \
+       -I$(top_builddir)                       \
+       $(TEST_CFLAGS)                          \
+-      $(VFS_CFLAGS)                           \
+-      -DG_DISABLE_DEPRECATED
++      $(VFS_CFLAGS)
+ 
+ libraries =                                           \
+       $(top_builddir)/libgnomevfs/libgnomevfs-2.la    \
+Index: gnome-vfs-2.24.4/test/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/test/Makefile.am     2010-02-09 04:16:14.000000000 -0800
++++ gnome-vfs-2.24.4/test/Makefile.am  2013-10-17 16:42:49.109019172 -0700
+@@ -6,7 +6,6 @@
+       -I$(top_builddir)/libgnomevfs           \
+       $(TEST_CFLAGS)                          \
+       $(VFS_CFLAGS)                           \
+-      -DG_DISABLE_DEPRECATED                  \
+       -DMODULES_PATH=\"$(libdir)/vfs/modules\"
+ 
+ if OS_WIN32
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch
new file mode 100644 (file)
index 0000000..30ca29b
--- /dev/null
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs-2.24.4/do-not-use-srcdir-variable.patch
@@ -0,0 +1,22 @@
+Fixes errors with new autotools
+
+| automake: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/auto-test'
+| autoreconf: automake failed with exit status: 1
+| ERROR: autoreconf execution failed.
+
+Upstream-Status: Not Submitted
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: gnome-vfs-2.24.4/test/Makefile.am
+===================================================================
+--- gnome-vfs-2.24.4.orig/test/Makefile.am     2013-10-17 16:43:36.677017764 -0700
++++ gnome-vfs-2.24.4/test/Makefile.am  2013-10-17 16:48:47.369008566 -0700
+@@ -64,7 +64,7 @@
+       test-async-cancel \
+       test-escape       \
+       test-uri          \
+-      $(srcdir)/auto-test     
++      auto-test
+ 
+ libraries =                                           \
+       $(top_builddir)/libgnomevfs/libgnomevfs-2.la    \
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
index 78110b5..d0b5e3d 100644 (file)
--- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
+++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb
@@ -24,6 +24,7 @@ SRC_URI += " \
     file://gconftool-lossage.patch \
     file://gnome-vfs-no-kerberos.patch;striplevel=0 \
     file://0001-multiple-Makefile.am-remove-DG_DISABLE_DEPRECATED-to.patch \
+    file://do-not-use-srcdir-variable.patch \
 "
 
 SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e"
Domain: SCM / BB;