[Vm-dev] [commit][3352] fix make config to suit ARM/linux

commits at squeakvm.org commits at squeakvm.org
Thu May 21 18:11:05 UTC 2015


Revision: 3352
Author:   rowledge
Date:     2015-05-21 11:11:04 -0700 (Thu, 21 May 2015)
Log Message:
-----------
fix make config to suit ARM/linux

Modified Paths:
--------------
    branches/Cog/build.linux32ARM/squeak.cog.spur/build/mvm
    branches/Cog/build.linux32ARM/squeak.cog.spur/build/plugins.ext
    branches/Cog/build.linux32ARM/squeak.cog.spur/build/plugins.int

Modified: branches/Cog/build.linux32ARM/squeak.cog.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32ARM/squeak.cog.spur/build/mvm	2015-05-21 05:06:22 UTC (rev 3351)
+++ branches/Cog/build.linux32ARM/squeak.cog.spur/build/mvm	2015-05-21 18:11:04 UTC (rev 3352)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Spur VM with VM profiler and threaded heartbeat
-INSTALLDIR=cogspurlinuxht
+INSTALLDIR=cogspurlinuxhtARM
 # Some gcc versions create a broken VM using -O2
 case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
 3.4.*)	OPT="-g -O1 -DNDEBUG -DDEBUGVM=0";;
@@ -18,15 +18,15 @@
 *)			test -f Makefile && make reallyclean
 esac
 test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 \
+		--without-vm-display-fbdev --with-vmversion=5.0 \
 		--with-src=spursrc --with-plugins=src/plugins \
-	CC="gcc -m32" \
-	CXX="g++ -m32" \
-	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0" \
-	LIBS="-lpthread -luuid" \
+	CC="gcc " \
+	CXX="g++ " \
+	CFLAGS="$OPT  -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0" \
+	LIBS="-lpthread -luuid -lasound" \
 	LDFLAGS=-Wl,-z,now
 rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../products/$INSTALLDIR
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
-# but older linux readlinks lack the -f flag
-make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
+# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
+make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG

Modified: branches/Cog/build.linux32ARM/squeak.cog.spur/build/plugins.ext
===================================================================
--- branches/Cog/build.linux32ARM/squeak.cog.spur/build/plugins.ext	2015-05-21 05:06:22 UTC (rev 3351)
+++ branches/Cog/build.linux32ARM/squeak.cog.spur/build/plugins.ext	2015-05-21 18:11:04 UTC (rev 3352)
@@ -1,8 +1,8 @@
 # Copied, perhaps edited, from ../../src/examplePlugins.ext
 EXTERNAL_PLUGINS = \
-B3DAcceleratorPlugin \
-BochsIA32Plugin \
-GdbARMPlugin \
+#B3DAcceleratorPlugin \
+#BochsIA32Plugin \
+#GdbARMPlugin \
 SqueakFFIPrims \
 SqueakSSL \
 LocalePlugin \

Modified: branches/Cog/build.linux32ARM/squeak.cog.spur/build/plugins.int
===================================================================
--- branches/Cog/build.linux32ARM/squeak.cog.spur/build/plugins.int	2015-05-21 05:06:22 UTC (rev 3351)
+++ branches/Cog/build.linux32ARM/squeak.cog.spur/build/plugins.int	2015-05-21 18:11:04 UTC (rev 3352)
@@ -6,7 +6,7 @@
 B2DPlugin \
 BitBltPlugin \
 BMPReadWriterPlugin \
-CroquetPlugin \
+#CroquetPlugin \
 ZipPlugin \
 DropPlugin \
 DSAPrims \
@@ -15,7 +15,7 @@
 FilePlugin \
 FloatArrayPlugin \
 FloatMathPlugin \
-IA32ABI \
+#IA32ABI \
 JoystickTabletPlugin \
 JPEGReaderPlugin \
 JPEGReadWriter2Plugin \



More information about the Vm-dev mailing list