summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2012-10-25 12:43:39 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2012-10-25 12:43:39 +0200
commit66c71523863ffeff1514032af0898e38165e944f (patch)
tree66c08f04be7826720b98368f57b8bfe17549f34f
parent36651efdff71ca15582e6fb080e1eea6772da31b (diff)
Make sure libiconv is never built
The OSX one and the GNU one conflicts on Lion after packaging things in a bundle.
-rw-r--r--jhbuildrc1
1 files changed, 1 insertions, 0 deletions
diff --git a/jhbuildrc b/jhbuildrc
index 0bff64f..995dd1c 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -10,5 +10,6 @@ prefix = os.path.join(_root, "inst")
# spice gtk-osx moduleset
moduleset = 'http://cgit.freedesktop.org/~teuf/spice-jhbuild/plain/modulesets/spice.xml?h=osx'
modules = [ "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "virt-viewer" ]
+skip.append('libiconv')
#for a gtk3 build use these modules
#modules = [ "meta-gtk-osx-bootstrap", "meta-gtk-osx-gtk3", "virt-viewer-gtk3" ]