- adapted to version 2.5.0

Changed files:
    ORBit2-pthread.patch -> 1.2

diff --git a/ORBit2-pthread.patch b/ORBit2-pthread.patch
index 350581d556c87c24535e4b8df552481042ee2f99..1798634ec29f75415fb960ceb40a3e7ada1046e3 100644 (file)
--- a/ORBit2-pthread.patch
+++ b/ORBit2-pthread.patch
@@ -1,48 +1,48 @@
-diff -Nru ORBit2-2.4.3.orig/test/Makefile.am ORBit2-2.4.3/test/Makefile.am
---- ORBit2-2.4.3.orig/test/Makefile.am Fri Jun 21 15:59:38 2002
-+++ ORBit2-2.4.3/test/Makefile.am      Thu Oct 10 11:10:33 2002
+diff -urN ORBit2-2.5.0.orig/test/Makefile.am ORBit2-2.5.0/test/Makefile.am
+--- ORBit2-2.5.0.orig/test/Makefile.am Sat Oct 19 10:25:57 2002
++++ ORBit2-2.5.0/test/Makefile.am      Sat Oct 19 10:29:03 2002
 @@ -18,7 +18,7 @@
  
  TESTS = test-dynany test-mem test-performance test-giop
  
--LDADD = $(top_builddir)/src/orb/libORBit-2.la
-+LDADD = $(top_builddir)/src/orb/libORBit-2.la -lpthread
+-LDADD = $(top_builddir)/src/orb/libORBit-2.la $(ORBIT_LIBS)
++LDADD = $(top_builddir)/src/orb/libORBit-2.la $(ORBIT_LIBS) -lpthread
  
  test_mem_SOURCES=test-mem.c
  
-diff -Nru ORBit2-2.4.3.orig/test/everything/Makefile.am ORBit2-2.4.3/test/everything/Makefile.am
---- ORBit2-2.4.3.orig/test/everything/Makefile.am      Thu Jun 13 14:49:55 2002
-+++ ORBit2-2.4.3/test/everything/Makefile.am   Thu Oct 10 11:10:52 2002
-@@ -24,7 +24,7 @@
- #     -DORBIT_STUB_DEBUG_LOCAL
- 
- LDADD = $(top_builddir)/src/orb/libORBit-2.la         \
+diff -urN ORBit2-2.5.0.orig/test/everything/Makefile.am ORBit2-2.5.0/test/everything/Makefile.am
+--- ORBit2-2.5.0.orig/test/everything/Makefile.am      Sat Oct 19 10:25:57 2002
++++ ORBit2-2.5.0/test/everything/Makefile.am   Sat Oct 19 10:29:57 2002
+@@ -28,7 +28,7 @@
+ LDADD = $(top_builddir)/src/orb/libORBit-2.la                         \
+       $(top_builddir)/src/services/imodule/libORBit-imodule-2.la      \
+       $(ORBIT_IDL_LIBS)                                               \
 -      $(ORBIT_LIBS)
 +      $(ORBIT_LIBS) -lpthread
  
  #  -lefence
  
-diff -Nru ORBit2-2.4.3.orig/test/inhibit/Makefile.am ORBit2-2.4.3/test/inhibit/Makefile.am
---- ORBit2-2.4.3.orig/test/inhibit/Makefile.am Mon Aug  5 13:30:26 2002
-+++ ORBit2-2.4.3/test/inhibit/Makefile.am      Thu Oct 10 10:53:00 2002
+diff -urN ORBit2-2.5.0.orig/test/inhibit/Makefile.am ORBit2-2.5.0/test/inhibit/Makefile.am
+--- ORBit2-2.5.0.orig/test/inhibit/Makefile.am Sat Oct 19 10:25:57 2002
++++ ORBit2-2.5.0/test/inhibit/Makefile.am      Sat Oct 19 10:30:15 2002
 @@ -7,7 +7,7 @@
        $(WARN_CFLAGS)               \
        $(ORBIT_CFLAGS)
  
--LDADD = $(top_builddir)/src/orb/libORBit-2.la
-+LDADD = $(top_builddir)/src/orb/libORBit-2.la -lpthread
+-LDADD = $(top_builddir)/src/orb/libORBit-2.la $(ORBIT_LIBS)
++LDADD = $(top_builddir)/src/orb/libORBit-2.la $(ORBIT_LIBS) -lpthread
  
  FOO_IDLOUT=foo.h foo-stubs.c foo-skels.c foo-common.c
  BAA_IDLOUT=baa.h baa-stubs.c baa-skels.c baa-common.c
-diff -Nru ORBit2-2.4.3.orig/test/poa/Makefile.am ORBit2-2.4.3/test/poa/Makefile.am
---- ORBit2-2.4.3.orig/test/poa/Makefile.am     Sun Nov 18 22:28:32 2001
-+++ ORBit2-2.4.3/test/poa/Makefile.am  Thu Oct 10 11:10:43 2002
+diff -urN ORBit2-2.5.0.orig/test/poa/Makefile.am ORBit2-2.5.0/test/poa/Makefile.am
+--- ORBit2-2.5.0.orig/test/poa/Makefile.am     Sat Oct 19 10:25:57 2002
++++ ORBit2-2.5.0/test/poa/Makefile.am  Sat Oct 19 10:30:40 2002
 @@ -30,7 +30,7 @@
  
  check_PROGRAMS = $(TESTS)
  
--LDADD = $(top_builddir)/src/orb/libORBit-2.la
-+LDADD = $(top_builddir)/src/orb/libORBit-2.la -lpthread
+-LDADD = $(top_builddir)/src/orb/libORBit-2.la $(ORBIT_LIBS)
++LDADD = $(top_builddir)/src/orb/libORBit-2.la $(ORBIT_LIBS) -lpthread
  
  POATEST_IDLOUT = poatest.h poatest-common.c poatest-skels.c poatest-stubs.c