63 lines
2.2 KiB
Plaintext
63 lines
2.2 KiB
Plaintext
$OpenBSD: patch-configure,v 1.16 2019/03/09 11:36:44 sthen Exp $
|
|
Index: configure
|
|
--- configure.orig
|
|
+++ configure
|
|
@@ -987,7 +987,7 @@ while [ "$#" -gt 0 ]; do
|
|
v|verbose)
|
|
if [ "$VAL" = "yes" ]; then
|
|
if [ "$OPT_VERBOSE" = "$VAL" ]; then # takes two verboses to turn on qmake debugs
|
|
- QMAKE_SWITCHES="$QMAKE_SWITCHES -d"
|
|
+ : # QMAKE_SWITCHES="$QMAKE_SWITCHES -d"
|
|
else
|
|
OPT_VERBOSE=yes
|
|
fi
|
|
@@ -1279,7 +1279,7 @@ QMAKE_VARS="$QMAKE_VARS \"QMAKE_MOC_SRC=$outpath/src/m
|
|
|
|
# find out which awk we want to use, prefer gawk, then nawk, then regular awk
|
|
AWK=
|
|
-for e in gawk nawk awk; do
|
|
+for e in awk; do
|
|
if $WHICH $e >/dev/null 2>&1 && ( $e -f /dev/null /dev/null ) >/dev/null 2>&1; then
|
|
AWK=$e
|
|
break
|
|
@@ -1646,7 +1646,7 @@ if echo $MODULES | grep sql >/dev/null; then
|
|
MYSQL_REQ="-lmysqlclient mysql.h"
|
|
OCI_REQ="-lclntsh -lwtc8 oci.h"
|
|
PSQL_REQ="-lpq postgres.h libpq/libpq-fs.h catalog/pg_type.h libpq-fe.h"
|
|
- ODBC_REQ="-lodbc sql.h sqlext.h"
|
|
+ ODBC_REQ="-liodbc sql.h sqlext.h"
|
|
TDS_REQ="-lsybdb sybfront.h sybdb.h"
|
|
DB2_REQ="-ldb2 sqlcli.h sqlcli1.h"
|
|
IBASE_REQ="-lgds ibase.h"
|
|
@@ -2448,7 +2448,7 @@ elif [ "$Edition" = "free" ]; then
|
|
else
|
|
echo "Do you accept the terms of $affix license? \c"
|
|
fi
|
|
- read acceptance
|
|
+ acceptance=yes
|
|
echo
|
|
if [ "$acceptance" = "yes" ]; then
|
|
break
|
|
@@ -2941,8 +2941,8 @@ fi
|
|
if [ "$CFG_LIBMNG" = "system" ]; then
|
|
QMAKE_CONFIG="$QMAKE_CONFIG system-mng"
|
|
if [ "$CFG_MNG" = "yes" ]; then
|
|
- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT+=-lmng\""
|
|
- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT_THREAD+=-lmng\""
|
|
+ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT+=-lmng -llcms -ljpeg\""
|
|
+ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT_THREAD+=-lmng -llcms -ljpeg\""
|
|
fi
|
|
fi
|
|
if [ "$CFG_MNG" = "no" ]; then
|
|
@@ -2968,8 +2968,8 @@ fi
|
|
if [ "$CFG_LIBPNG" = "system" ]; then
|
|
QMAKE_CONFIG="$QMAKE_CONFIG system-png"
|
|
if [ "$CFG_PNG" = "yes" ]; then
|
|
- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT+=-lpng\""
|
|
- QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT_THREAD+=-lpng\""
|
|
+ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT+=-lpng -lz\""
|
|
+ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_QT_THREAD+=-lpng -lz\""
|
|
fi
|
|
fi
|
|
if [ "$CFG_PNG" = "no" ]; then
|