summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-02 12:49:48 (GMT)
committerJavier Jardón <jjardon@gnome.org>2015-02-02 17:34:23 (GMT)
commit04f5f79a9d9c89272de603b3d08da52136df4c92 (patch)
tree68a4509731e29cbbfee7a85f7a11008bfdfcf4fe
parent7fd153c7d4c731d9dd306d3e64f37451da103302 (diff)
downloaddefinitions-baserock/jjardon/updated_autotools.tar.gz
strata/core: Use git and upgrade pkg-config to latest (0.28)baserock/jjardon/updated_autotools
-rw-r--r--strata/core.morph15
-rw-r--r--strata/core/pkg-config.morph2
2 files changed, 10 insertions, 7 deletions
diff --git a/strata/core.morph b/strata/core.morph
index a78d8ae..ae0fa53 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -47,12 +47,6 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- gdbm
-- name: pkg-config
- morph: strata/core/pkg-config.morph
- repo: upstream:pkg-config
- ref: 67a702a15cf88e270539484929ffa1f42b90c728
- unpetrify-ref: baserock/build-essential
- build-depends: []
- name: texinfo-tarball
morph: strata/core/texinfo-tarball.morph
repo: upstream:texinfo-tarball
@@ -236,6 +230,15 @@ chunks:
- autoconf-tarball
- automake
- perl
+- name: pkg-config
+ morph: strata/core/pkg-config.morph
+ repo: upstream:pkg-config
+ ref: 74ceac54ef6f9247c00f08eecd8cca811a3c5934
+ unpetrify-ref: pkg-config-0.28
+ build-depends:
+ - autoconf-tarball
+ - automake
+ - libtool-tarball
- name: util-linux
morph: strata/core/util-linux.morph
repo: upstream:util-linux
diff --git a/strata/core/pkg-config.morph b/strata/core/pkg-config.morph
index 090a65e..ed35a2a 100644
--- a/strata/core/pkg-config.morph
+++ b/strata/core/pkg-config.morph
@@ -2,4 +2,4 @@ name: pkg-config
kind: chunk
build-system: autotools
configure-commands:
-- ./configure --prefix="$PREFIX" --with-internal-glib
+- ./autogen.sh --prefix="$PREFIX" --with-internal-glib