File lejos-soname.patch of Package lejos

Overview Repositories Revisions Requests Users Attributes Meta

File lejos-soname.patch of Package lejos (Revision 0c98b46de5ce8aa00c053a25ef377cec)

Currently displaying revision 0c98b46de5ce8aa00c053a25ef377cec , Show latest

diff -up ./build/build.xml.orig ./build/build.xml
--- ./build/build.xml.orig	2006-08-02 08:55:04.000000000 +0200
+++ ./build/build.xml	2013-10-11 13:57:00.949347127 +0200
@@ -66,16 +66,12 @@
 
 	
 	<target name="irctrcx.libs" description="builds the irctrcx libraries">
-		<exec executable="make" failonerror="true" dir="${irctrcx.lib.src}">
-			<arg line="OSTYPE=${lejos.ostype} LEJOS_HOME=${lejos.dist.root} BIN_TARGET=${make.out}"/>
-		</exec> 
+        <ant antfile="${irctrcx.lib.src}/build.xml" dir="${irctrcx.lib.src}" inheritall="true" />
 	</target>
 
 	
 	<target name="jirctrcx.libs" depends="irctrcx.libs" description="builds the jirctrcx libraries">
-		<exec executable="make" failonerror="true" dir="${jirctrcx.lib.src}">
-			<arg line="OSTYPE=${lejos.ostype} LEJOS_HOME=${lejos.dist.root} BIN_TARGET=${make.out} TRACE=${trace}"/>
-		</exec> 
+        <ant antfile="${jirctrcx.lib.src}/build.xml" dir="${jirctrcx.lib.src}" inheritall="true" />
   	</target>
 
   	
diff -up ./src/comms/libirtrcx/build.xml.orig ./src/comms/libirtrcx/build.xml
--- ./src/comms/libirtrcx/build.xml.orig	2006-09-17 11:51:34.000000000 +0200
+++ ./src/comms/libirtrcx/build.xml	2013-10-11 13:54:21.844699413 +0200
@@ -24,6 +24,7 @@
 			<includepath path="."/>
 			<linker name="g++"/>
 			<linkerarg value="-g" if="debug"/>
+			<linkerarg value="-Wl,-soname,libirtrcx.so.3"/>
 			<linkerarg location="end" value="-framework"/>
 			<linkerarg location="end" value="IOKit"/>
 			<linkerarg location="end" value="-framework"/>
@@ -24,10 +24,6 @@
 			<includepath path="."/>
 			<linker name="g++"/>
 			<linkerarg value="-g" if="debug"/>
-			<linkerarg location="end" value="-framework"/>
-			<linkerarg location="end" value="IOKit"/>
-			<linkerarg location="end" value="-framework"/>
-			<linkerarg location="end" value="CoreFoundation"/>
 			<fileset dir=".">
 				<include name="rcx_comm.c"/>
   		    		<include name="rcx_comm_${lejos.ostype}.c"/>
@@ -37,8 +37,6 @@
 		    		<include name="osx_usb.h"/>
 		    		<include name="osx_usb.cpp"/>
 			</fileset>
-			
-			<libset libs="c"/>
 			<versioninfo refid="${lejos.version}"/>
   		</cc>
 	</target>
diff -up ./src/comms/libjirtrcx/build.xml.orig ./src/comms/libjirtrcx/build.xml
--- ./src/comms/libjirtrcx/build.xml.orig	2006-09-17 11:51:34.000000000 +0200
+++ ./src/comms/libjirtrcx/build.xml	2013-10-11 14:26:28.617168953 +0200
@@ -25,6 +25,7 @@
   			    rtti="true"
   			    optimize="size"
   				name="${lejos.compiler}">
+  				<linkerarg value="-Wl,-soname,libjirtrcx.so.3"/>
   				<fileset dir=".">
   					<include name="tower.c"/>
   				</fileset>

Places

File lejos-soname.patch of Package lejos (Revision 0c98b46de5ce8aa00c053a25ef377cec)

Places