[Pkg-mysql-commits] r952 - branches/sid-5.1/debian

[Christian Hammers]

tags 29791 pending
thanks

Author: ch
Date: 2007-10-10 01:18:15 +0000 (Wed, 10 Oct 2007)
New Revision: 952

Added:
   branches/sid-5.1/debian/libndbclient3.dirs
   branches/sid-5.1/debian/libndbclient3.files
Modified:
   branches/sid-5.1/debian/changelog
   branches/sid-5.1/debian/control
   branches/sid-5.1/debian/rules
Log:
  * Moved libndbclient.so.3 to its own package as it now has a version != 0
    (thanks to Raphael Pinson for reminding me).



Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog	2007-10-10 01:14:49 UTC (rev 951)
+++ branches/sid-5.1/debian/changelog	2007-10-10 01:18:15 UTC (rev 952)
@@ -1,3 +1,14 @@
+mysql-dfsg-5.1 (5.1.22rc-2) experimental; urgency=low
+
+  * Added PIC support for NDB libraries on amd64 (thanks to Monty Taylor).
+    Closes: #29791
+  * Added extra information when aborting due to a detected downgrade (thanks
+    to Raphael Pinson).
+  * Moved libndbclient.so.3 to its own package as it now has a version != 0
+    (thanks to Raphael Pinson for reminding me).
+
+ -- Christian Hammers <ch at debian.org>  Tue, 10 Oct 2007 03:13:07 +0200
+
 mysql-dfsg-5.1 (5.1.22rc-1) experimental; urgency=low
 
   * New upstream version.

Modified: branches/sid-5.1/debian/control
===================================================================
--- branches/sid-5.1/debian/control	2007-10-10 01:14:49 UTC (rev 951)
+++ branches/sid-5.1/debian/control	2007-10-10 01:18:15 UTC (rev 952)
@@ -18,6 +18,19 @@
  .
  This package includes the client library.
 
+Package: libndbclient3
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: MySQL NDB-cluster client library
+ MySQL is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MySQL are speed, robustness and
+ ease of use.
+ .
+ This package includes the client library for the NDB cluster. 
+ The corresponding header files are in libmysqlclient-dev.
+
 Package: libmysqlclient15-dev
 Architecture: all
 Section: libdevel

Added: branches/sid-5.1/debian/libndbclient3.dirs
===================================================================
--- branches/sid-5.1/debian/libndbclient3.dirs	                        (rev 0)
+++ branches/sid-5.1/debian/libndbclient3.dirs	2007-10-10 01:18:15 UTC (rev 952)
@@ -0,0 +1 @@
+usr/lib/

Added: branches/sid-5.1/debian/libndbclient3.files
===================================================================
--- branches/sid-5.1/debian/libndbclient3.files	                        (rev 0)
+++ branches/sid-5.1/debian/libndbclient3.files	2007-10-10 01:18:15 UTC (rev 952)
@@ -0,0 +1 @@
+usr/lib/libndbclient*.so.*

Modified: branches/sid-5.1/debian/rules
===================================================================
--- branches/sid-5.1/debian/rules	2007-10-10 01:14:49 UTC (rev 951)
+++ branches/sid-5.1/debian/rules	2007-10-10 01:18:15 UTC (rev 952)
@@ -37,6 +37,11 @@
 #     FNO_EXCEPTIONS=-fno-exceptions
 #   endif
 
+ifeq ($(findstring $(ARCH), amd64),$(ARCH))
+	FORCE_FPIC_CFLAGS=-fPIC
+	FORCE_FPIC=--with-pic --with-ndb-ccflags="-fPIC" --with-lib-ccflags="-fPIC"
+endif
+
 # This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf
 # so it is disabled by default although, according to MySQL, it brings >10%
 # performance gain if enabled. See #299382.
@@ -55,9 +60,9 @@
 
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
-	    	CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O3 -DBIG_JOINS=1"} \
+	    	CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O3 -DBIG_JOINS=1 ${FORCE_FPIC_CFLAGS}"} \
 	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
-	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti"} \
+	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS}"} \
 	    ./configure \
 		--build=${DEB_BUILD_GNU_TYPE} \
 		--host=${DEB_HOST_GNU_TYPE} \
@@ -79,6 +84,7 @@
 		--enable-thread-safe-client \
 	        $(USE_ASSEMBLER) \
 		--enable-local-infile \
+		$(FORCE_FPIC) \
 		--with-pstack \
 		--with-fast-mutexes \
                 --with-big-tables \
@@ -188,6 +194,14 @@
 	  exit 1; \
 	fi     
 
+	# libndbclient: move shared libraries (but not the .a files)
+	mv $(TMP)/usr/lib/mysql/libndbclient* $(TMP)/usr/lib
+	perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libndbclient.la
+	if [ "`objdump -T $(TMP)/usr/lib/libndbclient.so.3.0.0 | grep -c libndbclient_3`" -lt 500 ]; then \
+	  echo "ERROR: versioned symbols are absent in libndbclient.so.3.0.0"; \
+	  exit 1; \
+	fi 
+
 	# libmysqlclient-dev: forgotten header file since 3.23.25?
 	cp include/my_config.h $(TMP)/usr/include/mysql/
 	cp include/my_dir.h $(TMP)/usr/include/mysql/