Переглянути джерело

[fix] Update php-8.1 install failed

lj2007331@gmail.com 3 роки тому
батько
коміт
0386a8fa40
6 змінених файлів з 17 додано та 7 видалено
  1. 3 1
      include/php-7.2.sh
  2. 3 1
      include/php-7.3.sh
  3. 3 1
      include/php-7.4.sh
  4. 3 1
      include/php-8.0.sh
  5. 3 1
      include/php-8.1.sh
  6. 2 2
      versions.txt

+ 3 - 1
include/php-7.2.sh

@@ -45,10 +45,12 @@ Install_PHP72() {
     rm -rf freetype-${freetype_ver}
   fi
 
-  if [ ! -e "/usr/lib/libargon2.a" ]; then
+  if [ ! -e "/usr/local/lib/pkgconfig/libargon2.pc" ]; then
     tar xzf argon2-${argon2_ver}.tar.gz
     pushd argon2-${argon2_ver} > /dev/null
     make -j ${THREAD} && make install
+    [ ! -d /usr/local/lib/pkgconfig ] && mkdir -p /usr/local/lib/pkgconfig
+    /bin/cp libargon2.pc /usr/local/lib/pkgconfig/
     popd > /dev/null
     rm -rf argon2-${argon2_ver}
   fi

+ 3 - 1
include/php-7.3.sh

@@ -45,10 +45,12 @@ Install_PHP73() {
     rm -rf freetype-${freetype_ver}
   fi
 
-  if [ ! -e "/usr/lib/libargon2.a" ]; then
+  if [ ! -e "/usr/local/lib/pkgconfig/libargon2.pc" ]; then
     tar xzf argon2-${argon2_ver}.tar.gz
     pushd argon2-${argon2_ver} > /dev/null
     make -j ${THREAD} && make install
+    [ ! -d /usr/local/lib/pkgconfig ] && mkdir -p /usr/local/lib/pkgconfig
+    /bin/cp libargon2.pc /usr/local/lib/pkgconfig/
     popd > /dev/null
     rm -rf argon2-${argon2_ver}
   fi

+ 3 - 1
include/php-7.4.sh

@@ -45,10 +45,12 @@ Install_PHP74() {
     rm -rf freetype-${freetype_ver}
   fi
 
-  if [ ! -e "/usr/lib/libargon2.a" ]; then
+  if [ ! -e "/usr/local/lib/pkgconfig/libargon2.pc" ]; then
     tar xzf argon2-${argon2_ver}.tar.gz
     pushd argon2-${argon2_ver} > /dev/null
     make -j ${THREAD} && make install
+    [ ! -d /usr/local/lib/pkgconfig ] && mkdir -p /usr/local/lib/pkgconfig
+    /bin/cp libargon2.pc /usr/local/lib/pkgconfig/
     popd > /dev/null
     rm -rf argon2-${argon2_ver}
   fi

+ 3 - 1
include/php-8.0.sh

@@ -46,10 +46,12 @@ Install_PHP80() {
     rm -rf freetype-${freetype_ver}
   fi
 
-  if [ ! -e "/usr/lib/libargon2.a" ]; then
+  if [ ! -e "/usr/local/lib/pkgconfig/libargon2.pc" ]; then
     tar xzf argon2-${argon2_ver}.tar.gz
     pushd argon2-${argon2_ver} > /dev/null
     make -j ${THREAD} && make install
+    [ ! -d /usr/local/lib/pkgconfig ] && mkdir -p /usr/local/lib/pkgconfig
+    /bin/cp libargon2.pc /usr/local/lib/pkgconfig/
     popd > /dev/null
     rm -rf argon2-${argon2_ver}
   fi

+ 3 - 1
include/php-8.1.sh

@@ -46,10 +46,12 @@ Install_PHP81() {
     rm -rf freetype-${freetype_ver}
   fi
 
-  if [ ! -e "/usr/lib/libargon2.a" ]; then
+  if [ ! -e "/usr/local/lib/pkgconfig/libargon2.pc" ]; then
     tar xzf argon2-${argon2_ver}.tar.gz
     pushd argon2-${argon2_ver} > /dev/null
     make -j ${THREAD} && make install
+    [ ! -d /usr/local/lib/pkgconfig ] && mkdir -p /usr/local/lib/pkgconfig
+    /bin/cp libargon2.pc /usr/local/lib/pkgconfig/
     popd > /dev/null
     rm -rf argon2-${argon2_ver}
   fi

+ 2 - 2
versions.txt

@@ -52,7 +52,7 @@ php70_ver=7.0.33
 php71_ver=7.1.33
 php72_ver=7.2.34
 php73_ver=7.3.33
-php74_ver=7.4.26
+php74_ver=7.4.27
 php80_ver=8.0.14
 php81_ver=8.1.1
 
@@ -69,7 +69,7 @@ icu4c_ver=63_1
 libsodium_ver=1.0.18
 libzip_ver=1.2.0
 argon2_ver=20171227
-imagemagick_ver=7.1.0-18
+imagemagick_ver=7.1.0-19
 imagick_ver=3.5.1
 imagick_oldver=3.4.4
 graphicsmagick_ver=1.3.36