build system in flux

README.md

@@ -24,6 +24,8 @@ For now, pyvex requires valgrind to be compiled with fPIC:
 	make
 	make install
 
+Now you need to update the symblinks to the VEX libraries and includes (vex\_include and vex\_lib), and fix VEX\_LIB\_NAME in the setup.py
+
 Great! Now you can build pyvex.
 
 	python setup.py build

pyvex/pyvex_static.c

@@ -211,25 +211,25 @@ void vex_prepare_vai(VexArch arch, VexArchInfo *vai)
 			break;
 		case VexArchARM:
 			vai->hwcaps = 7;
-//			vai->endness = Iend_LE; // unsure if correct
+			vai->endness = Iend_BE; // unsure if correct
 			break;
 		case VexArchPPC32:
 			vai->hwcaps = 0;
 			vai->ppc_icache_line_szB = 32; // unsure if correct
-//			vai->endness = Iend_BE; // unsure if correct
+			vai->endness = Iend_BE; // unsure if correct
 			break;
 		case VexArchPPC64:
 			vai->hwcaps = 0;
 			vai->ppc_icache_line_szB = 64; // unsure if correct
-//			vai->endness = Iend_BE; // unsure if correct
+			vai->endness = Iend_BE; // unsure if correct
 			break;
 		case VexArchS390X:
 			vai->hwcaps = 0;
 			// WHICH? vai->endness = Iend_BE; // unsure if correct
 			break;
 		case VexArchMIPS32:
 			vai->hwcaps = 0x00010000;
-//			vai->endness = Iend_LE; // unsure if correct
+			vai->endness = Iend_LE; // unsure if correct
 			break;
 		default:
 			error("Invalid arch in vex_prepare_vai.\n");

setup.py

@@ -4,8 +4,13 @@
 
 import os
 import subprocess
-vgprefix = os.environ["HOME"] + "/valgrind/inst39"
+#vgprefix = os.environ["HOME"] + "/valgrind/inst39"
 #vgprefix = "/usr"
+#vgprefix = "/usr"
+
+VEX_INCLUDE = "./vex_include"
+VEX_LIB = "./vex_lib"
+VEX_LIB_NAME = "vex" # can also be vex-amd64-linux
 
 common_files = ["pyvex/pyvex.c", "pyvex/pyvex_irsb.c", "pyvex/pyvex_irstmt.c", "pyvex/pyvex_irtypeenv.c", "pyvex/pyvex_irexpr.c", "pyvex/pyvex_enums.c", 
 "pyvex/pyvex_irconst.c", "pyvex/pyvex_ircallee.c", "pyvex/pyvex_irregarray.c", "pyvex/pyvex_logging.c" ]
@@ -18,9 +23,11 @@ def initialize_options(self): pass
 	def finalize_options(self): pass
 	def run(self):
 		comp = new_compiler()
-		comp.add_include_dir(vgprefix + "/include/valgrind")
-		comp.add_library_dir(vgprefix + "/lib/valgrind")
-		comp.add_library("vex-amd64-linux")
+		#comp.add_include_dir(vgprefix + "/include/valgrind")
+		#comp.add_library_dir(".")
+		comp.add_include_dir("./vg_include")
+		comp.add_library_dir("./vg_lib")
+		comp.add_library("libvex")
 		comp.define_macro("PYVEX_STATIC", "1")
 		comp.define_macro("PYVEX_STATIC_PYTHON", "1")
 		comp.add_include_dir(sysconfig.get_python_inc())
@@ -33,9 +40,9 @@ def run(self):
       ext_modules=[Extension(
 		"pyvex",
 		static_files,
-		include_dirs=[vgprefix + "/include/valgrind"],
-		library_dirs=[vgprefix + "/lib/valgrind"],
-		libraries=["vex-amd64-linux"],
+		include_dirs=[VEX_INCLUDE],
+		library_dirs=[VEX_LIB],
+		libraries=[VEX_LIB_NAME],
 		extra_objects=[], #, vgprefix + "/lib/valgrind/libvex-amd64-linux.a"],
 	        define_macros=[('PYVEX_STATIC', '1')],
 		extra_compile_args=["--std=c99"]),