GNOME.org
 

[gtk-osx] Remove libdir spec, to work with newer versions of jhbuild.

commit 7e501b8857c3d0cd7d294a777466b9c2de7fd764
Author: John Ralls <jralls ceridwen us>
Date:   Sat Nov 22 19:10:01 2014 -0800

    Remove libdir spec, to work with newer versions of jhbuild.
    
    It was always the same as $PREFIX/lib anyway, so never actually necessary.

 modulesets-stable/gtk-osx-gstreamer.modules     |    2 +-
 modulesets-stable/gtk-osx-python.modules        |    4 ++--
 modulesets-stable/gtk-osx-random.modules        |    4 ++--
 modulesets-unstable/gtk-osx-bootstrap.modules   |    4 ++--
 modulesets-unstable/gtk-osx-gstreamer.modules   |    2 +-
 modulesets-unstable/gtk-osx-python.modules      |    4 ++--
 modulesets-unstable/gtk-osx-unsupported.modules |    6 +++---
 modulesets-unstable/gtk-osx.modules             |    2 +-
 modulesets/gtk-osx-bootstrap.modules            |    4 ++--
 modulesets/gtk-osx-gstreamer.modules            |    2 +-
 modulesets/gtk-osx-python.modules               |    2 +-
 modulesets/gtk-osx-unsupported.modules          |    2 +-
 12 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index 0c7d3b7..29a21af 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -11,7 +11,7 @@
   <repository type="tarball" name="sourceforge"
               href="http://iweb.dl.sf.net/project/"/>
 
-  <autotools id="liboil" autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix 
%(prefix)s --libdir %(libdir)s %(autogenargs)s"
+  <autotools id="liboil" autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix 
%(prefix)s  %(autogenargs)s"
             makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'>
     <branch repo="liboil" module="liboil-0.3.17.tar.gz" version="0.3.17">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/liboil-use-ac-config-headers-macro.patch"; strip="1"/>
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index d830208..a14f823 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -44,7 +44,7 @@
 <!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
   <autotools id="berkeleydb" autogen-sh="configure"
             supports-non-srcdir-builds="no"  makeargs="-C build_unix"
-            autogen-template=";cd build_unix; ../dist/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s"
+            autogen-template=";cd build_unix; ../dist/%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s"
             makeinstallargs="-C build_unix install">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
@@ -60,7 +60,7 @@
        build directory with most of the other modules, use this module
        instead. -->
   <autotools id="berkeleydb-nonsrctree" autogen-sh="configure"
-         autogen-template="%(srcdir)s/dist/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" >
+         autogen-template="%(srcdir)s/dist/%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s" >
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
         repo="oracle" >
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index c91c622..fbcb591 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -186,7 +186,7 @@ Libglade itself is deprecated. This is the last release. -->
 
 
   <autotools id="gtksourceview3"
-    autogen-template="gnome-autogen.sh --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
+    autogen-template="gnome-autogen.sh --prefix %(prefix)s  %(autogenargs)s">
     <branch module="gtksourceview/3.10/gtksourceview-3.10.1.tar.xz"
             version="3.6.0" hash="sha256:38de44f832b4110a3442af2fce58fce0a54f4b22a763c490bcdc1b1db2fb0b01">
     </branch>
@@ -404,7 +404,7 @@ Libglade itself is deprecated. This is the last release. -->
            revision="libatomic_ops-7_2f"/>
   </autotools>
 
-  <autotools id="bdw-gc" autogen-template="./autogen.sh &amp;&amp; ./configure --prefix %(prefix)s --libdir 
%(libdir)s %(autogenargs)s">
+  <autotools id="bdw-gc" autogen-template="./autogen.sh &amp;&amp; ./configure --prefix %(prefix)s  
%(autogenargs)s">
     <branch repo="github.com" module="ivmai/bdwgc"  revision="gc7_2f" />
     <dependencies>
       <dep package="libatomic-ops"/>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 10f5494..770121c 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -119,7 +119,7 @@
   </autotools>
 
   <autotools id="freetype-no-harfbuzz" skip-autogen="never" autogenargs="--without-bzip2 --without-harfbuzz"
-            autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s"
+            autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  
%(autogenargs)s"
             supports-non-srcdir-builds="no">
     <branch module="freetype/freetype2" repo="nongnu"/>
     <dependencies>
@@ -138,7 +138,7 @@
   </autotools>
 
   <autotools id="freetype" skip-autogen="never" autogenargs="--without-bzip2"
