summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2018-07-31 16:30:47 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2018-07-31 16:33:46 (GMT)
commitec4b29ee7814b1e5024e743ced0843c5c4aa6993 (patch)
tree5ebbabb3ce82241f724eb49fdfc1fde417effa6f
parent02510a123e3e956cf32de386f754d4a1bf1fc9b9 (diff)
downloaddefinitions-franred/fix-benbrewer-minimal-distro-for-latests-bst-master.tar.gz
These packages shouldn't be using git to retrieve gnulib and uses the gnulib that BuildStream and definitions clone into the build directory. This causes an issue to when getting and setting the version for these packages because if it doesn't come from git, they are expecting to get it from a .tarball-version file.
-rw-r--r--elements/core/bison.bst5
-rw-r--r--elements/core/libtool.bst5
-rw-r--r--elements/core/patch.bst2
3 files changed, 9 insertions, 3 deletions
diff --git a/elements/core/bison.bst b/elements/core/bison.bst
index 2f4f697..fda641d 100644
--- a/elements/core/bison.bst
+++ b/elements/core/bison.bst
@@ -33,5 +33,8 @@ sources:
config:
configure-commands:
- - sh bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
+ # If we don't run `./boostrap` with git, this script will look
+ # for the .tarball-version file to set up some versioning.
+ - echo "3.0.4" > .tarball-version
+ - ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
- ./configure --prefix="%{prefix}"
diff --git a/elements/core/libtool.bst b/elements/core/libtool.bst
index e9f2c1b..e945a86 100644
--- a/elements/core/libtool.bst
+++ b/elements/core/libtool.bst
@@ -33,5 +33,8 @@ sources:
config:
configure-commands:
- - export NOCONFIGURE=1; export MAKEFLAGS="-j 1"; ./bootstrap
+ # If we don't run `./boostrap` with git, this script will look
+ # for the .tarball-version file to set up some versioning.
+ - echo "2.4.6" > .tarball-version
+ - export NOCONFIGURE=1; export MAKEFLAGS="-j 1"; ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
- ./configure --prefix="%{prefix}" --sysconfdir=/etc --localstatedir=/var
diff --git a/elements/core/patch.bst b/elements/core/patch.bst
index efa4aa7..75fa709 100644
--- a/elements/core/patch.bst
+++ b/elements/core/patch.bst
@@ -26,4 +26,4 @@ sources:
config:
configure-commands:
(<):
- - ./bootstrap --skip-po
+ - ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib