Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 55dbec31 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

BUILD: Handle the cases where the `arch` command does not exist on the system (manjaro...)

parent 9acf7ab8
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!166Continue fixes
...@@ -2815,6 +2815,10 @@ fi ...@@ -2815,6 +2815,10 @@ fi
   
   
   
# Get the architecture, in some cases `arch` is not present on the system
LKT_ARCH=`arch`
if test $? -ne 0 ; then LKT_ARCH=`uname -m` ; fi
LKT_PATH_SOURCE="$(dirname $(readlink -f "$0"))" LKT_PATH_SOURCE="$(dirname $(readlink -f "$0"))"
LKT_PATH_BUILD="$(pwd)" LKT_PATH_BUILD="$(pwd)"
   
...@@ -18499,9 +18503,9 @@ fi ...@@ -18499,9 +18503,9 @@ fi
as_fn_error $? "chmod is required for AppImage" "$LINENO" 5 as_fn_error $? "chmod is required for AppImage" "$LINENO" 5
fi fi
   
LKT_APPIMAGETOOL="$LKT_PATH_SOURCE/utils/appimagetool-`arch`.AppImage" LKT_APPIMAGETOOL="$LKT_PATH_SOURCE/utils/appimagetool-$LKT_ARCH.AppImage"
LKT_LINUXDEPLOY="$LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage" LKT_LINUXDEPLOY="$LKT_PATH_SOURCE/utils/linuxdeploy-$LKT_ARCH.AppImage"
LKT_LINUXDEPLOYQT="$LKT_PATH_SOURCE/utils/linuxdeploy-qt-`arch`.AppImage" LKT_LINUXDEPLOYQT="$LKT_PATH_SOURCE/utils/linuxdeploy-qt-$LKT_ARCH.AppImage"
   
   
   
