Attachment #81083 for bug #111073

Lines 345-351 Link Here

(-)/usr/portage/dev-db/mysql/mysql-4.1.14.ebuild (-1 lines)
345	--enable-thread-safe-client \	345	--enable-thread-safe-client \
346	--with-comment="Gentoo Linux ${PF}" \	346	--with-comment="Gentoo Linux ${PF}" \
347	--with-unix-socket-path=/var/run/mysqld/mysqld.sock \	347	--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
348	--with-zlib-dir=/usr \
349	--with-lib-ccflags="-fPIC" \	348	--with-lib-ccflags="-fPIC" \
350	${myconf} \|\| die "bad ./configure"	349	${myconf} \|\| die "bad ./configure"
351		350

Lines 476-482 Link Here

(-)/usr/portage/dev-db/mysql/mysql-4.1.16.ebuild (-1 lines)
476	--enable-thread-safe-client \	476	--enable-thread-safe-client \
477	--with-comment="Gentoo Linux ${PF}" \	477	--with-comment="Gentoo Linux ${PF}" \
478	--with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \	478	--with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \
479	--with-zlib-dir=/usr \
480	--with-lib-ccflags="-fPIC" \	479	--with-lib-ccflags="-fPIC" \
481	--without-readline \	480	--without-readline \
482	--without-docs \	481	--without-docs \




	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
	rm -f scripts/mysqlbug

	# Multilib issue with zlib detection
	mysql_version_is_at_least "5.00.15.00" \
	&& sed -i -e "s:zlib_dir/lib:zlib_dir/$(get_libdir):g" \
		"${S}/config/ac-macros/zlib.m4"

	# Make charsets install in the right place
	find . -name 'Makefile.am' \
		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;

		--enable-thread-safe-client \
		--with-comment="Gentoo Linux ${PF}" \
		--with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \
		--with-zlib-dir=/usr \
		--with-lib-ccflags="-fPIC" \
		--without-readline \
		--without-docs \

Return to bug 111073

Lines 234-244 Link Here

(-)/usr/portage/dev-db/mysql/mysql-5.0.18.ebuild (-6 lines)
234	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"	234	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
235	rm -f scripts/mysqlbug	235	rm -f scripts/mysqlbug
236		236
237	# Multilib issue with zlib detection
238	mysql_version_is_at_least "5.00.15.00" \
239	&& sed -i -e "s:zlib_dir/lib:zlib_dir/$(get_libdir):g" \
240	"${S}/config/ac-macros/zlib.m4"
241
242	# Make charsets install in the right place	237	# Make charsets install in the right place
243	find . -name 'Makefile.am' \	238	find . -name 'Makefile.am' \
244	-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;	239	-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
Lines 476-482 Link Here
476	--enable-thread-safe-client \	471	--enable-thread-safe-client \
477	--with-comment="Gentoo Linux ${PF}" \	472	--with-comment="Gentoo Linux ${PF}" \
478	--with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \	473	--with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \
479	--with-zlib-dir=/usr \
480	--with-lib-ccflags="-fPIC" \	474	--with-lib-ccflags="-fPIC" \
481	--without-readline \	475	--without-readline \
482	--without-docs \	476	--without-docs \