Changeset View
Changeset View
Standalone View
Standalone View
head/devel/qt5/files/extrapatch-configure
| Show All 10 Lines | * All the other chunks are part of the changes required to avoid ports/194088. | ||||
| This part of the solution comprises both filtering the output of the | This part of the solution comprises both filtering the output of the | ||||
| pkg-config calls so it does not contain those parameters as well as | pkg-config calls so it does not contain those parameters as well as | ||||
| changing the default value of DEFAULT_LIBDIRS in bsd.qt.mk (in the | changing the default value of DEFAULT_LIBDIRS in bsd.qt.mk (in the | ||||
| qtbase-post-patch target). It is used in the pkg-config filtering as well | qtbase-post-patch target). It is used in the pkg-config filtering as well | ||||
| as the value of QMAKE_DEFAULT_LIBDIRS in mkspecs/qconfig.pri (which qmake | as the value of QMAKE_DEFAULT_LIBDIRS in mkspecs/qconfig.pri (which qmake | ||||
| uses to filter out those same paths when processing .pro files). | uses to filter out those same paths when processing .pro files). | ||||
| --- configure.orig 2015-03-16 17:16:10.000000000 +0100 | --- configure.orig 2015-03-16 17:16:10.000000000 +0100 | ||||
| +++ configure 2015-05-01 09:35:38.595937000 +0200 | +++ configure 2016-04-18 12:35:38.595937000 +0200 | ||||
| @@ -3853,7 +3853,7 @@ | @@ -3878,7 +3878,7 @@ | ||||
| } | } | ||||
| # build qmake | # build qmake | ||||
| -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||||
| +if [ '!' -e "$outpath/bin/qmake" ]; then | +if [ '!' -e "$outpath/bin/qmake" ]; then | ||||
| echo "Creating qmake..." | echo "Creating qmake..." | ||||
| mkdir -p "$outpath/qmake" || exit | mkdir -p "$outpath/qmake" || exit | ||||
| @@ -4777,8 +4777,8 @@ | @@ -5045,8 +5045,8 @@ | ||||
| SQLITE_AUTODETECT_FAILED="no" | SQLITE_AUTODETECT_FAILED="no" | ||||
| if [ "$CFG_SQLITE" = "system" ]; then | if [ "$CFG_SQLITE" = "system" ]; then | ||||
| if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then | if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then | ||||
| - QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null` | - QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null` | ||||
| - QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null` | - QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null` | ||||
| + QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null | filterIncludeOptions` | + QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null | filterIncludeOptions` | ||||
| + QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null | filterLibraryOptions` | + QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null | filterLibraryOptions` | ||||
| else | else | ||||
| QT_CFLAGS_SQLITE= | QT_CFLAGS_SQLITE= | ||||
| QT_LFLAGS_SQLITE="-lsqlite3 -lz" | QT_LFLAGS_SQLITE="-lsqlite3 -lz" | ||||
| @@ -4881,8 +4881,8 @@ | @@ -5149,8 +5149,8 @@ | ||||
| fi | # runtime: no detection (cannot fail), load libdbus-1 at runtime | ||||
| if [ "$CFG_DBUS" = "linked" ]; then | if [ "$CFG_DBUS" = "auto" ] || [ "$CFG_DBUS" = "linked" ]; then | ||||
| if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then | if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then | ||||
| - QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null` | - QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null` | ||||
| - QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null` | - QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null` | ||||
| + QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null | filterIncludeOptions` | + QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null | filterIncludeOptions` | ||||
| + QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null | filterLibraryOptions` | + QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null | filterLibraryOptions` | ||||
| else | else | ||||
| QT_LIBS_DBUS="-ldbus-1" | QT_LIBS_DBUS="-ldbus-1" | ||||
| fi | fi | ||||
| @@ -4928,8 +4928,8 @@ | @@ -5201,8 +5201,8 @@ | ||||
| # auto-detect Glib support | # auto-detect Glib support | ||||
| if [ "$CFG_GLIB" != "no" ]; then | if [ "$CFG_GLIB" != "no" ]; then | ||||
| if [ -n "$PKG_CONFIG" ]; then | if [ -n "$PKG_CONFIG" ]; then | ||||
| - QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null` | - QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null` | ||||
| - QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null` | - QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null` | ||||
| + QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null | filterIncludeOptions` | + QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null | filterIncludeOptions` | ||||
| + QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null | filterLibraryOptions` | + QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null | filterLibraryOptions` | ||||
| fi | fi | ||||
| if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then | if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then | ||||
| CFG_GLIB=yes | CFG_GLIB=yes | ||||
| @@ -4952,9 +4952,9 @@ | @@ -5225,9 +5225,9 @@ | ||||
| # auto-detect GTK style support | # auto-detect GTK style support | ||||
| if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then | if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "no" ]; then | ||||
| if [ -n "$PKG_CONFIG" ]; then | if [ -n "$PKG_CONFIG" ]; then | ||||
| - QT_CFLAGS_QGTK2=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.18 atk 2>/dev/null` | - QT_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null` | ||||
| - QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.0 2>/dev/null` | - QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null` | ||||
| - QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null` | - QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null` | ||||
| + QT_CFLAGS_QGTK2=`$PKG_CONFIG --cflags gtk+-2.0 ">=" 2.18 atk 2>/dev/null | filterIncludeOptions` | + QT_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null | filterIncludeOptions` | ||||
| + QT_LIBS_QGTK2=`$PKG_CONFIG --libs gtk+-2.0 2>/dev/null | filterLibraryOptions` | + QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null | filterLibraryOptions` | ||||
| + QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null | filterLibraryOptions` | + QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null | filterLibraryOptions` | ||||
| fi | fi | ||||
| if [ -n "$QT_CFLAGS_QGTK2" ] ; then | if [ -n "$QT_CFLAGS_QGTK3" ] ; then | ||||
| CFG_QGTKSTYLE=yes | CFG_GTK=yes | ||||
| @@ -5001,8 +5001,8 @@ | @@ -5272,8 +5272,8 @@ | ||||
| # Auto-detect PulseAudio support | # Auto-detect PulseAudio support | ||||
| if [ "$CFG_PULSEAUDIO" != "no" ]; then | if [ "$CFG_PULSEAUDIO" != "no" ]; then | ||||
| if [ -n "$PKG_CONFIG" ]; then | if [ -n "$PKG_CONFIG" ]; then | ||||
| - QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` | - QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` | ||||
| - QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` | - QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` | ||||
| + QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterIncludeOptions` | + QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterIncludeOptions` | ||||
| + QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterLibraryOptions` | + QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterLibraryOptions` | ||||
| fi | fi | ||||
| if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then | if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then | ||||
| CFG_PULSEAUDIO=yes | CFG_PULSEAUDIO=yes | ||||
| @@ -5165,8 +5165,8 @@ | @@ -5436,8 +5436,8 @@ | ||||
| # auto-detect FontConfig support | # auto-detect FontConfig support | ||||
| if [ "$CFG_FONTCONFIG" != "no" ]; then | if [ "$CFG_FONTCONFIG" != "no" ]; then | ||||
| if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then | if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then | ||||
| - QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null` | - QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null` | ||||
| - QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null` | - QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null` | ||||
| + QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null | filterIncludeOptions` | + QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null | filterIncludeOptions` | ||||
| + QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null | filterLibraryOptions` | + QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null | filterLibraryOptions` | ||||
| else | else | ||||
| Show All 18 Lines | if [ "$CFG_XCB" != "no" ]; then | ||||
| if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then | if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then | ||||
| - QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`" | - QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`" | ||||
| - QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null`" | - QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null`" | ||||
| + QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null | filterIncludeOptions`" | + QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null | filterIncludeOptions`" | ||||
| + QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null | filterLibraryOptions`" | + QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null | filterLibraryOptions`" | ||||
| fi | fi | ||||
| if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then | if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then | ||||
| QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" | QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" | ||||
| @@ -5353,16 +5353,16 @@ | @@ -5631,16 +5631,16 @@ | ||||
| CFG_XCB="system" | CFG_XCB="system" | ||||
| if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then | if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then | ||||
| XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape" | XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape" | ||||
| - QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`" | - QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`" | ||||
| - QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`" | - QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`" | ||||
| + QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null | filterIncludeOptions`" | + QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null | filterIncludeOptions`" | ||||
| + QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null | filterLibraryOptions`" | + QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null | filterLibraryOptions`" | ||||
| fi | fi | ||||
| Show All 15 Lines | if [ "$CFG_DIRECTFB" != "no" ]; then | ||||
| if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then | if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then | ||||
| - QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null` | - QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null` | ||||
| - QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null` | - QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null` | ||||
| + QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null | filterIncludeOptions` | + QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null | filterIncludeOptions` | ||||
| + QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null | filterLibraryOptions` | + QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null | filterLibraryOptions` | ||||
| if compileTest qpa/directfb "DirectFB" $QMAKE_CFLAGS_DIRECTFB $QMAKE_LIBS_DIRECTFB; then | if compileTest qpa/directfb "DirectFB" $QMAKE_CFLAGS_DIRECTFB $QMAKE_LIBS_DIRECTFB; then | ||||
| CFG_DIRECTFB=yes | CFG_DIRECTFB=yes | ||||
| elif [ "$CFG_DIRECTFB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then | elif [ "$CFG_DIRECTFB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then | ||||
| @@ -5470,8 +5470,8 @@ | @@ -5776,8 +5776,8 @@ | ||||
| if [ "$CFG_XKBCOMMON" != "no" ] && [ "$CFG_XKBCOMMON" != "qt" ]; then | if [ "$CFG_XKBCOMMON" != "no" ] && [ "$CFG_XKBCOMMON" != "qt" ]; then | ||||
| # Check if there is a suitable system-wide xkbcommon | # Check if there is a suitable system-wide xkbcommon | ||||
| if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon xkbcommon-x11 >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then | if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon xkbcommon-x11 >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then | ||||
| - QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null`" | - QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null`" | ||||
| - QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null`" | - QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null`" | ||||
| + QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null | filterIncludeOptions`" | + QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null | filterIncludeOptions`" | ||||
| + QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null | filterLibraryOptions`" | + QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null | filterLibraryOptions`" | ||||
| QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" | QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" | ||||
| QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" | QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" | ||||
| @@ -5524,9 +5524,9 @@ | @@ -5830,9 +5830,9 @@ | ||||
| fi | fi | ||||
| if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then | if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then | ||||
| - QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` | - QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` | ||||
| - QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null` | - QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null` | ||||
| - QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null` | - QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null` | ||||
| + QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'` | + QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'` | ||||
| + QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null | filterLibraryOptions` | + QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null | filterLibraryOptions` | ||||
| + QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null | filterIncludeOptions` | + QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null | filterIncludeOptions` | ||||
| QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL" | QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL" | ||||
| QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL" | QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL" | ||||
| QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`" | QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`" | ||||