Merge branch '301-git-build-modules-for-newer-version' into 'master'

Resolve "git: build modules for newer version"

Closes #301

See merge request Pmodules/buildblocks!467
This commit is contained in:
2025-05-23 15:25:05 +02:00
13 changed files with 144 additions and 31 deletions

View File

@@ -6,8 +6,25 @@ perl:
relstage: stable
compile_in_sourcetree: true
urls:
- url: http://www.cpan.org/src/5.0/$P-$V.tar.gz
- url: http://www.cpan.org/src/5.0/$P-${V_PKG}.tar.gz
shasums:
perl-5.30.1.tar.gz: f160169fd7b1bd13d1b78b3fa23a5af91709fe732d2d9504c0b40b445846aff5
perl-5.30.0.tar.gz: 851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2
perl-5.28.1.tar.gz: 3ebf85fe65df2ee165b22596540b7d5d42f84d4b72d84834f74e2e0b8956c347
perl-5.26.1.tar.gz: e763aa485e8dc1a70483dbe6d615986bbf32b977f38016480d68c99237e701dd
perl-5.10.1.tar.gz: cb7f26ea4b2b28d6644354d87a269d01cac1b635287dae64e88eeafa24b44f35
perl-5.8.5.tar.gz: 3dd1cba53ce6348ed5119b5f7d1ef6cd4d165f89e4ecc7c21adf7932e0df2709
perl-5.8.1.tar.gz: 90f5ef25b993cea2def2648d7bca9e351f2e417004cdc76fa02a9ec235ce4490
versions:
5.30.0;5.40.0;5.40.1:
5.40.2;5.40.1:
config:
5.30.0;5.28.1:
config:
relstage: stable
5.10.1;5.26.1:
config:
relstage: deprecated

5
Programming/ruby/build Executable file
View File

@@ -0,0 +1,5 @@
#!/usr/bin/env modbuild
pbuild::install(){
ruby-install --prefix "${PREFIX}" ruby "${V_PKG}"
}

View File

@@ -0,0 +1,16 @@
---
format: 1
ruby:
defaults:
group: Programming
relstage: stable
docfiles:
configure_args:
build_functions:
prep: []
configure: []
compile: []
versions:
3.4.4:
config:
build_requires: [ruby-install/0.10.1]

View File

@@ -0,0 +1,13 @@
#%Module1.0
module-whatis "Ruby, open source programming language"
module-url "https://www.ruby-lang.org/"
module-license "https://www.ruby-lang.org/en/about/license.txt"
module-maintainer "Achim Gsell <achim.gsell@psi.ch>"
module-help "
Ruby is a dynamic, open source programming language with a focus on
simplicity and productivity. It has an elegant syntax that is natural
to read and easy to write.
"

19
System/ruby-install/build Executable file
View File

@@ -0,0 +1,19 @@
#!/usr/bin/env modbuild
pbuild::configure() {
:
}
pbuild::compile() {
:
}
pbuild::install() {
make -e install
}
# Local Variables:
# mode: sh
# sh-basic-offset: 8
# tab-width: 8
# End:

View File

@@ -0,0 +1,17 @@
---
format: 1
ruby-install:
defaults:
group: System
overlay: base
relstage: stable
patch_files: []
compile_in_sourcetree: true
urls:
- url: https://github.com/postmodern/$P/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz
shasums:
ruby-install-0.10.1.tar.gz: 7f563af2bae257c006a5dba0b1976e0885d3814332cc4391eeaa88d702753289
versions:
0.10.1:
config:
build_requires: []

View File

@@ -0,0 +1,11 @@
#%Module1.0
module-whatis "Ruby installer"
module-url "https://github.com/postmodern/ruby-install"
module-license "MIT"
module-maintainer "Achim Gsell <achim.gsell@psi.ch>"
module-help "
Installs Ruby, JRuby, TruffleRuby (native / GraalVM), or mruby.
"

6
Tools/asciidoctor/build Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env modbuild
pbuild::install(){
/usr/bin/which gem
"${RUBY_DIR}/bin/gem" install --install-dir="${PREFIX}" asciidoctor -v "${V_PKG}"
}

