diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-02 12:26:28 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-08 08:44:28 +0000 |
| commit | 41b26cba46c93dc763d69033c700be5f89a750ea (patch) | |
| tree | c068ca362cfb790a1445ac7fce77801791319106 | |
| parent | a9a790d6b22b6849ebc40295cf4cf7e541424138 (diff) | |
| download | aports-41b26cba46c93dc763d69033c700be5f89a750ea.tar.bz2 aports-41b26cba46c93dc763d69033c700be5f89a750ea.tar.xz | |
main/mysql: apr-util fails to build because of missing header file.
(cherry picked from commit db1dee8ed61bb7bd1e5079bf90069ae490232cfd)
| -rw-r--r-- | main/mysql/APKBUILD | 10 | ||||
| -rw-r--r-- | main/mysql/makefile.patch | 20 |
2 files changed, 27 insertions, 3 deletions
diff --git a/main/mysql/APKBUILD b/main/mysql/APKBUILD index d668af507..5bcc10d62 100644 --- a/main/mysql/APKBUILD +++ b/main/mysql/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mysql pkgver=5.1.50 -pkgrel=0 +pkgrel=1 pkgdesc="A fast SQL database server" url="http://www.mysql.com/" pkgusers="mysql" @@ -12,7 +12,9 @@ depends= makedepends="libtool readline-dev openssl-dev ncurses-dev zlib-dev" source="http://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-5.1/mysql-$pkgver.tar.gz $pkgname.initd - $pkgname.mycnf" + $pkgname.mycnf + makefile.patch + " subpackages="$pkgname-doc $pkgname-dev $pkgname-test libmysqlclient $pkgname-client" _builddir="$srcdir/$pkgname-$pkgver" @@ -21,6 +23,7 @@ prepare() { cd $_builddir sed -i -e 's/-lnsl //g' configure.in sed -i -e 's/-lnsl //g' configure + patch -p1 -i "$srcdir"/makefile.patch || return 1 } build() { @@ -89,4 +92,5 @@ client() { md5sums="23bac4a0aafd683b077dac146ce2701f mysql-5.1.50.tar.gz 25d08b02bff6aa379dc45859b7a3f28a mysql.initd -15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf" +15a7e3ddd6a40bf5a1eb3a8c69d9c34c mysql.mycnf +596e23f9ade6e4a9668fa6e577576c57 makefile.patch" diff --git a/main/mysql/makefile.patch b/main/mysql/makefile.patch new file mode 100644 index 000000000..89e2461c9 --- /dev/null +++ b/main/mysql/makefile.patch @@ -0,0 +1,20 @@ +--- a/include/Makefile.in ++++ b/include/Makefile.in +@@ -406,7 +406,7 @@ + my_getopt.h sslopt-longopts.h my_dir.h \ + sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ + m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \ +- $(HEADERS_GEN_MAKE) ++ $(HEADERS_GEN_MAKE) my_compiler.h + + noinst_HEADERS = config-win.h config-netware.h my_bit.h \ + heap.h my_bitmap.h my_uctype.h \ +@@ -416,7 +416,7 @@ + my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \ + thr_lock.h t_ctype.h violite.h my_md5.h base64.h \ + my_handler.h my_time.h my_vle.h my_user.h \ +- my_libwrap.h my_stacktrace.h my_compiler.h ++ my_libwrap.h my_stacktrace.h + + EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp + |