Skip to content

Commit c7505ce

Browse files
committed
git: split out Git.pm into its own package
The only remaining Perl-dependent part in the `mingw-w64-git` package is the Perl module ("Git.pm"). Let's split it out into the new `mingw-w64-git-perl` package, adding it as a dependency to the previously-split out packages containing the Git commands that depend on that Perl module. Note: The `install-perl-module` rule installs not only `Git.pm` but also the `Git::SVN` module. However, that module is already owned by `mingw-w64-git-svn` and that needs to remain so. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent dbad10a commit c7505ce

File tree

1 file changed

+24
-11
lines changed

1 file changed

+24
-11
lines changed

mingw-w64-git/PKGBUILD

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
77
"${MINGW_PACKAGE_PREFIX}-${_realname}-doc-man"
88
"${MINGW_PACKAGE_PREFIX}-${_realname}-subtree"
99
"${MINGW_PACKAGE_PREFIX}-${_realname}-credential-wincred"
10+
"${MINGW_PACKAGE_PREFIX}-${_realname}-perl"
1011
"${MINGW_PACKAGE_PREFIX}-${_realname}-send-email"
1112
"${MINGW_PACKAGE_PREFIX}-gitweb"
1213
"${MINGW_PACKAGE_PREFIX}-${_realname}-svn"
@@ -164,11 +165,7 @@ package_git () {
164165
"${MINGW_PACKAGE_PREFIX}-openssl"
165166
"${MINGW_PACKAGE_PREFIX}-pcre2"
166167
"${MINGW_PACKAGE_PREFIX}-tcl"
167-
"${MINGW_PACKAGE_PREFIX}-tk"
168-
"perl-Error"
169-
"perl>=5.14.0"
170-
"perl-libwww"
171-
"perl-TermReadKey")
168+
"${MINGW_PACKAGE_PREFIX}-tk")
172169

173170
cd "$srcdir"/git
174171

@@ -182,9 +179,8 @@ package_git () {
182179

183180
# Remove git-svn (packaged separately)
184181
rm -f "$pkgdir/$MINGW_PREFIX/libexec/git-core/git-svn"
185-
# Remove the Git::SVN Perl module (packaged separately in git-svn)
186-
find "$pkgdir/$MINGW_PREFIX/share/perl5" -type f -path "*/Git/SVN*" -delete
187-
find "$pkgdir/$MINGW_PREFIX/share/perl5" -type d -empty -delete
182+
# Remove Git.pm and other Perl modules (packaged separately in git-perl & git-svn)
183+
rm -rf "$pkgdir/$MINGW_PREFIX"/share/perl5
188184

189185
# Remove git-archimport (packaged separately)
190186
rm -f "$pkgdir/$MINGW_PREFIX/libexec/git-core/git-archimport"
@@ -287,8 +283,25 @@ package_git-credential-wincred () {
287283
make -C contrib/credential/wincred prefix="$pkgdir/$MINGW_PREFIX" install
288284
}
289285

286+
package_git-perl () {
287+
depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=${pkgver}"
288+
"perl>=5.14.0"
289+
"perl-Error"
290+
"perl-libwww"
291+
"perl-TermReadKey")
292+
pkgdesc="Perl module for Git (mingw-w64)"
293+
294+
cd "$srcdir"/git
295+
296+
# Install Git.pm and related Perl modules (excluding Git::SVN)
297+
make -j1 -f ../mingw-w64-git.mak DESTDIR="$pkgdir" install-perl-module
298+
find "$pkgdir/$MINGW_PREFIX/share/perl5" -type f -path "*/Git/SVN*" -delete
299+
find "$pkgdir/$MINGW_PREFIX/share/perl5" -type d -empty -delete
300+
}
301+
290302
package_git-send-email () {
291303
depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=${pkgver}"
304+
"${MINGW_PACKAGE_PREFIX}-${_realname}-perl=${pkgver}"
292305
"perl-Authen-SASL"
293306
"perl-MIME-tools"
294307
"perl-Net-SMTP-SSL")
@@ -330,7 +343,7 @@ package_gitweb () {
330343

331344
package_git-svn () {
332345
depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=${pkgver}"
333-
"perl>=5.14.0"
346+
"${MINGW_PACKAGE_PREFIX}-${_realname}-perl=${pkgver}"
334347
"subversion")
335348
pkgdesc="Subversion support for Git (mingw-w64)"
336349

@@ -354,7 +367,7 @@ package_git-svn () {
354367

355368
package_git-archimport () {
356369
depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=${pkgver}"
357-
"perl>=5.14.0")
370+
"${MINGW_PACKAGE_PREFIX}-${_realname}-perl=${pkgver}")
358371
pkgdesc="Import an Arch repository into Git (mingw-w64)"
359372

360373
cd "$srcdir"/git
@@ -372,7 +385,7 @@ package_git-archimport () {
372385

373386
package_git-cvs () {
374387
depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=${pkgver}"
375-
"perl>=5.14.0"
388+
"${MINGW_PACKAGE_PREFIX}-${_realname}-perl=${pkgver}"
376389
"perl-DBI")
377390
pkgdesc="CVS support for Git (mingw-w64)"
378391

0 commit comments

Comments
 (0)