-            autogen-template="make distclean &amp;&amp; %(srcdir)s/autogen.sh &amp;&amp; 
%(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+            autogen-template="make distclean &amp;&amp; %(srcdir)s/autogen.sh &amp;&amp; 
%(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s"
             supports-non-srcdir-builds="no">
     <branch module="freetype/freetype2" repo="nongnu"/>
     <dependencies>
diff --git a/modulesets-unstable/gtk-osx-gstreamer.modules b/modulesets-unstable/gtk-osx-gstreamer.modules
index 168d896..7150208 100644
--- a/modulesets-unstable/gtk-osx-gstreamer.modules
+++ b/modulesets-unstable/gtk-osx-gstreamer.modules
@@ -16,7 +16,7 @@
 
   <!-- liboil is in maintenance mode, use tarball. -->
   <autotools id="liboil" makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'
-             autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s --libdir 
%(libdir)s %(autogenargs)s">
+             autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  
%(autogenargs)s">
     <branch repo="liboil" module="liboil-0.3.17.tar.gz" version="0.3.17">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/liboil-use-ac-config-headers-macro.patch"; strip="1"/>
     </branch>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index be0628d..8eff596 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -33,7 +33,7 @@
 
 <!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
    <autotools id="berkeleydb4.8" autogen-sh="dist/configure"
-         autogen-template=";cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+         autogen-template=";cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s" 
makeargs="-C build_unix"
          makeinstallargs="-C build_unix install"
         supports-non-srcdir-builds="no">
 
@@ -57,7 +57,7 @@
 
 <!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
    <autotools id="berkeleydb5.0" autogen-sh="dist/configure"
-         autogen-template=";cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+         autogen-template=";cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s  %(autogenargs)s" 
makeargs="-C build_unix"
          makeinstallargs="-C build_unix install"
         supports-non-srcdir-builds="no">
 
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index 5841e91..bf4187c 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -64,13 +64,13 @@
 <!-- Rudely demands TeX to build documentation -->
   <autotools id="libnettle"
             autogenargs="--disable-documentation"
-            autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s --libdir 
%(libdir)s %(autogenargs)s">
+            autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  
%(autogenargs)s">
     <branch repo="lysator" module="nettle/nettle.git"/>
   </autotools>
 
   <autotools id="gnutls" autogen-sh="autoreconf"
             autogenargs="--disable-gtk-doc-html"
-            autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s --libdir 
%(libdir)s %(autogenargs)s">
+            autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  
%(autogenargs)s">
     <branch repo='git.gnu.org' tag='gnutls_2_12_20' module="gnutls"/>
     <!--<branch repo='ftp.gnu.org' version='2.8.1'
             module="gnutls/gnutls-2.8.1.tar.bz2"/ -->
@@ -85,7 +85,7 @@
   </autotools>
 
   <autotools id="libgpg-error" autogen-sh="autogen.sh"
-             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s"
+             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
 %(autogenargs)s"
             supports-non-srcdir-builds='no'>
     <branch repo='git.gnupg.org' module="libgpg-error" />
   </autotools>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index de0b9e1..0cd3fc3 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -73,7 +73,7 @@
   </autotools>
 
   <autotools id="libffi" autogenargs="--disable-builddir"
-            autogen-template="%(srcdir)s/autogen.sh &amp;&amp; %(srcdir)s/configure  --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s">
+            autogen-template="%(srcdir)s/autogen.sh &amp;&amp; %(srcdir)s/configure  --prefix %(prefix)s 
%(autogenargs)s">
     <branch module="atgreen/libffi" repo="github"/>
   </autotools>
 
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index ef1259b..0ae5768 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -131,7 +131,7 @@
   </autotools>
 
   <autotools id="freetype-no-harfbuzz" skip-autogen="never" autogenargs="--without-bzip2 --without-harfbuzz"
-            autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s">
+            autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  
%(autogenargs)s">
     <branch module="freetype/freetype2" tag="VER-2-5-3" repo="nongnu"/>
     <dependencies>
       <dep package="zlib"/>
@@ -139,7 +139,7 @@
  </autotools>
 
   <autotools id="freetype" skip-autogen="never" autogenargs="--without-bzip2"
-            autogen-template="make distclean &amp;&amp; %(srcdir)s/autogen.sh &amp;&amp; 
%(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
+            autogen-template="make distclean &amp;&amp; %(srcdir)s/autogen.sh &amp;&amp; 
%(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s">
     <branch module="freetype/freetype2" tag="VER-2-5-3" repo="nongnu"/>
     <dependencies>
       <dep package="harfbuzz"/>
diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules
index c9408b3..c2d8976 100644
--- a/modulesets/gtk-osx-gstreamer.modules
+++ b/modulesets/gtk-osx-gstreamer.modules
@@ -16,7 +16,7 @@
 
   <!-- liboil is in maintenance mode, use tarball. -->
   <autotools id="liboil" makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'
-             autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s --libdir 
%(libdir)s %(autogenargs)s">
+             autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  
%(autogenargs)s">
     <branch repo="liboil" module="liboil-0.3.17.tar.gz" version="0.3.17">
       <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/liboil-use-ac-config-headers-macro.patch"; strip="1"/>
     </branch>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 028b01e..7e26aab 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -37,7 +37,7 @@
 
 <!--Note the leading ; in autogen-template. It's there on purpose in case the user has set nice_build so 
that the nice prepended to the command doesn't eat the cd. -->
   <autotools id="berkeleydb" autogen-sh="dist/configure"
-         autogen-template=";cd .;cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+         autogen-template=";cd .;cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s %(autogenargs)s" 
makeargs="-C build_unix"
          makeinstallargs="-C build_unix install">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index 9583645..670c9af 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -121,7 +121,7 @@
   </autotools>
 
   <autotools id="libgpg-error"
-             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s">
+             autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
 %(autogenargs)s">
     <branch repo='git.gnupg.org' module="libgpg-error"
             tag="libgpg-error-1.10"/>
   </autotools>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]