mx/MX_Pmodule
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '21-new-variant-git-2-21-0' into 'master'

Browse Source 
Resolve "new git variants"

Closes #21

See merge request Pmodules/buildblocks!22
This commit is contained in:
gsell
2019-09-09 16:49:07 +02:00
parent d00053a4e7 c3a5e344f7
commit 3ba6ea2254
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tools/git/build
View File

@@ -14,8 +14,9 @@ pbuild::post_configure_Linux() {
}
pbuild::pre_configure() {
pbuild::add_configure_args "LIBS=-lintl"
#pbuild::add_configure_args "LIBS=-lintl"
pbuild::add_configure_args "--with-tcltk"
pbuild::add_configure_args "--with-iconv=${GETTEXT_PREFIX}"
pbuild::add_configure_args "--with-perl=${PERL_PREFIX}/bin/perl"
}
@@ -24,9 +25,9 @@ pbuild::post_compile() {
}
pbuild::post_install() {
make install-doc
make install-doc V=1 XMLTO_EXTRA='--skip-validation'
make -C contrib/subtree prefix="${PREFIX}" install
make -C contrib/subtree prefix="${PREFIX}" install-doc
make -C contrib/subtree prefix="${PREFIX}" install-doc XMLTO="xmlto --skip-validation"
}
# Local Variables:

8
Tools/git/files/variants
View File

@@ -1,8 +0,0 @@
git/2.3.3 stable Tcl/8.6.4 Tk/8.6.4
git/2.5.2 stable Tcl/8.6.4 Tk/8.6.4
git/2.8.1 stable Tcl/8.6.4 Tk/8.6.4
git/2.11.1 stable Tcl/8.6.4 Tk/8.6.4
git/2.13.0 stable Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto
git/2.16.2 stable Tcl/8.6.4 Tk/8.6.4 b:perl b:asciidoc b:xmlto
git/2.19.1 unstable Tcl/8.6.4 Tk/8.6.4 b:perl/5.26.1 b:asciidoc/8.6.9 b:xmlto/0.0.28
git/2.21.0 unstable Tcl/8.6.9 Tk/8.6.9 b:perl/5.28.1 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8

2
Tools/git/files/variants.macos10.14 Normal file
View File

@@ -0,0 +1,2 @@
git/2.21.0 stable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1
git/2.23.0 stable b:perl/5.30.0 b:asciidoc/8.6.9-2 b:xmlto/0.0.28-1

4
Tools/git/files/variants.rhel6 Normal file
View File

@@ -0,0 +1,4 @@
git/2.3.3 stable Tcl/8.6.4 Tk/8.6.4
git/2.8.1 stable Tcl/8.6.4 Tk/8.6.4
git/2.21.0 stable TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8
git/2.22.0 stable TclTk/8.6.9 b:perl/5.30.0 b:asciidoc/8.6.9-1 b:xmlto/0.0.28 b:gettext/0.19.8