freeciv: Fix unrecognised configure option error

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
This commit is contained in:
Marko Lindqvist
2022-03-03 12:11:30 +02:00
parent 099df79b62
commit 53be951f56
4 changed files with 42 additions and 0 deletions

View File

@@ -0,0 +1,20 @@
diff --git a/configure.ac b/configure.ac
index e7651bea3e..a36dad82b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -658,6 +658,15 @@ if test "x$XMLREGISTRY" = "xyes" ; then
AC_DEFINE([FREECIV_HAVE_XML_REGISTRY], [1], [Build xml-backend for registry])
fi
+dnl Dummy configure option for OpenEmbedded build of older branches
+dnl to avoid unrecognised option error
+AC_ARG_WITH([qtver],
+ AS_HELP_STRING([--with-qtver], [which Qt version to build against [qt5]]),
+[case "${withval}" in
+ qt5|Qt5) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --with-qtver]) ;;
+esac])
+
dnl Set debug flags supported by compiler
EXTRA_DEBUG_CFLAGS=""
EXTRA_DEBUG_CXXFLAGS=""

View File

@@ -0,0 +1,20 @@
diff --git a/configure.ac b/configure.ac
index d26b8fdf28..8daa054344 100644
--- a/configure.ac
+++ b/configure.ac
@@ -612,6 +612,15 @@ PKG_CHECK_MODULES([ICU], [icu-uc],,
UTILITY_CFLAGS="${UTILITY_CFLAGS} ${ICU_CFLAGS}"
UTILITY_LIBS="${UTILITY_LIBS} ${ICU_LIBS}"
+dnl Dummy configure option for OpenEmbedded build of older branches
+dnl to avoid unrecognised option error
+AC_ARG_WITH([qtver],
+ AS_HELP_STRING([--with-qtver], [which Qt version to build against [qt5]]),
+[case "${withval}" in
+ qt5|Qt5) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --with-qtver]) ;;
+esac])
+
dnl Set debug flags supported by compiler
EXTRA_DEBUG_CFLAGS=""
EXTRA_DEBUG_CXXFLAGS=""

View File

@@ -3,6 +3,7 @@ require freeciv-qt5.inc
SRC_URI += "\
${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
file://dummy-qtver-S2_6.patch \
"
SRC_URI[sha256sum] = "7bcfe5dd3c081122e7cde7cdb24f57c3681d6a9667496faed207a91ac3165811"

View File

@@ -5,6 +5,7 @@ DEFAULT_PREFERENCE = "-1"
SRC_URI += "\
${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
file://dummy-qtver.patch \
"
SRC_URI[sha256sum] = "ea2a8782d4fdfef2471e05b74569b4a69cc60a41ab279427860dafdac128a0b2"