[Pkg-ace-commits] [pkg-ace] r534 - in trunk/debian: . patches
tgg at alioth.debian.org
tgg at alioth.debian.org
Tue Nov 6 22:32:16 UTC 2007
Author: tgg
Date: 2007-11-06 22:32:16 +0000 (Tue, 06 Nov 2007)
New Revision: 534
Added:
trunk/debian/patches/05-5.6-compat.dpatch
trunk/debian/patches/06-revert-mpc-kokyu-change.dpatch
Modified:
trunk/debian/changelog
trunk/debian/patches/00list
trunk/debian/rules
Log:
enable symbol visibility, revert an ABI change and a problem with Kokyu.
The ABI change has to be checked:
virtual CosNotifyChannelAdmin::EventChannelFactory_ptr,
create (PortableServer::POA_ptr default_POA, const char* factory_name)
=> virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create(
PortableServer::POA_ptr default_POA,
const char* factory_name = "EventChannelFactory")
I'm no longer sure this breaks ABI. I'll have to try on a simple program.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-11-06 21:51:12 UTC (rev 533)
+++ trunk/debian/changelog 2007-11-06 22:32:16 UTC (rev 534)
@@ -7,8 +7,10 @@
* Reenable IPv6 and enable IPv4/IPv6 migration.
* Fix DEB_BUILD_OPTIONS=noopt.
* Add zlib1g-dev and libzzip-dev build dependencies.
+ * New patch, 05-5.6-compat.dpatch, to be ABI compatible with ACE 5.6
+ * Enable symbol visibility.
- -- Thomas Girard <thomas.g.girard at free.fr> Tue, 06 Nov 2007 10:01:00 +0000
+ -- Thomas Girard <thomas.g.girard at free.fr> Tue, 06 Nov 2007 19:52:37 +0100
ace (5.5.9-1) experimental; urgency=low
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2007-11-06 21:51:12 UTC (rev 533)
+++ trunk/debian/patches/00list 2007-11-06 22:32:16 UTC (rev 534)
@@ -2,6 +2,8 @@
02-fltk-no-gl
02-qt4
04-reduce-opt
+05-5.6-compat.dpatch
+06-revert-mpc-kokyu-change.dpatch
08-fix-perl-shebang
12-autoconf-ACE_HAS_POSIX_SEM_TIMEOUT_test
15-fix-fltk-include
Added: trunk/debian/patches/05-5.6-compat.dpatch
===================================================================
--- trunk/debian/patches/05-5.6-compat.dpatch (rev 0)
+++ trunk/debian/patches/05-5.6-compat.dpatch 2007-11-06 22:32:16 UTC (rev 534)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-5.6-compat.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: make ACE+TAO+CIAO x.6.1 ABI compatible with ACE+TAO+CIAO x.6
+
+ at DPATCH@
+--- ACE_wrappers.orig/configure.ac
++++ ACE_wrappers/configure.ac
+@@ -148,7 +148,7 @@
+ ACE_MAJOR=$2
+ ACE_MINOR=$3
+ ACE_BETA=$4
+-ACE_VERSION_NAME=ACE_VERSION
++ACE_VERSION_NAME=5.6
+
+ AC_SUBST([ACE_MAJOR])
+ AC_SUBST([ACE_MINOR])
+--- ACE_wrappers.orig/TAO/MPC/config/taodefaults.mpb
++++ ACE_wrappers/TAO/MPC/config/taodefaults.mpb
+@@ -7,7 +7,7 @@
+ libpaths += $(ACE_ROOT)/lib
+
+ specific(automake) {
+- am_release = @TAO_VERSION_NAME@
++ am_release = @TAO_MAJOR at .@TAO_MINOR@
+ includes += $(TAO_BUILDDIR)
+ libpaths -= $(ACE_ROOT)/lib
+ }
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+@@ -59,9 +59,8 @@
+ CosNotifyChannelAdmin::EventChannelFactory_ptr factory);
+
+ /// Create the Channel Factory.
+- virtual CosNotifyChannelAdmin::EventChannelFactory_ptr create (
+- PortableServer::POA_ptr default_POA,
+- const char* factory_name = "EventChannelFactory");
++ virtual CosNotifyChannelAdmin::EventChannelFactory_ptr
++ create (PortableServer::POA_ptr default_POA, const char* factory_name);
+
+ /// Called by the factory when it is destroyed.
+ virtual void remove (TAO_Notify_EventChannelFactory* ecf);
Added: trunk/debian/patches/06-revert-mpc-kokyu-change.dpatch
===================================================================
--- trunk/debian/patches/06-revert-mpc-kokyu-change.dpatch (rev 0)
+++ trunk/debian/patches/06-revert-mpc-kokyu-change.dpatch 2007-11-06 22:32:16 UTC (rev 534)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06-revert-mpc-kokyu-change.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: revert changeset 79309 that broke Kokyu library search path
+
+ at DPATCH@
+--- ACE_wrappers.orig/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
++++ ACE_wrappers/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
+@@ -114,8 +114,8 @@
+ my($reldir) = shift;
+ my($libname) = shift;
+
+- if ($libname =~ /^lib(ace)/i) {
+- if (!defined $reldir || $reldir eq '') {
++ if ($libname =~ /^lib(ace|kokyu\.)/i) {
++ if (!defined $reldir) {
+ if (defined $libdirs{$libname}) {
+ $reldir = $libdirs{$libname};
+ }
+@@ -126,18 +126,6 @@
+ $str =~ s!$libname!\$(ACE_BUILDDIR)/$reldir/$libname!;
+ return $str;
+ }
+- elsif ($libname =~ /^lib(kokyu\.)/i) {
+- if (!defined $reldir || $reldir eq '') {
+- if (defined $libdirs{$libname}) {
+- $reldir = $libdirs{$libname};
+- }
+- else {
+- $reldir = 'Kokyu';
+- }
+- }
+- $str =~ s!$libname!\$(top_builddir)/$reldir/$libname!;
+- return $str;
+- }
+ elsif ($libname =~ /^lib(tao|kokyu)/i) {
+ if (defined $reldir) {
+ $reldir =~ s!TAO/!!;
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2007-11-06 21:51:12 UTC (rev 533)
+++ trunk/debian/rules 2007-11-06 22:32:16 UTC (rev 534)
@@ -40,6 +40,7 @@
endif
export ACE_ROOT := $(shell pwd)/$(ACE_SUBDIR)
export TAO_ROOT := $(ACE_ROOT)/TAO
+export CIAO_ROOT := $(TAO_ROOT)/CIAO
export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
export QTDIR := /usr/share/qt4
@@ -144,6 +145,12 @@
$(MAKE) -C objdir install DESTDIR=$(CURDIR)/$(DT)
+# TEMPORARY: rename all lib*-1.6.so to lib*-1.6.1.so, then make a symlink
+ cd $(CURDIR)/$(DT)/usr/lib && for i in lib*-1.6.so ; do \
+ mv $$i $${i%-1.6.so}-1.6.1.so ; \
+ ln -s $${i%-1.6.so}-1.6.1.so $$i ; \
+ done
+
# Rename gperf to gperf-ace
mv $(DT)/usr/bin/gperf $(DT)/usr/bin/gperf-ace
@@ -245,7 +252,7 @@
--with-zlib --with-zzip \
--enable-ipv6 --enable-ipv4-ipv6 \
--enable-inline --enable-probe \
- --disable-symbol-visibility \
+ --enable-symbol-visibility \
--enable-ace-reactor-notification-queue
echo '#define ACE_GPERF "gperf-ace"' >> objdir/ace/config.h
echo '#define TAO_IDL_INCLUDE_DIR "/usr/include/tao"' >> objdir/ace/config.h
More information about the Pkg-ace-commits
mailing list