summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Orgis2007-02-15 23:59:33 +0100
committerJeremy Blosser2007-02-16 21:19:04 -0600
commit76fa8933a84350e165a2c32cd261e416c8b7a0cd (patch)
tree38a14e5f45aff05dd146752db99046b9b39b91f6
parentf263ef4848814c90da05614eb9b1ca6413e2575c (diff)
xdirectfb: no grepping for -m* in CFLAGS, query instead
(new archspecs don't contain these flags anymore) (cherry picked from commit e65feeb59231d5f7455e6d4c3361bb86248686f9)
-rwxr-xr-xdisplay/xdirectfb/BUILD11
-rwxr-xr-xdisplay/xdirectfb/CONFIGURE3
-rw-r--r--display/xdirectfb/HISTORY4
3 files changed, 12 insertions, 6 deletions
diff --git a/display/xdirectfb/BUILD b/display/xdirectfb/BUILD
index 3344f4b22a..83cab08d48 100755
--- a/display/xdirectfb/BUILD
+++ b/display/xdirectfb/BUILD
@@ -12,7 +12,7 @@ fi &&
### xdirectfb specific stuff
cp $SOURCE_DIRECTORY/programs/Xserver/hw/xfree86/xf86Version.h $SOURCE_DIRECTORY/ &&
cp $SOURCE_DIRECTORY/programs/Xserver/hw/xfree86/xf86Date.h $SOURCE_DIRECTORY/ &&
-cat <<__EOF__ >config/cf/host.def
+cat <<__EOF__ >config/cf/host.def &&
#define DefaultCCOptions $CFLAGS
#define DefaultGcc2i386Opt $CFLAGS
@@ -43,20 +43,19 @@ cat <<__EOF__ >config/cf/host.def
#define BuildXprint YES
__EOF__
# end
-
-if echo $CFLAGS| grep -q "mmmx"; then
+
+if [[ "$XDFB_MMX" == "y" ]]; then
echo "#define HasMMXSupport YES" >> config/cf/host.def
fi &&
-if echo $CFLAGS| grep -q "msse"; then
+if [[ "$XDFB_SSE" == "y" ]]; then
echo "#define HasSSESupport YES" >> config/cf/host.def
fi &&
-if echo $CFLAGS| grep -q "m3dnow"; then
+if [[ "$XDFB_3DNOW" == "y" ]]; then
echo "#define Has3DNowSupport YES" >> config/cf/host.def
fi &&
-
cd config/util &&
make -f Makefile.ini lndir &&
cp lndir $SOURCE_DIRECTORY.bld/ &&
diff --git a/display/xdirectfb/CONFIGURE b/display/xdirectfb/CONFIGURE
new file mode 100755
index 0000000000..e663d2e0d2
--- /dev/null
+++ b/display/xdirectfb/CONFIGURE
@@ -0,0 +1,3 @@
+config_query XDFB_MMX "Enable MMX?" n &&
+config_query XDFB_SSE "Enable SSE?" n &&
+config_query XDFB_3DNOW "Enable 3DNow?" n
diff --git a/display/xdirectfb/HISTORY b/display/xdirectfb/HISTORY
index a4bd2e2254..8383a612ed 100644
--- a/display/xdirectfb/HISTORY
+++ b/display/xdirectfb/HISTORY
@@ -1,3 +1,7 @@
+2007-02-15 Thomas Orgis <sobukus@sourcemage.org>
+ * CONFIGURE, BUILD: make queries for mmx,sse,3dnow instead of
+ grepping CFLAGS (the -m* flags are gone there)
+
2006-10-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* INSTALL: use TRACK_ROOT when linking #9163