View File

@@ -0,0 +1,16 @@
---
format: 1
asciidoctor:
defaults:
group: Tools
relstage: stable
docfiles:
configure_args:
build_functions:
prep: []
configure: []
compile: []
versions:
2.0.23:
config:
build_requires: [ruby/3.4.4]

View File

@@ -0,0 +1,11 @@
#%Module1.0
module-whatis "Ruby-based text processor for parsing AsciiDoc"
module-url "https://asciidoctor.org"
module-license "MIT"
module-maintainer "Achim Gsell <achim.gsell@psi.ch>"
module-help "
"
prepend-path GEM_PATH $PREFIX

View File

@@ -6,10 +6,11 @@ pbuild::pre_configure_Darwin() {
pbuild::pre_configure() {
#pbuild::add_configure_args "LIBS=-lintl"
#pbuild::add_configure_args "LDFLAGS=-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"
:
make configure
}
pbuild::post_compile() {
@@ -17,9 +18,9 @@ pbuild::post_compile() {
}
pbuild::post_install() {
make install-doc V=1 XMLTO_EXTRA='--skip-validation'
make -C contrib/subtree prefix="${PREFIX}" install
make -C contrib/subtree prefix="${PREFIX}" install-doc XMLTO="xmlto --skip-validation"
make install-doc V=1 USE_ASCIIDOCTOR=1 XMLTO_EXTRA='--skip-validation'
make -C contrib/subtree prefix="${PREFIX}" install USE_ASCIIDOCTOR=1
make -C contrib/subtree prefix="${PREFIX}" install-doc USE_ASCIIDOCTOR=1 XMLTO="xmlto --skip-validation"
}
# Local Variables:

View File

@@ -1,7 +1,5 @@
#!/usr/bin/env modbuild
unset -f pbuild::configure
unset -f pbuild::compile
pbuild::install(){
install -m 0755 git-lfs "${PREFIX}/bin"
install -m 0755 -d "${PREFIX}/share/man/man{1,5,7}"

View File

@@ -20,12 +20,10 @@ git:
git-2.8.1.tar.xz: e6626b43ba4bc63ad4918df4c275f50bd7f8af2ab54bde60496ad75e91e927fc
git-2.3.3.tar.gz: c189e4a48d8805482f450db666330c79bcefae37e0d035c7717517126ddf4305
versions:
2.45.2:
2.49.0;2.46.4;2.45.3;2.43.6;2.42.4:
config:
runtime_deps: [TclTk/8.6.9, openssl/1.1.1w]
build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8]
relstage: unstable
overlay: devel
runtime_deps: [TclTk/8.6.16, openssl/3.4.1]
build_requires: [gcc/10.4.0, curl/8.13.0, perl/5.40.2, asciidoctor/2.0.23, gettext/0.19.8, xmlto/0.0.28]
docfiles: [COPYING, README.md]
configure_args:
- --with-tcltk
@@ -35,24 +33,6 @@ git:
- name: git-lfs
version: 3.5.1
build_args:
2.43.1:
config:
runtime_deps: [TclTk/8.6.9]
build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8, openssl/1.1.1w]
relstage: unstable
overlay: devel
docfiles: [COPYING, README.md]
configure_args:
- --with-tcltk
- --with-iconv=${GETTEXT_PREFIX}
- --with-perl=${PERL_PREFIX}/bin/perl
2.42.0:
config:
runtime_deps: [TclTk/8.6.9]
build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8]
relstage: unstable
overlay: devel
docfiles: [COPYING, README.md]
2.39.1;2.37.2;2.37.0;2.33.1;2.30.0;2.22.0;2.21.0:
config:
runtime_deps: [TclTk/8.6.9]
@@ -74,3 +54,6 @@ git-lfs:
target_cpus: [x86_64]
urls:
- url: https://github.com/git-lfs/git-lfs/releases/download/v3.5.1/git-lfs-linux-amd64-v3.5.1.tar.gz
build_functions:
configure: []
compile: []