fix Malloc over/underflow

remove trash

packages/gecode/dev/Makefile

@@ -1,5 +1,5 @@
 all:
-	python code-generator.py
+	python3 code-generator.py
 
 clean:
 	-rm -f *~ *.pyc

packages/gecode/dev/code-generator.py

@@ -625,13 +625,13 @@ class YAPEnumProlog(object):
                 t = sp[1].rstrip(">")
         for x in self.ENUM:
             print("is_%s_('%s')." % (t, x))
-        print()
+        print("\n")
         for x in self.ENUM:
             print("is_%s_('%s','%s')." % (t, x, x))
-        print()
+        print("\n")
         print("is_%s(X,Y) :- nonvar(X), is_%s_(X,Y)." % (t,t))
         print("is_%s(X) :- is_%s_(X,_)." % (t,t))
-        print()
+        print("\n")
 
 class YAPEnumPrologGenerator(object):
 

packages/jpl/jpl.pl

@@ -4504,12 +4504,15 @@ location( java_root, _, Home) :-
 location(java_root, _, JRE) :-
     % OS well-known
     member(Root, [
-		/System/Library/Frameworks/JavaVM.framework/Versions/A/JavaV '/usr/lib',
-		   '/usr/local/lib',
-                   '/opt/lib',
-  '/Library/Java/JavaVirtualMachines',
-  '/System/Library/Frameworks'
-		 ]),
+	       '/Library/Java/JavaVirtualMachines',
+	       '/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation',
+	       '/System/Library/PrivateFrameworks/JavaLaunching.framework/Versions/A/JavaLaunching',
+	       '/System/Library/Frameworks/JavaVM.framework/Versions/A/Java',
+	       '/usr/lib',
+	       '/usr/local/lib',
+               '/opt/lib',
+	       '/System/Library/Frameworks'
+	   ]),
     exists_directory(Root),
     jdk_jre( Root, JRE).
 

packages/jpl/src/c/CMakeLists.txt

@@ -1,10 +1,11 @@
-set(CMAKE_MACOSX_RPATH 1)
+# set(CMAKE_MACOSX_RPATH 1)
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_lib(jplYap  jpl.h jpl.c hacks.h)
 
-include_directories (${JAVA_INCLUDE_DIRS} ${JNI_INCLUDE_DIRS} )
+include_directories (${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} ${JAVA_AWT_PATH} )
 
-  target_link_libraries(jplYap  libYap ${JNI_LIBRARIES} ${JAVA_LIBRARIES})
+  target_link_libraries(jplYap  libYap ${JAVA_JVM_LIBRARY}  ${JAVA_AWT_LIBRARY})
 
   set_target_properties(jplYap PROPERTIES
     OUTPUT_NAME jpl