...@@ -18523,7 +18527,7 @@ as_fn_error $? "failed from path ...@@ -18523,7 +18527,7 @@ as_fn_error $? "failed from path
See \`config.log' for more details" "$LINENO" 5; } See \`config.log' for more details" "$LINENO" 5; }
fi fi
else else
$WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-`arch`.AppImage \ $WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-$LKT_ARCH.AppImage \
-O "$LKT_APPIMAGETOOL" -a config.wget.log -O "$LKT_APPIMAGETOOL" -a config.wget.log
$CHMOD 00700 $LKT_PATH_SOURCE/utils/appimagetool.AppImage $CHMOD 00700 $LKT_PATH_SOURCE/utils/appimagetool.AppImage
if test $? -eq 0 ; then : if test $? -eq 0 ; then :
...@@ -18663,7 +18667,7 @@ _ACEOF ...@@ -18663,7 +18667,7 @@ _ACEOF
   
   
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define LKT_ARCH "$(arch)" #define LKT_ARCH "$LKT_ARCH"
_ACEOF _ACEOF
   
   
......
...@@ -15,6 +15,10 @@ AC_PATH_PROG([MKVPROPEDIT], [mkvpropedit], [:]) ...@@ -15,6 +15,10 @@ AC_PATH_PROG([MKVPROPEDIT], [mkvpropedit], [:])
AC_PATH_PROG([TEST_MAKE], [make], [:]) AC_PATH_PROG([TEST_MAKE], [make], [:])
AC_PATH_PROG([TEST_SQLITE], [sqlite3], [:]) AC_PATH_PROG([TEST_SQLITE], [sqlite3], [:])
# Get the architecture, in some cases `arch` is not present on the system
LKT_ARCH=`arch`
if test $? -ne 0 ; then LKT_ARCH=`uname -m` ; fi
LKT_PATH_SOURCE="$(dirname $(readlink -f "$0"))" LKT_PATH_SOURCE="$(dirname $(readlink -f "$0"))"
LKT_PATH_BUILD="$(pwd)" LKT_PATH_BUILD="$(pwd)"
AC_SUBST([LKT_PATH_SOURCE]) AC_SUBST([LKT_PATH_SOURCE])
...@@ -173,9 +177,9 @@ AS_IF([test "x${LKT_APPIMAGE}" = "xyes"], [ ...@@ -173,9 +177,9 @@ AS_IF([test "x${LKT_APPIMAGE}" = "xyes"], [
AS_IF([test "$WGET" = ":"], [AC_MSG_ERROR([wget is required for AppImage]) ]) AS_IF([test "$WGET" = ":"], [AC_MSG_ERROR([wget is required for AppImage]) ])
AS_IF([test "$CHMOD" = ":"], [AC_MSG_ERROR([chmod is required for AppImage]) ]) AS_IF([test "$CHMOD" = ":"], [AC_MSG_ERROR([chmod is required for AppImage]) ])
LKT_APPIMAGETOOL="$LKT_PATH_SOURCE/utils/appimagetool-`arch`.AppImage" LKT_APPIMAGETOOL="$LKT_PATH_SOURCE/utils/appimagetool-$LKT_ARCH.AppImage"
LKT_LINUXDEPLOY="$LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage" LKT_LINUXDEPLOY="$LKT_PATH_SOURCE/utils/linuxdeploy-$LKT_ARCH.AppImage"
LKT_LINUXDEPLOYQT="$LKT_PATH_SOURCE/utils/linuxdeploy-qt-`arch`.AppImage" LKT_LINUXDEPLOYQT="$LKT_PATH_SOURCE/utils/linuxdeploy-qt-$LKT_ARCH.AppImage"
AC_SUBST([LKT_APPIMAGETOOL]) AC_SUBST([LKT_APPIMAGETOOL])
AC_SUBST([LKT_LINUXDEPLOY]) AC_SUBST([LKT_LINUXDEPLOY])
AC_SUBST([LKT_LINUXDEPLOYQT]) AC_SUBST([LKT_LINUXDEPLOYQT])
...@@ -188,7 +192,7 @@ AS_IF([test "x${LKT_APPIMAGE}" = "xyes"], [ ...@@ -188,7 +192,7 @@ AS_IF([test "x${LKT_APPIMAGE}" = "xyes"], [
cp $PRESENT_IN_PATH $LKT_APPIMAGETOOL cp $PRESENT_IN_PATH $LKT_APPIMAGETOOL
AS_IF([test $? -eq 0 ], [AC_MSG_RESULT([from path])], [AC_MSG_FAILURE([failed from path])]) AS_IF([test $? -eq 0 ], [AC_MSG_RESULT([from path])], [AC_MSG_FAILURE([failed from path])])
else else
$WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-`arch`.AppImage \ $WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-$LKT_ARCH.AppImage \
-O "$LKT_APPIMAGETOOL" -a config.wget.log -O "$LKT_APPIMAGETOOL" -a config.wget.log
$CHMOD 00700 $LKT_PATH_SOURCE/utils/appimagetool.AppImage $CHMOD 00700 $LKT_PATH_SOURCE/utils/appimagetool.AppImage
AS_IF([test $? -eq 0 ], [AC_MSG_RESULT([done])], [AC_MSG_FAILURE([failed])]) AS_IF([test $? -eq 0 ], [AC_MSG_RESULT([done])], [AC_MSG_FAILURE([failed])])
...@@ -254,7 +258,7 @@ AC_SUBST([LKT_MAN_BINARY]) ...@@ -254,7 +258,7 @@ AC_SUBST([LKT_MAN_BINARY])
AC_DEFINE_UNQUOTED([LKT_COMPILER], ["$CC"], [Lektor compiled with]) AC_DEFINE_UNQUOTED([LKT_COMPILER], ["$CC"], [Lektor compiled with])
AC_SUBST([LKT_COMPILER]) AC_SUBST([LKT_COMPILER])
AC_DEFINE_UNQUOTED([LKT_ARCH], ["$(arch)"], [Host architecture]) AC_DEFINE_UNQUOTED([LKT_ARCH], ["$LKT_ARCH"], [Host architecture])
AC_SUBST([LKT_ARCH]) AC_SUBST([LKT_ARCH])
LKT_BUILD_STRING="$(basename $CC)/$(basename $CXX) $(uname -s) $(uname -p) $(uname -r) $(uname -m)" LKT_BUILD_STRING="$(basename $CC)/$(basename $CXX) $(uname -s) $(uname -p) $(uname -r) $(uname -m)"
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter