Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d934fdd83a31545bfab50f41d243e3ee1af1d609)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d934fdd83a31545bfab50f41d243e3ee1af1d609)
  • Date: Thu, 15 Feb 2007 19:53:20 -0600

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

display/xdirectfb/BUILD | 11 +++++------
display/xdirectfb/CONFIGURE | 5 +++++
display/xdirectfb/HISTORY | 5 +++++
libs/fftw/BUILD | 28 ++++++----------------------
libs/fftw/CONFIGURE | 12 ++++++++++--
libs/fftw/HISTORY | 4 ++++
6 files changed, 35 insertions(+), 30 deletions(-)

New commits:
commit 673f9bc6e55bcf9ee49eb16c324bfc33d72852b9
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xdirectfb: making the special optimizations ia32 specific

commit 223d89e5c64ce9685c8332d1a97bfe6d6efb7f2f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

fftw: turning greping for -m* in CFLAGS into ia32 specific queries

commit e65feeb59231d5f7455e6d4c3361bb86248686f9
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xdirectfb: no grepping for -m* in CFLAGS, query instead
(new archspecs don't contain these flags anymore)

diff --git a/display/xdirectfb/BUILD b/display/xdirectfb/BUILD
index 3344f4b..83cab08 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 0000000..65e957a
--- /dev/null
+++ b/display/xdirectfb/CONFIGURE
@@ -0,0 +1,5 @@
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
+ config_query XDFB_MMX "Enable MMX?" n &&
+ config_query XDFB_SSE "Enable SSE?" n &&
+ config_query XDFB_3DNOW "Enable 3DNow?" n
+fi
diff --git a/display/xdirectfb/HISTORY b/display/xdirectfb/HISTORY
index a4bd2e2..b4bbe29 100644
--- a/display/xdirectfb/HISTORY
+++ b/display/xdirectfb/HISTORY
@@ -1,3 +1,8 @@
+2007-02-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE, BUILD: make queries for mmx,sse,3dnow instead of
+ grepping CFLAGS (the -m* flags are gone there)
+ also make that ia32 specific
+
2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT when linking #9163

diff --git a/libs/fftw/BUILD b/libs/fftw/BUILD
index 3adf54b..34b53b6 100755
--- a/libs/fftw/BUILD
+++ b/libs/fftw/BUILD
@@ -1,36 +1,20 @@
-if list_find "$CFLAGS" sse2; then
- DOUBLEOPTS="$DOUBLEOPTS --enable-sse2"
-fi
-if list_find "$CFLAGS" sse; then
- FLOATOPTS="$FLOATOPTS --enable-sse"
-fi
-if list_find "$CFLAGS" altivec; then
- FLOATOPTS="$FLOATOPTS --enable-altivec"
-fi
-if list_find "$CFLAGS" 3dnow; then
- FLOATOPTS="$FLOATOPTS --enable-k7"
-fi
-if list_find "$CFLAGS" powerpc; then
- OPTS="$OPTS --enable-fma"
-fi
if [[ $FORTRAN == "n" ]]; then
- OPTS="$OPTS --disable-fortran"
-fi
-CFLAGS="${CFLAGS/-Os/}"
-OPTS="$OPTS $FFTW_THREADS" &&
-
+ OPTS="$OPTS --disable-fortran"
+fi &&
+CFLAGS="${CFLAGS/-Os/}" &&
+OPTS="$OPTS $FFTW_THREADS $FFTW_OPTS" &&
cd $SOURCE_DIRECTORY/fftw-single-$VERSION &&
./configure --prefix=${INSTALL_ROOT}/usr \
--enable-shared \
--enable-float \
--enable-type-prefix \
- $OPTS $FLOATOPTS &&
+ $OPTS $FFTW_FLOATOPTS &&
make &&
cd $SOURCE_DIRECTORY/fftw-double-$VERSION &&
./configure --prefix=${INSTALL_ROOT}/usr \
--enable-shared \
--enable-type-prefix \
- $OPTS $DOUBLEOPTS &&
+ $OPTS $FFTW_DOUBLEOPTS &&
make &&
cd $SOURCE_DIRECTORY/fftw-longdouble-$VERSION &&
./configure --prefix=${INSTALL_ROOT}/usr \
diff --git a/libs/fftw/CONFIGURE b/libs/fftw/CONFIGURE
index 5783e3f..3fb99fc 100755
--- a/libs/fftw/CONFIGURE
+++ b/libs/fftw/CONFIGURE
@@ -2,5 +2,13 @@ config_query_option FFTW_THREADS "Compil
"--enable-threads --with-combined-threads" \
"--disable-threads --without-combined-threads" &&

-config_query FORTRAN "Compile in fortran bindings?" n
-
+config_query FORTRAN "Compile in fortran bindings?" n &&
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
+ config_query_option FFTW_DOUBLEOPTS "x86: enable SSE2 for doubles?" n
--enable-sse2 --enable-sse2 &&
+ config_query_option FFTW_FLOATOPTS "x86: enable SSE for floats?" n
--enable-sse --disable-sse &&
+ config_query_option FFTW_FLOATOPTS "x86: enable K7 opts (incl. 3DNow) for
floats?" n --enable-k7 --disable-k7
+fi &&
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ppc" ]]; then
+ config_query_option FFTW_FLOATOPTS "ppc: enable AltiVec for floats?" n
--enable-altivec --disable-altivec
+fi &&
+config_query_option FFTW_OPTS "Enable opts for fused multiply-add (p.ex.
ppc)?" n --enable-fma --disable-fma
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index c9f52e0..be2d7f5 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,7 @@
+2007-02-16 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE,BUILD: turn grepping of CFLAGS into queries for
+ special optimizations, accompanying --enable with --disable
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d934fdd83a31545bfab50f41d243e3ee1af1d609), Thomas Orgis, 02/15/2007

Archive powered by MHonArc 2.6.24.

Top of Page