[med-svn] r3919 - trunk/packages/arb/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2009-09-08 06:39:59 +0000 (Tue, 08 Sep 2009)
New Revision: 3919

Modified:
   trunk/packages/arb/trunk/debian/patches/20_Makefiles
   trunk/packages/arb/trunk/debian/patches/30_Makefile_main
Log:
Adjusted patches to sucessfully compile upstream code


Modified: trunk/packages/arb/trunk/debian/patches/20_Makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_Makefiles	2009-09-07 13:56:33 UTC (rev 3918)
+++ trunk/packages/arb/trunk/debian/patches/20_Makefiles	2009-09-08 06:39:59 UTC (rev 3919)
@@ -41,17 +41,9 @@
  
 --- arbsrc_6182.orig/PROBE_COM/Makefile
 +++ arbsrc_6182/PROBE_COM/Makefile
-@@ -21,13 +21,13 @@
- include AISC/export2sub
+@@ -27,7 +27,7 @@
+ 		@$(MAKE) -r -f AISC/Makefile pregenerate
  
- server.a:	$(MAIN_SOURCE)	$(PRIVATE_SERVER_OBJECTS:.o=.c) $(PUBLIC_SOURCES) $(AISC_DEPENDS)
--		@$(MAKE) -r -f AISC/Makefile
-+		@$(MAKE) -r -f ../AISC/Makefile
- 
- depends:
--		@$(MAKE) -r -f AISC/Makefile pregenerate
-+		@$(MAKE) -r -f ../AISC/Makefile pregenerate
- 
  clean:
 -		@$(MAKE) -r -f AISC/Makefile clean
 +		@$(MAKE) -r -f ../AISC/Makefile clean

Modified: trunk/packages/arb/trunk/debian/patches/30_Makefile_main
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2009-09-07 13:56:33 UTC (rev 3918)
+++ trunk/packages/arb/trunk/debian/patches/30_Makefile_main	2009-09-08 06:39:59 UTC (rev 3919)
@@ -9,12 +9,13 @@
  
  ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_3xx_VERSIONS) $(ALLOWED_GCC_4xx_VERSIONS)
  
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,8 @@
  endif
  
  shared_cflags :=# flags for shared lib compilation
 -lflags :=# linker flags
-+lflags := -Wl,-rpath,/usr/lib/arb/lib # linker flags
++# lflags := -Wl,-rpath,/usr/lib/arb/lib # linker flags
++lflags := -rpath=/usr/lib/arb/lib # linker flags
  extended_warnings :=# warning flags for C and C++-compiler
  extended_cpp_warnings :=# warning flags for C++-compiler only