[med-svn] r3910 - trunk/packages/arb/trunk/debian/patches
Andreas Tille
tille at alioth.debian.org
Mon Sep 7 11:42:59 UTC 2009
Author: tille
Date: 2009-09-07 11:42:59 +0000 (Mon, 07 Sep 2009)
New Revision: 3910
Modified:
trunk/packages/arb/trunk/debian/patches/20_Makefiles
trunk/packages/arb/trunk/debian/patches/30_Makefile_main
Log:
Updated patches to new version
Modified: trunk/packages/arb/trunk/debian/patches/20_Makefiles
===================================================================
--- trunk/packages/arb/trunk/debian/patches/20_Makefiles 2009-09-07 11:26:29 UTC (rev 3909)
+++ trunk/packages/arb/trunk/debian/patches/20_Makefiles 2009-09-07 11:42:59 UTC (rev 3910)
@@ -1,5 +1,5 @@
---- arb-0.0.20071207.1.orig/ARBDB2/Makefile
-+++ arb-0.0.20071207.1/ARBDB2/Makefile
+--- arbsrc_6182.orig/ARBDB2/Makefile
++++ arbsrc_6182/ARBDB2/Makefile
@@ -1,7 +1,11 @@
# INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
.SUFFIXES: .o .c .depend
@@ -13,8 +13,8 @@
ACC_OBJECTS = $(GB_O) $(GB_T) $(GB_X)
---- arb-0.0.20071207.1.orig/ARBDBS/Makefile
-+++ arb-0.0.20071207.1/ARBDBS/Makefile
+--- arbsrc_6182.orig/ARBDBS/Makefile
++++ arbsrc_6182/ARBDBS/Makefile
@@ -1,7 +1,11 @@
# INCLUDE und GLOBALS MAIN CC cflags werden von aussen uebergeben
.SUFFIXES: .o .c .cxx .depend
@@ -28,36 +28,41 @@
OBJECTS = $(GB_O) $(GB_T) $(GB_PP) $(GB_X)
---- arb-0.0.20071207.1.orig/NAMES_COM/Makefile
-+++ arb-0.0.20071207.1/NAMES_COM/Makefile
-@@ -27,7 +27,7 @@
- # $(MAKE) -r -f AISC/Makefile depends
+--- arbsrc_6182.orig/NAMES_COM/Makefile
++++ arbsrc_6182/NAMES_COM/Makefile
+@@ -21,13 +21,13 @@
+ include AISC/export2sub
+ 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) $(makeflags) -f AISC/Makefile clean
-+ $(MAKE) $(makeflags) -f ../AISC/Makefile clean
+- @$(MAKE) -r -f AISC/Makefile clean
++ @$(MAKE) -r -f ../AISC/Makefile clean
# DO NOT DELETE
---- arb-0.0.20071207.1.orig/ORS_COM/Makefile
-+++ arb-0.0.20071207.1/ORS_COM/Makefile
-@@ -28,7 +28,7 @@
- # @echo "no automatic dependencies for ORS_COM - skipped"
+--- arbsrc_6182.orig/PROBE_COM/Makefile
++++ arbsrc_6182/PROBE_COM/Makefile
+@@ -21,13 +21,13 @@
+ include AISC/export2sub
- clean:
-- $(MAKE) $(makeflags) -f AISC/Makefile clean
-+ $(MAKE) $(makeflags) -f ../AISC/Makefile clean
+ server.a: $(MAIN_SOURCE) $(PRIVATE_SERVER_OBJECTS:.o=.c) $(PUBLIC_SOURCES) $(AISC_DEPENDS)
+- @$(MAKE) -r -f AISC/Makefile
++ @$(MAKE) -r -f ../AISC/Makefile
- # DO NOT DELETE
+ depends:
+- @$(MAKE) -r -f AISC/Makefile pregenerate
++ @$(MAKE) -r -f ../AISC/Makefile pregenerate
---- arb-0.0.20071207.1.orig/PROBE_COM/Makefile
-+++ arb-0.0.20071207.1/PROBE_COM/Makefile
-@@ -30,7 +30,7 @@
- # @echo "no automatic dependencies for PROBE_COM - skipped"
-
clean:
-- $(MAKE) $(makeflags) -f AISC/Makefile clean
-+ $(MAKE) $(makeflags) -f ../AISC/Makefile clean
+- @$(MAKE) -r -f AISC/Makefile clean
++ @$(MAKE) -r -f ../AISC/Makefile clean
# DO NOT DELETE
Modified: trunk/packages/arb/trunk/debian/patches/30_Makefile_main
===================================================================
--- trunk/packages/arb/trunk/debian/patches/30_Makefile_main 2009-09-07 11:26:29 UTC (rev 3909)
+++ trunk/packages/arb/trunk/debian/patches/30_Makefile_main 2009-09-07 11:42:59 UTC (rev 3910)
@@ -1,28 +1,11 @@
---- arb-0.0.20071207.1.orig/Makefile
-+++ arb-0.0.20071207.1/Makefile
-@@ -76,7 +76,7 @@
- # cflags = -O2 $(dflag1) $(dflags) $(DEVEL_DEF)
- # cflags = -O4 $(dflag1) $(dflags) $(DEVEL_DEF)
+--- arbsrc_6182.orig/Makefile
++++ arbsrc_6182/Makefile
+@@ -85,7 +85,7 @@
+ endif
-- lflags = $(dflag1)
-+ lflags = $(dflag1) $(lflags)
- fflags = $(dflag1) -C
- extended_warnings = -Wwrite-strings -Wunused -Wno-aggregate-return -Wshadow
- extended_cpp_warnings = -Wnon-virtual-dtor -Wreorder -Wpointer-arith
-@@ -109,7 +109,7 @@
+ shared_cflags :=# flags for shared lib compilation
+-lflags :=# linker flags
++lflags := -Wl,-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
- ALLOWED_GCC_295_VERSIONS=2.95.3
- ALLOWED_GCC_3xx_VERSIONS=3.2 3.3.1 3.3.3 3.3.4 3.3.5 3.3.6 3.4.0 3.4.2 3.4.3
--ALLOWED_GCC_4xx_VERSIONS=4.0.0 4.0.2 4.0.3 4.1.1 4.1.2 4.1.3 4.2.0 4.2.1 4.2.3
-+ALLOWED_GCC_4xx_VERSIONS=4.0.0 4.0.2 4.0.3 4.1.1 4.1.2 4.1.3 4.2.0 4.2.1 4.2.3 4.3.1 4.3.2 4.3.3
- ALLOWED_GCC_VERSIONS=$(ALLOWED_GCC_295_VERSIONS) $(ALLOWED_GCC_3xx_VERSIONS) $(ALLOWED_GCC_4xx_VERSIONS)
-
- GCC_VERSION_FOUND=$(shell $(GCC) -dumpversion)
-@@ -133,6 +133,7 @@
-
- ifdef DEBIAN
- XHOME = /usr/X11R6
-+ lflags = -Wl,-rpath,/usr/lib/arb/lib
- else
- XHOME = /usr/X11
- endif
More information about the debian-med-commit
mailing list