[Pkg-ace-commits] [pkg-ace] r579 - in trunk/debian: . patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2008-04-02 11:25:01 +0000 (Wed, 02 Apr 2008)
New Revision: 579

Added:
   trunk/debian/patches/18-fix-bswap-detection.dpatch
Modified:
   trunk/debian/patches/00list
   trunk/debian/rules
Log:
add patch from SVN to fix bswap detection


Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-04-01 18:00:23 UTC (rev 578)
+++ trunk/debian/patches/00list	2008-04-02 11:25:01 UTC (rev 579)
@@ -13,6 +13,7 @@
 14-autoconf-tao
 15-fix-fltk-include
 17-protect-mpc-path
+18-fix-bswap-detection
 34-bts386713
 50-prepatch-dummy-mark
 90-patch-mpc-basedir

Added: trunk/debian/patches/18-fix-bswap-detection.dpatch
===================================================================
--- trunk/debian/patches/18-fix-bswap-detection.dpatch	                        (rev 0)
+++ trunk/debian/patches/18-fix-bswap-detection.dpatch	2008-04-02 11:25:01 UTC (rev 579)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18-fix-bswap-detection.dpatch by Thomas Girard <thomas.g.girard at free.fr>
+##
+## DP: taken from upstream: fix bswap autoconf detection
+ at DPATCH@
+--- ACE_wrappers.orig/configure.ac
++++ ACE_wrappers/configure.ac
+@@ -3445,15 +3445,24 @@
+ 
+ ACE_CHECK_HAS_DEFINES([bswap16])
+ if test "$ace_cv_defined_bswap16" = no; then
+-  ACE_CHECK_HAS_DEFINES([bswap_16])
++  ACE_CHECK_HAS_DEFINES([bswap_16],[],[],[
++#if ACE_HAS_BYTESWAP_H
++#include <byteswap.h>
++#endif])
+ fi
+ ACE_CHECK_HAS_DEFINES([bswap32])
+ if test "$ace_cv_defined_bswap32" = no; then
+-  ACE_CHECK_HAS_DEFINES([bswap_32])
++  ACE_CHECK_HAS_DEFINES([bswap_32],[],[],[
++#if ACE_HAS_BYTESWAP_H
++#include <byteswap.h>
++#endif])
+ fi
+ ACE_CHECK_HAS_DEFINES([bswap64])
+ if test "$ace_cv_defined_bswap64" = no; then
+-  ACE_CHECK_HAS_DEFINES([bswap_64])
++  ACE_CHECK_HAS_DEFINES([bswap_64],[],[],[
++#if ACE_HAS_BYTESWAP_H
++#include <byteswap.h>
++#endif])
+ fi
+ 
+ ACE_CHECK_LACKS_FUNCS(chdir)


Property changes on: trunk/debian/patches/18-fix-bswap-detection.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-04-01 18:00:23 UTC (rev 578)
+++ trunk/debian/rules	2008-04-02 11:25:01 UTC (rev 579)
@@ -258,11 +258,6 @@
 	echo '#define ACE_GPERF "gperf-ace"' >> $(CONFIG)
 	echo '#define TAO_IDL_INCLUDE_DIR "/usr/include/tao"' >> $(CONFIG)
 
-#	To remove once the autoconf macros are fixed, see bz#3134
-	for i in 16 32 64 ; do \
-		echo "#define ACE_HAS_BSWAP_$$i" >> $(CONFIG) ; \
-	done
-
 	# bz#3138
 	echo "#define ACE_HAS_RECURSIVE_MUTEXES" >> $(CONFIG)