/[pkgs]/devel/ORBit/ORBit-0.5.17-non-weak-symbols.patch
ViewVC logotype

Contents of /devel/ORBit/ORBit-0.5.17-non-weak-symbols.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Tue Apr 21 10:38:36 2009 UTC (7 months ago) by pghmcfc
Branch: MAIN
CVS Tags: ORBit-0_5_17-28_fc12, ORBit-0_5_17-27_fc12, ORBit-0_5_17-26_fc12, F-12-split, HEAD
File MIME type: text/x-patch 
- Fix undefined non-weak symbols in libORBit and libORBitCosNaming
- Use an alternative approach to rpath-fixing - hacking the supplied libtool
  rather than trying to use the system one
1 diff -ur ORBit-0.5.17.orig/src/Makefile.am ORBit-0.5.17/src/Makefile.am
2 --- ORBit-0.5.17.orig/src/Makefile.am 1999-06-09 22:26:57.000000000 +0100
3 +++ ORBit-0.5.17/src/Makefile.am 2009-04-09 14:51:55.000000000 +0100
4 @@ -1 +1 @@
5 -SUBDIRS=orbit-idl-compiler orb ORBitutil IIOP services daemons
6 +SUBDIRS=orbit-idl-compiler ORBitutil IIOP orb services daemons
7 diff -ur ORBit-0.5.17.orig/src/Makefile.in ORBit-0.5.17/src/Makefile.in
8 --- ORBit-0.5.17.orig/src/Makefile.in 2002-06-06 12:34:43.000000000 +0100
9 +++ ORBit-0.5.17/src/Makefile.in 2009-04-09 14:53:28.000000000 +0100
10 @@ -97,7 +97,7 @@
11 YACC = @YACC@
12 pkglibdir = @pkglibdir@
13
14 -SUBDIRS = orbit-idl-compiler orb ORBitutil IIOP services daemons
15 +SUBDIRS = orbit-idl-compiler ORBitutil IIOP orb services daemons
16 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
17 CONFIG_HEADER = ../config.h
18 CONFIG_CLEAN_FILES =
19 diff -ur ORBit-0.5.17.orig/src/orb/Makefile.am ORBit-0.5.17/src/orb/Makefile.am
20 --- ORBit-0.5.17.orig/src/orb/Makefile.am 2002-06-06 12:07:39.000000000 +0100
21 +++ ORBit-0.5.17/src/orb/Makefile.am 2009-04-09 15:03:50.000000000 +0100
22 @@ -98,7 +98,7 @@
23 $(MAKE) -C $(top_builddir)/src/orbit-idl-compiler
24
25 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
26 -libORBit_la_LIBADD = $(GLIB_LIBS) -lm
27 +libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(GLIB_LIBS) -lm
28
29 BUILT_SOURCES = \
30 orbit.h \
31 diff -ur ORBit-0.5.17.orig/src/orb/Makefile.in ORBit-0.5.17/src/orb/Makefile.in
32 --- ORBit-0.5.17.orig/src/orb/Makefile.in 2002-06-06 12:34:48.000000000 +0100
33 +++ ORBit-0.5.17/src/orb/Makefile.in 2009-04-09 15:03:31.000000000 +0100
34 @@ -116,7 +116,7 @@
35 IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
36
37 libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
38 -libORBit_la_LIBADD = $(GLIB_LIBS) -lm
39 +libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(GLIB_LIBS) -lm
40
41 BUILT_SOURCES = orbit.h interface_repository.h interface_repository-common.c interface_repository-stubs.c
42
43 diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.am ORBit-0.5.17/src/services/name/Makefile.am
44 --- ORBit-0.5.17.orig/src/services/name/Makefile.am 2002-06-06 12:07:45.000000000 +0100
45 +++ ORBit-0.5.17/src/services/name/Makefile.am 2009-04-09 15:08:51.000000000 +0100
46 @@ -18,6 +18,8 @@
47 libORBitCosNaming_la_LDFLAGS = \
48 -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
49
50 +libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
51 +
52 INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@
53
54 IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl
55 diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.in ORBit-0.5.17/src/services/name/Makefile.in
56 --- ORBit-0.5.17.orig/src/services/name/Makefile.in 2002-06-06 12:34:52.000000000 +0100
57 +++ ORBit-0.5.17/src/services/name/Makefile.in 2009-04-09 15:09:48.000000000 +0100
58 @@ -171,7 +171,7 @@
59 AR = ar
60 LTLIBRARIES = $(lib_LTLIBRARIES)
61
62 -libORBitCosNaming_la_LIBADD =
63 +libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
64 libORBitCosNaming_la_OBJECTS = CosNaming-common.lo CosNaming-stubs.lo \
65 LName.lo
66 bin_PROGRAMS = name-client$(EXEEXT) orbit-name-server$(EXEEXT) \
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2