Skip to content

Commit

Permalink
perl: remove renames in comments
Browse files Browse the repository at this point in the history
This is since this used to be a separate msys.sh file
which was synced back.

Let's keep things simple and only patch what we need to.

TODO: check if the other changes in that file are really needed,
or if they just diverged since the split for no good reason.
  • Loading branch information
lazka committed Feb 2, 2025
1 parent aea3ac3 commit 74504c8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
17 changes: 3 additions & 14 deletions perl/0006-perl-5.36.0-msys2.patch
Original file line number Diff line number Diff line change
Expand Up @@ -419,20 +419,9 @@ index 4715e9d..5da0af0 100644
my %env;
@env{@env} = @env;
for my $env (sort keys %env) {
--- perl-5.38.2/hints/cygwin.sh.orig 2025-02-01 13:19:09.488368500 +0100
+++ perl-5.38.2/hints/cygwin.sh 2025-02-01 13:20:42.942658200 +0100
@@ -19,15 +19,15 @@
plibpth=`cd $plibpth && pwd`
fi
so='dll'
-# - eliminate -lc, implied by gcc and a symlink to libcygwin.a
+# - eliminate -lc, implied by gcc and a symlink to libmsys-2.0.a
libswanted=`echo " $libswanted " | sed -e 's/ c / /g'`
-# - eliminate -lm, symlink to libcygwin.a
+# - eliminate -lm, symlink to libmsys-2.0.a
libswanted=`echo " $libswanted " | sed -e 's/ m / /g'`
-# - eliminate -lutil, symbols are all in libcygwin.a
+# - eliminate -lutil, symbols are all in libmsys-2.0.a
--- perl-5.38.2/hints/cygwin.sh.orig 2025-02-02 21:15:37.363852600 +0100
+++ perl-5.38.2/hints/cygwin.sh 2025-02-02 21:15:58.250835500 +0100
@@ -27,7 +27,7 @@
libswanted=`echo " $libswanted " | sed -e 's/ util / /g'`
ignore_versioned_solibs='y'
usenm='no'
Expand Down
2 changes: 1 addition & 1 deletion perl/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sha256sums=('d91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8'
'a074ce00dabd7876293cf0fa8c8be26029992f51873e33cd2213b6acf60cafbb'
'1bf02b601f670cc1c8f65e63ec7a10578f92c8ecd8a5752fe331479bd6115311'
'e05e20b29c950555edfa246d2b9177188a4b265d1887c262f5b272f382696474'
'eea1d71cd7347d5b6ded94d68e25042303b5160f77f0982f48a4799a25bdce3f'
'cec903d21d7e0436543892bf880c9a4801fe8d2c9a1cc887c7c1dfd3c554b2e1'
'4c44801139321e77a3ade921ce93b114100346ad5b17d03a67b2a92b85ee8a27')

prepare() {
Expand Down

0 comments on commit 74504c8

Please sign in to comment.