summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-29 14:22:47 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-29 14:22:47 +0100
commit05a3ed5d87bd71009cf90170347d8e692e2b6c9e (patch)
treef23de8923f8f640a2fb0ea1fbcf56f7f93e377df
parentdf666e5a4fcef3c7a8d7da5f3628672e2bdcc77b (diff)
parentc2710be1b1b700412e107e70e4a9fb74d171122b (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/fontconfig/Makefile1
-rw-r--r--package/mysql/Makefile5
2 files changed, 1 insertions, 5 deletions
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 99404e8e9..824704dcd 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -28,5 +28,6 @@ INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 38a5104b1..c3731953e 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ENV+= OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \
mysql_cv_gethostname_style=glibc2
CONFIGURE_ARGS+= --disable-assembler \
--with-pthread \
- --without-raid \
--with-atomic-ops=rwlocks \
--with-unix-socket-path=/tmp/.mysql.sock \
--with-named-thread-libs=-lpthread \
@@ -44,12 +43,8 @@ CONFIGURE_ARGS+= --disable-assembler \
--without-server \
--without-embedded-server \
--without-query-cache \
- --without-mysqlfs \
- --without-vio \
--without-ssl \
--without-docs \
- --without-bench \
- --without-innodb \
--without-readline \
--with-machine-type=${CPU_ARCH}
HOSTTOOLFLAGS= CC="${HOSTCC}" \