[Pkg-ace-commits] [pkg-ace] r523 - in trunk/debian: . patches
tgg at alioth.debian.org
tgg at alioth.debian.org
Thu Aug 9 20:36:59 UTC 2007
Author: tgg
Date: 2007-08-09 20:36:59 +0000 (Thu, 09 Aug 2007)
New Revision: 523
Added:
trunk/debian/patches/10-autoconf_ACE_HAS_MUTEX_TIMEOUTS_fix.dpatch
trunk/debian/patches/11-autoconf_ACE_LACKS_NAMED_POSIX_SEM_fix.dpatch
trunk/debian/patches/50-prepatch-dummy-mark.dpatch
Removed:
trunk/debian/patches/05-prepatch-dummy-mark.dpatch
Modified:
trunk/debian/changelog
trunk/debian/libtao-orbsvcs-1.5.10.install
trunk/debian/libtao-orbsvcs-dev.install
trunk/debian/patches/00list
trunk/debian/patches/04-reduce-opt.dpatch
trunk/debian/rules
Log:
fix DEB_BUILD_OPTIONS=noopt and two autoconf errors
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-08-08 21:13:35 UTC (rev 522)
+++ trunk/debian/changelog 2007-08-09 20:36:59 UTC (rev 523)
@@ -4,6 +4,8 @@
* Generate .am files instead of patching them; hence drop:
o patches/02-tao-sonames-release-am.dpatch
o tao-sonames-release-am.sh
+ * Reenable IPv6 and enable IPv4/IPv6 migration.
+ * Fix DEB_BUILD_OPTIONS=noopt.
-- Thomas Girard <thomas.g.girard at free.fr> Wed, 08 Aug 2007 22:08:18 +0200
Modified: trunk/debian/libtao-orbsvcs-1.5.10.install
===================================================================
--- trunk/debian/libtao-orbsvcs-1.5.10.install 2007-08-08 21:13:35 UTC (rev 522)
+++ trunk/debian/libtao-orbsvcs-1.5.10.install 2007-08-09 20:36:59 UTC (rev 523)
@@ -11,6 +11,7 @@
usr/lib/libTAO_CosNaming_Skel-*.so
usr/lib/libTAO_CosNaming_Serv-*.so
usr/lib/libTAO_CosNotification-*.so
+usr/lib/libTAO_CosNotification_Persist-*.so
usr/lib/libTAO_CosNotification_Skel-*.so
usr/lib/libTAO_CosNotification_Serv-*.so
usr/lib/libTAO_CosProperty-*.so
Modified: trunk/debian/libtao-orbsvcs-dev.install
===================================================================
--- trunk/debian/libtao-orbsvcs-dev.install 2007-08-08 21:13:35 UTC (rev 522)
+++ trunk/debian/libtao-orbsvcs-dev.install 2007-08-09 20:36:59 UTC (rev 523)
@@ -12,6 +12,7 @@
usr/lib/libTAO_CosNaming_Skel.so
usr/lib/libTAO_CosNaming_Serv.so
usr/lib/libTAO_CosNotification.so
+usr/lib/libTAO_CosNotification_Persist.so
usr/lib/libTAO_CosNotification_Skel.so
usr/lib/libTAO_CosNotification_Serv.so
usr/lib/libTAO_CosProperty.so
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2007-08-08 21:13:35 UTC (rev 522)
+++ trunk/debian/patches/00list 2007-08-09 20:36:59 UTC (rev 523)
@@ -2,11 +2,13 @@
02-fltk-no-gl
02-qt4
03-g++-new-throws
-04-reduce-opt.dpatch
-05-prepatch-dummy-mark
+04-reduce-opt
08-fix-perl-shebang
+10-autoconf_ACE_HAS_MUTEX_TIMEOUTS_fix
+11-autoconf_ACE_LACKS_NAMED_POSIX_SEM_fix
15-fix-fltk-include
34-bts386713
+50-prepatch-dummy-mark
90-patch-mpc-basedir
91-patch-dg-basedir
92-default-ACE_ROOT
Modified: trunk/debian/patches/04-reduce-opt.dpatch
===================================================================
--- trunk/debian/patches/04-reduce-opt.dpatch 2007-08-08 21:13:35 UTC (rev 522)
+++ trunk/debian/patches/04-reduce-opt.dpatch 2007-08-09 20:36:59 UTC (rev 523)
@@ -2,7 +2,7 @@
## 04-reduce-opt.dpatch by Thomas Girard <thomas.g.girard at free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: switch from -O3 to -O2
+## DP: drop -O3 default optimization level
@DPATCH@
--- ACE_wrappers.orig/m4/compiler.m4
@@ -12,7 +12,7 @@
ACE_CXXFLAGS="$ACE_CXXFLAGS"
DCXXFLAGS="$DCXXFLAGS"
- OCXXFLAGS="-O3"
-+ OCXXFLAGS="-O2"
++ OCXXFLAGS=""
fi
;;
esac
Deleted: trunk/debian/patches/05-prepatch-dummy-mark.dpatch
===================================================================
--- trunk/debian/patches/05-prepatch-dummy-mark.dpatch 2007-08-08 21:13:35 UTC (rev 522)
+++ trunk/debian/patches/05-prepatch-dummy-mark.dpatch 2007-08-09 20:36:59 UTC (rev 523)
@@ -1,8 +0,0 @@
-#! /bin/sh -e
-## 05-prepatch-mark-dummy.dpatch by Raphael Bossek <bossekr at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This files does nothing then be a mark for the `autotools'
-## DP: debian/rules's target.
-
-exit 0
Added: trunk/debian/patches/10-autoconf_ACE_HAS_MUTEX_TIMEOUTS_fix.dpatch
===================================================================
--- trunk/debian/patches/10-autoconf_ACE_HAS_MUTEX_TIMEOUTS_fix.dpatch (rev 0)
+++ trunk/debian/patches/10-autoconf_ACE_HAS_MUTEX_TIMEOUTS_fix.dpatch 2007-08-09 20:36:59 UTC (rev 523)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-autoconf_ACE_HAS_MUTEX_TIMEOUTS_fix.dpatch
+##
+## DP: fix pthread_mutex_timedlock detection, taken from CVS
+
+ at DPATCH@
+--- ACE_wrappers.orig/configure.ac
++++ ACE_wrappers/configure.ac
+@@ -7235,6 +7235,7 @@
+ #include <errno.h>
+ #include <sys/time.h>
+
++#include <stdlib.h>
+ #ifndef ACE_LACKS_UNISTD_H
+ # include <unistd.h>
+ #endif
Added: trunk/debian/patches/11-autoconf_ACE_LACKS_NAMED_POSIX_SEM_fix.dpatch
===================================================================
--- trunk/debian/patches/11-autoconf_ACE_LACKS_NAMED_POSIX_SEM_fix.dpatch (rev 0)
+++ trunk/debian/patches/11-autoconf_ACE_LACKS_NAMED_POSIX_SEM_fix.dpatch 2007-08-09 20:36:59 UTC (rev 523)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11-autoconf_ACE_LACKS_NAMED_POSIX_SEM_fix.dpatch
+##
+## DP: do not fail if the sem_open test is run twice
+
+ at DPATCH@
+--- ACE_wrappers.orig/configure.ac
++++ ACE_wrappers/configure.ac
+@@ -4313,6 +4313,9 @@
+ if (sem_close (s) != 0)
+ return -1; /* Something went wrong! */
+
++ /* ignore error here */
++ sem_unlink("ace_semaphore_foo");
++
+ return 0;
+ }
+ ]])],[
Copied: trunk/debian/patches/50-prepatch-dummy-mark.dpatch (from rev 522, trunk/debian/patches/05-prepatch-dummy-mark.dpatch)
===================================================================
--- trunk/debian/patches/50-prepatch-dummy-mark.dpatch (rev 0)
+++ trunk/debian/patches/50-prepatch-dummy-mark.dpatch 2007-08-09 20:36:59 UTC (rev 523)
@@ -0,0 +1,8 @@
+#! /bin/sh -e
+## 50-prepatch-mark-dummy.dpatch by Raphael Bossek <bossekr at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This files does nothing then be a mark for the `autotools'
+## DP: debian/rules's target.
+
+exit 0
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2007-08-08 21:13:35 UTC (rev 522)
+++ trunk/debian/rules 2007-08-09 20:36:59 UTC (rev 523)
@@ -45,8 +45,7 @@
# This dpatch is only a place holder. The `prepatch' targets stops
# here by default.
-PREPATCH_MARK := 05-prepatch-dummy-mark.dpatch
-POSTPATCH_MARK := 06-bootstrap.dpatch
+PREPATCH_MARK := 50-prepatch-dummy-mark.dpatch
UNTIL := $(PREPATCH_MARK)
# Where we install every file before calling dh_install
@@ -98,7 +97,9 @@
dpatch unpatch
rm -f $<
-# TODO: DEB_BUILD_OPTIONS broken now
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CXXFLAGS+=-O2
+endif
autotools-stamp: prepatch-stamp
cd $(ACE_ROOT) && bin/bootstrap
@@ -242,7 +243,7 @@
--enable-fl-reactor --enable-qt-reactor --enable-xt-reactor \
--enable-tk-reactor --with-tclconfig=$(TCL_HOME) --with-tkconfig=$(TK_HOME) \
--with-zlib --with-zzip \
- --disable-ipv6 \
+ --enable-ipv6 --enable-ipv4-ipv6 \
--enable-inline --enable-probe \
--disable-symbol-visibility \
--enable-ace-reactor-notification-queue
More information about the Pkg-ace-commits
mailing list