[Commits] Rev 94: Partly revert previous fix for linking system libevent. in file:///home/knielsen/devel/maria/my/ourdelta-bugfix/

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Mon Nov 22 17:58:23 EET 2010


At file:///home/knielsen/devel/maria/my/ourdelta-bugfix/

------------------------------------------------------------
revno: 94
revision-id: knielsen at knielsen-hq.org-20101122155823-ytchan3cxdthcyeq
parent: knielsen at knielsen-hq.org-20101122143841-4a7x3gqna20xatid
committer: knielsen at knielsen-hq.org
branch nick: ourdelta-bugfix
timestamp: Mon 2010-11-22 16:58:23 +0100
message:
  Partly revert previous fix for linking system libevent.
  It is sufficient to add libevent-dev as a build dependency and install
  it on the build host; then ./configure will automatically do the
  right thing, selecting system libevent if new enough or bundled if
  system is too old.
=== modified file 'bakery/debian-5.1/dist/Debian/rules'
--- a/bakery/debian-5.1/dist/Debian/rules	2010-11-22 14:38:41 +0000
+++ b/bakery/debian-5.1/dist/Debian/rules	2010-11-22 15:58:23 +0000
@@ -38,14 +38,6 @@ endif
 
 USE_ASSEMBLER=--enable-assembler 
 
-# From Debian Squeeze we can use system libevent. But before that,
-# system libevent is too old, and we must use bundled.
-ifneq (,$(findstring $(RELEASE), 4 5))
-    USE_LIBEVENT=--with-libevent
-else
-    USE_LIBEVENT=--with-libevent=/usr
-endif
-
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -116,7 +108,7 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                $(USE_LIBEVENT) \
+                --with-libevent \
                 --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \

=== modified file 'bakery/debian-5.1/dist/Ubuntu/rules'
--- a/bakery/debian-5.1/dist/Ubuntu/rules	2010-11-22 14:38:41 +0000
+++ b/bakery/debian-5.1/dist/Ubuntu/rules	2010-11-22 15:58:23 +0000
@@ -44,14 +44,6 @@ MYSQL_BUILD_CXX = gcc -static-libgcc
 MYSQL_BUILD_CFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 MYSQL_BUILD_CXXFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 
-# From Ubuntu 9.10 "Karmic" we can use system libevent. But before
-# that, system libevent is too old, and we must use bundled.
-ifneq (,$(findstring $(RELEASE), 8.04 8.10 9.04))
-    USE_LIBEVENT=--with-libevent
-else
-    USE_LIBEVENT=--with-libevent=/usr
-endif
-
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -117,7 +109,7 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                $(USE_LIBEVENT) \
+                --with-libevent \
                 --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \

=== modified file 'bakery/debian-5.2/dist/Debian/rules'
--- a/bakery/debian-5.2/dist/Debian/rules	2010-11-22 14:38:41 +0000
+++ b/bakery/debian-5.2/dist/Debian/rules	2010-11-22 15:58:23 +0000
@@ -38,14 +38,6 @@ endif
 
 USE_ASSEMBLER=--enable-assembler 
 
-# From Debian Squeeze we can use system libevent. But before that,
-# system libevent is too old, and we must use bundled.
-ifneq (,$(findstring $(RELEASE), 4 5))
-    USE_LIBEVENT=--with-libevent
-else
-    USE_LIBEVENT=--with-libevent=/usr
-endif
-
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -116,7 +108,7 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                $(USE_LIBEVENT) \
+                --with-libevent \
                 --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \

=== modified file 'bakery/debian-5.2/dist/Ubuntu/rules'
--- a/bakery/debian-5.2/dist/Ubuntu/rules	2010-11-22 14:38:41 +0000
+++ b/bakery/debian-5.2/dist/Ubuntu/rules	2010-11-22 15:58:23 +0000
@@ -44,14 +44,6 @@ MYSQL_BUILD_CXX = g++ -static-libgcc
 MYSQL_BUILD_CFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 MYSQL_BUILD_CXXFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 
-# From Ubuntu 9.10 "Karmic" we can use system libevent. But before
-# that, system libevent is too old, and we must use bundled.
-ifneq (,$(findstring $(RELEASE), 8.04 8.10 9.04))
-    USE_LIBEVENT=--with-libevent
-else
-    USE_LIBEVENT=--with-libevent=/usr
-endif
-
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -117,7 +109,7 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                $(USE_LIBEVENT) \
+                --with-libevent \
                 --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \

=== modified file 'bakery/debian-5.3/dist/Debian/rules'
--- a/bakery/debian-5.3/dist/Debian/rules	2010-11-22 14:38:41 +0000
+++ b/bakery/debian-5.3/dist/Debian/rules	2010-11-22 15:58:23 +0000
@@ -38,14 +38,6 @@ endif
 
 USE_ASSEMBLER=--enable-assembler 
 
-# From Debian Squeeze we can use system libevent. But before that,
-# system libevent is too old, and we must use bundled.
-ifneq (,$(findstring $(RELEASE), 4 5))
-    USE_LIBEVENT=--with-libevent
-else
-    USE_LIBEVENT=--with-libevent=/usr
-endif
-
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -116,7 +108,7 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                $(USE_LIBEVENT) \
+                --with-libevent \
                 --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \

=== modified file 'bakery/debian-5.3/dist/Ubuntu/rules'
--- a/bakery/debian-5.3/dist/Ubuntu/rules	2010-11-22 14:38:41 +0000
+++ b/bakery/debian-5.3/dist/Ubuntu/rules	2010-11-22 15:58:23 +0000
@@ -44,14 +44,6 @@ MYSQL_BUILD_CXX = g++ -static-libgcc
 MYSQL_BUILD_CFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 MYSQL_BUILD_CXXFLAGS = -O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized
 
-# From Ubuntu 9.10 "Karmic" we can use system libevent. But before
-# that, system libevent is too old, and we must use bundled.
-ifneq (,$(findstring $(RELEASE), 8.04 8.10 9.04))
-    USE_LIBEVENT=--with-libevent
-else
-    USE_LIBEVENT=--with-libevent=/usr
-endif
-
 ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
     TESTSUITE_FAIL_CMD=exit 1
 else
@@ -117,7 +109,7 @@ endif
                 --with-extra-charsets=all \
                 --with-libwrap \
                 --with-ssl=/usr \
-                $(USE_LIBEVENT) \
+                --with-libevent \
                 --without-readline \
                 --with-zlib-dir=/usr \
                 --with-embedded-server \



More information about the commits mailing list