Fix LIBDIR handling to be portable

fosslinux · fosslinux · commit 636f1c821f56 · 2025-10-01T14:27:07.000+10:00
As per aa755b4
diff --git a/steps/perl-5.12.5/files/Compress-Raw-Zlib_config.in b/steps/perl-5.12.5/files/Compress-Raw-Zlib_config.in
@@ -4,6 +4,6 @@
 
 BUILD_ZLIB      = False
 INCLUDE         = /usr/include
-LIB             = /usr/lib/i386-unknown-linux-musl
+LIB             = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
diff --git a/steps/perl-5.12.5/pass1.sh b/steps/perl-5.12.5/pass1.sh
@@ -5,7 +5,8 @@
 src_prepare() {
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Remove miscellaneous pregenerated files
     rm Porting/Glossary \
diff --git a/steps/perl-5.15.7/files/Compress-Raw-Zlib_config.in b/steps/perl-5.15.7/files/Compress-Raw-Zlib_config.in
@@ -4,6 +4,6 @@
 
 BUILD_ZLIB      = False
 INCLUDE         = /usr/include
-LIB             = /usr/lib/i386-unknown-linux-musl
+LIB             = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
diff --git a/steps/perl-5.15.7/pass1.sh b/steps/perl-5.15.7/pass1.sh
@@ -5,7 +5,8 @@
 src_prepare() {
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Remove miscellaneous pregenerated files
     rm Porting/Glossary \
diff --git a/steps/perl-5.16.3/files/Compress-Raw-Zlib_config.in b/steps/perl-5.16.3/files/Compress-Raw-Zlib_config.in
@@ -4,6 +4,6 @@
 
 BUILD_ZLIB      = False
 INCLUDE         = /usr/include
-LIB             = /usr/lib/i386-unknown-linux-musl
+LIB             = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
diff --git a/steps/perl-5.16.3/pass1.sh b/steps/perl-5.16.3/pass1.sh
@@ -5,7 +5,8 @@
 src_prepare() {
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Remove miscellaneous pregenerated files
     rm Porting/Glossary \
diff --git a/steps/perl-5.17.2/files/Compress-Raw-Zlib_config.in b/steps/perl-5.17.2/files/Compress-Raw-Zlib_config.in
@@ -4,6 +4,6 @@
 
 BUILD_ZLIB      = False
 INCLUDE         = /usr/include
-LIB             = /usr/lib/i386-unknown-linux-musl
+LIB             = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
diff --git a/steps/perl-5.17.2/pass1.sh b/steps/perl-5.17.2/pass1.sh
@@ -5,7 +5,8 @@
 src_prepare() {
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Socket versions greater than 2.000 have many difficult problems building
     # in 5.17.x versions; replace them with 2.000
diff --git a/steps/perl-5.17.4/files/Compress-Raw-Zlib_config.in b/steps/perl-5.17.4/files/Compress-Raw-Zlib_config.in
@@ -4,6 +4,6 @@
 
 BUILD_ZLIB      = False
 INCLUDE         = /usr/include
-LIB             = /usr/lib/i386-unknown-linux-musl
+LIB             = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
diff --git a/steps/perl-5.17.4/pass1.sh b/steps/perl-5.17.4/pass1.sh
@@ -5,7 +5,8 @@
 src_prepare() {
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Socket versions greater than 2.000 have many difficult problems building
     # in 5.17.x versions; replace them with 2.000
diff --git a/steps/perl-5.18.4/files/Compress-Raw-Zlib_config.in b/steps/perl-5.18.4/files/Compress-Raw-Zlib_config.in
@@ -4,6 +4,6 @@
 
 BUILD_ZLIB      = False
 INCLUDE         = /usr/include
-LIB             = /usr/lib/i386-unknown-linux-musl
+LIB             = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
diff --git a/steps/perl-5.18.4/pass1.sh b/steps/perl-5.18.4/pass1.sh
@@ -5,7 +5,8 @@
 src_prepare() {
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Remove miscellaneous pregenerated files
     rm Porting/Glossary \
diff --git a/steps/perl-5.22.4/files/Compress-Raw-Zlib_config.in b/steps/perl-5.22.4/files/Compress-Raw-Zlib_config.in
@@ -4,6 +4,6 @@
 
 BUILD_ZLIB      = False
 INCLUDE         = /usr/include
-LIB             = /usr/lib/i386-unknown-linux-musl
+LIB             = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
diff --git a/steps/perl-5.22.4/pass1.sh b/steps/perl-5.22.4/pass1.sh
@@ -11,7 +11,8 @@ src_prepare() {
 
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Remove miscellaneous pregenerated files
     rm Porting/Glossary \
diff --git a/steps/perl-5.24.4/files/Compress-Raw-Zlib_config.in b/steps/perl-5.24.4/files/Compress-Raw-Zlib_config.in
@@ -4,6 +4,6 @@
 
 BUILD_ZLIB      = False
 INCLUDE         = /usr/include
-LIB             = /usr/lib/i386-unknown-linux-musl
+LIB             = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
diff --git a/steps/perl-5.24.4/pass1.sh b/steps/perl-5.24.4/pass1.sh
@@ -11,7 +11,8 @@ src_prepare() {
 
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Remove miscellaneous pregenerated files
     rm Porting/Glossary \
diff --git a/steps/perl-5.30.3/files/Compress-Raw-Zlib_config.in b/steps/perl-5.30.3/files/Compress-Raw-Zlib_config.in
@@ -4,6 +4,6 @@
 
 BUILD_ZLIB      = False
 INCLUDE         = /usr/include
-LIB             = /usr/lib/i386-unknown-linux-musl
+LIB             = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
diff --git a/steps/perl-5.30.3/pass1.sh b/steps/perl-5.30.3/pass1.sh
@@ -5,7 +5,8 @@
 src_prepare() {
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Remove miscellaneous pregenerated files
     rm Porting/Glossary \
diff --git a/steps/perl-5.36.3/files/Compress-Raw-Zlib_config.in b/steps/perl-5.36.3/files/Compress-Raw-Zlib_config.in
@@ -4,6 +4,6 @@
 
 BUILD_ZLIB      = False
 INCLUDE         = /usr/include
-LIB             = /usr/lib/i386-unknown-linux-musl
+LIB             = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
diff --git a/steps/perl-5.36.3/pass1.sh b/steps/perl-5.36.3/pass1.sh
@@ -5,7 +5,8 @@
 src_prepare() {
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Remove miscellaneous pregenerated files
     rm -f Porting/Glossary \
diff --git a/steps/perl-5.42.0/files/Compress-Raw-Zlib_config.in b/steps/perl-5.42.0/files/Compress-Raw-Zlib_config.in
@@ -4,7 +4,7 @@
 
 BUILD_ZLIB      = False
 ZLIB_INCLUDE    = /usr/include
-ZLIB_LIB        = /usr/lib/i386-unknown-linux-musl
+ZLIB_LIB        = %LIBDIR%
 OLD_ZLIB        = False
 GZIP_OS_CODE    = AUTO_DETECT
 USE_ZLIB_NG     = False
diff --git a/steps/perl-5.42.0/pass1.sh b/steps/perl-5.42.0/pass1.sh
@@ -5,7 +5,8 @@
 src_prepare() {
     default
 
-    mv Compress-Raw-Zlib_config.in cpan/Compress-Raw-Zlib/config.in
+    chmod 644 cpan/Compress-Raw-Zlib/config.in
+    sed "s:%LIBDIR%:${LIBDIR}:" Compress-Raw-Zlib_config.in > cpan/Compress-Raw-Zlib/config.in
 
     # Remove miscellaneous pregenerated files
     rm -f Porting/Glossary \
