rpms/ORBit/devel ORBit-0.5.17-non-weak-symbols.patch, NONE, 1.1 ORBit.spec, 1.9, 1.10
Paul Howarth
pghmcfc at fedoraproject.org
Tue Apr 21 10:38:38 UTC 2009
Author: pghmcfc
Update of /cvs/pkgs/rpms/ORBit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9497
Modified Files:
ORBit.spec
Added Files:
ORBit-0.5.17-non-weak-symbols.patch
Log Message:
- 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
ORBit-0.5.17-non-weak-symbols.patch:
--- NEW FILE ORBit-0.5.17-non-weak-symbols.patch ---
diff -ur ORBit-0.5.17.orig/src/Makefile.am ORBit-0.5.17/src/Makefile.am
--- ORBit-0.5.17.orig/src/Makefile.am 1999-06-09 22:26:57.000000000 +0100
+++ ORBit-0.5.17/src/Makefile.am 2009-04-09 14:51:55.000000000 +0100
@@ -1 +1 @@
-SUBDIRS=orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS=orbit-idl-compiler ORBitutil IIOP orb services daemons
diff -ur ORBit-0.5.17.orig/src/Makefile.in ORBit-0.5.17/src/Makefile.in
--- ORBit-0.5.17.orig/src/Makefile.in 2002-06-06 12:34:43.000000000 +0100
+++ ORBit-0.5.17/src/Makefile.in 2009-04-09 14:53:28.000000000 +0100
@@ -97,7 +97,7 @@
YACC = @YACC@
pkglibdir = @pkglibdir@
-SUBDIRS = orbit-idl-compiler orb ORBitutil IIOP services daemons
+SUBDIRS = orbit-idl-compiler ORBitutil IIOP orb services daemons
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
diff -ur ORBit-0.5.17.orig/src/orb/Makefile.am ORBit-0.5.17/src/orb/Makefile.am
--- ORBit-0.5.17.orig/src/orb/Makefile.am 2002-06-06 12:07:39.000000000 +0100
+++ ORBit-0.5.17/src/orb/Makefile.am 2009-04-09 15:03:50.000000000 +0100
@@ -98,7 +98,7 @@
$(MAKE) -C $(top_builddir)/src/orbit-idl-compiler
libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(GLIB_LIBS) -lm
BUILT_SOURCES = \
orbit.h \
diff -ur ORBit-0.5.17.orig/src/orb/Makefile.in ORBit-0.5.17/src/orb/Makefile.in
--- ORBit-0.5.17.orig/src/orb/Makefile.in 2002-06-06 12:34:48.000000000 +0100
+++ ORBit-0.5.17/src/orb/Makefile.in 2009-04-09 15:03:31.000000000 +0100
@@ -116,7 +116,7 @@
IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+libORBit_la_LIBADD = $(top_builddir)/src/IIOP/libIIOP.la $(top_builddir)/src/ORBitutil/libORBitutil.la $(GLIB_LIBS) -lm
BUILT_SOURCES = orbit.h interface_repository.h interface_repository-common.c interface_repository-stubs.c
diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.am ORBit-0.5.17/src/services/name/Makefile.am
--- ORBit-0.5.17.orig/src/services/name/Makefile.am 2002-06-06 12:07:45.000000000 +0100
+++ ORBit-0.5.17/src/services/name/Makefile.am 2009-04-09 15:08:51.000000000 +0100
@@ -18,6 +18,8 @@
libORBitCosNaming_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
+
INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@
IDL = $(top_builddir)/src/orbit-idl-compiler/orbit-idl
diff -ur ORBit-0.5.17.orig/src/services/name/Makefile.in ORBit-0.5.17/src/services/name/Makefile.in
--- ORBit-0.5.17.orig/src/services/name/Makefile.in 2002-06-06 12:34:52.000000000 +0100
+++ ORBit-0.5.17/src/services/name/Makefile.in 2009-04-09 15:09:48.000000000 +0100
@@ -171,7 +171,7 @@
AR = ar
LTLIBRARIES = $(lib_LTLIBRARIES)
-libORBitCosNaming_la_LIBADD =
+libORBitCosNaming_la_LIBADD = $(top_builddir)/src/orb/libORBit.la $(top_builddir)/src/IIOP/libIIOP.la
libORBitCosNaming_la_OBJECTS = CosNaming-common.lo CosNaming-stubs.lo \
LName.lo
bin_PROGRAMS = name-client$(EXEEXT) orbit-name-server$(EXEEXT) \
Index: ORBit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ORBit/devel/ORBit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ORBit.spec 24 Feb 2009 10:02:02 -0000 1.9
+++ ORBit.spec 21 Apr 2009 10:38:36 -0000 1.10
@@ -1,7 +1,7 @@
Summary: CORBA Object Request Broker for GNOME-1 compatibility
Name: ORBit
Version: 0.5.17
-Release: 25%{?dist}
+Release: 26%{?dist}
Epoch: 1
URL: http://orbit-resource.sourceforge.net/
Source: http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2
@@ -9,6 +9,7 @@
Patch1: ORBit-underquoted.patch
Patch2: ORBit-0.5.17-IIOP-weak-symbols.patch
Patch3: ORBit-0.5.17-multiarch.patch
+Patch4: ORBit-0.5.17-non-weak-symbols.patch
Group: System Environment/Daemons
License: LGPLv2+ and GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,7 +19,7 @@
# Using system popt library would be highly likely to introduce regressions in this
# ancient piece of legacy code.
%if 0%{?fedora} > 10
-BuildRequires: glibc-static
+BuildRequires: glibc-static%{?_isa}
%endif
Requires(post): /sbin/install-info
@@ -57,17 +58,22 @@
%setup -q
%patch0 -p1 -b .aligned
%patch1 -p1 -b .underquoted
-%patch2 -p1 -b .weak-symbols
+%patch2 -p1 -b .iiop-non-weak-symbols
%patch3 -p1 -b .multiarch
+%patch4 -p1 -b .non-weak-symbols
%build
%configure
+
+# Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
# %{?_smp_mflags} removed at release 1:0.5.17-10.2
-%{__make} LIBTOOL=/usr/bin/libtool
+%{__make}
%install
%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" LIBTOOL=/usr/bin/libtool install
+%{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
# remove unpackaged files
%{__rm} -f %{buildroot}%{_bindir}/ior-decode
@@ -131,9 +137,14 @@
%{_datadir}/aclocal/libIDL.m4
%changelog
+* Thu Apr 9 2009 Paul Howarth <paul at city-fan.org> 1:0.5.17-26
+- 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
+
* Tue Feb 24 2009 Paul Howarth <paul at city-fan.org> 1:0.5.17-25
- Specify Instruction Set Architecture (%%{?_isa}) in devel package requires
-- Buildreq glibc-static for test code in bundled popt library
+- Buildreq glibc-static for test code in bundled popt library (F-11 onwards)
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.5.17-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the scm-commits
mailing list