ecda38b0a5
Proudly brought to you by the KDE on FreeBSD team, with commits by makc@, Schaich Alonso and yours truly. Besides the tons of upstream fixes, we have mkspecs for GCC 4.9 and clang33 (from ports), staging support in the Makefiles and dependency fixes related to pkg-config. Many thanks to the people who helped test the ports using our area51 repository, and also to the people who provided patches and bug reports via GNATS! PR: ports/180615 ports/181921 ports/182049
58 lines
1.5 KiB
Plaintext
58 lines
1.5 KiB
Plaintext
--- ./configure.orig 2012-01-06 11:42:45.828388787 +0100
|
|
+++ ./configure 2012-01-06 11:46:01.318339795 +0100
|
|
@@ -829,7 +829,7 @@
|
|
CFG_SILENT=no
|
|
CFG_GRAPHICS_SYSTEM=default
|
|
CFG_RUNTIME_SYSTEM=
|
|
-CFG_ALSA=auto
|
|
+CFG_ALSA=no
|
|
CFG_PULSEAUDIO=auto
|
|
CFG_COREWLAN=auto
|
|
CFG_ICD=auto
|
|
@@ -2576,11 +2576,6 @@
|
|
fi
|
|
done
|
|
|
|
- # symlink the mkspecs directory
|
|
- mkdir -p "$outpath/mkspecs"
|
|
- rm -rf "$outpath"/mkspecs/*
|
|
- ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
|
|
- rm -f "$outpath/mkspecs/default"
|
|
|
|
ShadowMkspecs()
|
|
{
|
|
@@ -2626,7 +2621,7 @@
|
|
# find a make command
|
|
if [ -z "$MAKE" ]; then
|
|
MAKE=
|
|
- for mk in gmake make; do
|
|
+ for mk in make; do
|
|
if "$WHICH" $mk >/dev/null 2>&1; then
|
|
MAKE=`"$WHICH" $mk`
|
|
break
|
|
@@ -4816,7 +4811,7 @@
|
|
}
|
|
|
|
# build qmake
|
|
-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
|
+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
|
|
echo "Creating qmake. Please wait..."
|
|
|
|
OLD_QCONFIG_H=
|
|
@@ -5995,15 +5995,6 @@
|
|
QMakeVar add QMAKE_CXXFLAGS -fpermissive
|
|
X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive"
|
|
fi
|
|
-
|
|
- # Check we actually have X11 :-)
|
|
- compileTest x11/xlib "XLib" $X11TESTS_FLAGS
|
|
- if [ $? != "0" ]; then
|
|
- echo "Basic XLib functionality test failed!"
|
|
- echo " You might need to modify the include and library search paths by editing"
|
|
- echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
|
|
- exit 1
|
|
- fi
|
|
fi
|
|
|
|
# X11/MINGW/SYMBIAN OpenGL
|