Forráskód Böngészése

fix mysql_config script

Waldemar Brodkorb 10 éve
szülő
commit
81d7f759d5

+ 4 - 1
package/mysql/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
 PKG_VERSION:=		5.6.17
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		82114fa7c13fa3ca897b34666577d9f4
 PKG_DESCR:=		MySQL client library
 PKG_SECTION:=		db
@@ -36,6 +36,9 @@ host-build:
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 		${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE)
 
+pre-configure:
+	$(SED) "s#@@STAGING_DIR@@#${STAGING_TARGET_DIR}#" ${WRKBUILD}/scripts/mysql_config.sh
+
 mysql-hostinstall:
 	$(INSTALL_BIN) ${WRKBUILD}/extra/comp_err \
 		$(STAGING_HOST_DIR)/usr/bin

+ 20 - 0
package/mysql/patches/patch-scripts_mysql_config_sh

@@ -0,0 +1,20 @@
+--- mysql-5.6.17.orig/scripts/mysql_config.sh	2014-03-14 20:07:28.000000000 +0100
++++ mysql-5.6.17/scripts/mysql_config.sh	2014-04-29 21:45:14.000000000 +0200
+@@ -83,7 +83,7 @@ execdir='@libexecdir@'
+ bindir='@bindir@'
+ 
+ # If installed, search for the compiled in directory first (might be "lib64")
+-pkglibdir='@pkglibdir@'
++pkglibdir='@@STAGING_DIR@@@pkglibdir@'
+ pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
+ fix_path pkglibdir $pkglibdir_rel lib/mysql lib
+ 
+@@ -91,7 +91,7 @@ plugindir='@pkgplugindir@'
+ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
+ fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
+ 
+-pkgincludedir='@pkgincludedir@'
++pkgincludedir='@@STAGING_DIR@@@pkgincludedir@'
+ if [ -f "$basedir/include/mysql/mysql.h" ]; then
+   pkgincludedir="$basedir/include/mysql"
+ elif [ -f "$basedir/include/mysql.h" ]; then