Navigation

← Previous Changeset
Next Changeset →

Changeset 2698

Timestamp:

06/04/07 16:37:32 (2 years ago)

Author:

Message:

improve the situation, we're almost there

Files:

trunk/freewrt/package/mysql/Config.in (modified) (1 diff)
trunk/freewrt/package/mysql/Makefile (modified) (4 diffs)
trunk/freewrt/package/mysql/ipkg/mysql-server.control (added)
trunk/freewrt/package/mysql/patches/patch-configure_in (modified) (5 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/freewrt/package/mysql/Config.in

r2696	r2698
16	16	http://dev.mysql.com/
17	17
	18	config FWRT_PACKAGE_MYSQL_SERVER
	19	prompt "mysql-server...................... MySQL dæmon"
	20	tristate
	21	default n
	22	select FWRT_PACKAGE_MYSQL_CLIENT
	23	help
	24	MySQL server.
	25
	26	http://dev.mysql.com/

trunk/freewrt/package/mysql/Makefile

r2694	r2698
17	17
18	18	$(eval $(call PKG_template,MYSQL_CLIENT,mysql-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
	19	$(eval $(call PKG_template,MYSQL_SERVER,mysql-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
19	20
20	21	CONFIGURE_STYLE:= gnu
…	…
36	37	--without-pstack \
37	38	--with-low-memory \
38		--with~~out~~-server \
	39	--with-server \
39	40	--without-embedded-server \
40	41	--without-query-cache \
41	42	--without-mysqlfs \
42		--with~~out~~-vio \
	43	--with-vio \
43	44	--without-openssl \
44	45	--without-docs \
45	46	--without-bench \
	47	--without-innodb \
46	48	--with-libedit
47	49
	50	HOSTTOOLFLAGS= CC="${HOSTCC}" \
	51	CXX='c++' \
	52	CFLAGS='${HOSTCFLAGS}' \
	53	CXXFLAGS='${HOSTCFLAGS}' \
	54	LDFLAGS='${HOSTLDFLAGS}' \
	55	CPPFLAGS='${HOSTCPPFLAGS}' \
	56	CXXLINK='c++ ${HOSTCFLAGS} ${HOSTLDFLAGS} -o $$@' \
	57	LINK='${HOSTCC} ${HOSTCFLAGS} ${HOSTLDFLAGS} -o $$@'
48	58	ifneq (${OStype},Linux)
49	59	HOSTTOOLFLAGS+= LIBS='-lm -lz'
…	…
56	66	all install
57	67	${MAKE} -C "${WRKBUILD}/libmysql" \
58		~~CC="${HOSTCC}" \~~
59	68	LINK="${HOSTCC} -o conf_to_src -lc" \
60		~~CFLAGS="" \~~
61		~~LDFLAGS="" \~~
62		~~CPPFLAGS="" \~~
63	69	${HOSTTOOLFLAGS} \
64	70	conf_to_src
65	71	${MAKE} -C "${WRKBUILD}" \
	72	${HOSTTOOLFLAGS} \
	73	SUBDIRS="strings mysys dbug regex" \
	74	clean
	75	${MAKE} -C "${WRKBUILD}" \
	76	${HOSTTOOLFLAGS} \
	77	SUBDIRS="strings mysys dbug regex" \
	78	all
	79	${MAKE} -C "${WRKBUILD}/extra" \
	80	${HOSTTOOLFLAGS} \
	81	comp_err
	82	${MAKE} -C "${WRKBUILD}/sql" \
	83	${HOSTTOOLFLAGS} \
	84	clean
	85	${MAKE} -C "${WRKBUILD}/sql" \
	86	${HOSTTOOLFLAGS} \
	87	lex_hash.h
	88	${MAKE} -C "${WRKBUILD}" \
	89	${HOSTTOOLFLAGS} \
	90	SUBDIRS="strings mysys dbug regex" \
	91	clean
	92	${MAKE} -C "${WRKBUILD}" \
66	93	CFLAGS="${TARGET_CFLAGS}" \
67		SUBDIRS="~~libmysql~~" \
	94	SUBDIRS="strings mysys dbug" \
68	95	DESTDIR="${WRKINST}" \
69		all install
	96	all
	97	# ${MAKE} -C "${WRKBUILD}/innobase" \
	98	# CFLAGS="${TARGET_CFLAGS}" \
	99	# DESTDIR="${WRKINST}" \
	100	# all
	101	${MAKE} -C "${WRKBUILD}" \
	102	CFLAGS="${TARGET_CFLAGS}" \
	103	SUBDIRS="myisam myisammrg heap vio regex" \
	104	DESTDIR="${WRKINST}" \
	105	all
	106	cd ${WRKBUILD}/sql && \
	107	for file in gen_lex_hash.o gen_lex_hash lex_hash.h; do \
	108	touch $$file; \
	109	done
	110	${MAKE} -C "${WRKBUILD}/sql" \
	111	CFLAGS="${TARGET_CFLAGS}" \
	112	DESTDIR="${WRKINST}" \
	113	all
	114	${MAKE} -C "${WRKBUILD}/libmysql" \
	115	CFLAGS="${TARGET_CFLAGS}" \
	116	DESTDIR="${WRKINST}" \
	117	all
	118	${MAKE} -C "${WRKBUILD}" \
	119	CFLAGS="${TARGET_CFLAGS}" \
	120	SUBDIRS="strings mysys dbug extra myisam myisammrg heap vio regex" \
	121	DESTDIR="${WRKINST}" \
	122	install
	123	${MAKE} -C "${WRKBUILD}/sql" \
	124	CFLAGS="${TARGET_CFLAGS}" \
	125	DESTDIR="${WRKINST}" \
	126	install
	127	${MAKE} -C "${WRKBUILD}/libmysql" \
	128	CFLAGS="${TARGET_CFLAGS}" \
	129	DESTDIR="${WRKINST}" \
	130	install
70	131	${MAKE} -C "${WRKBUILD}" \
71	132	CFLAGS="${TARGET_CFLAGS}" \
…	…
76	137
77	138	do-install:
78		${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT}/usr/lib
79		${CP} ${WRKINST}/usr/lib/mysql/libmysqlclient.so.* \
80		${IDIR_LIBMYSQLCLIENT}/usr/lib/
	139	cd ${WRKINST} && pax -rw -pe -v usr/lib/mysql/libmysqlclient.so.* \
	140	${IDIR_MYSQL_CLIENT}/
81	141
82	142	include ${TOPDIR}/mk/pkg-bottom.mk

trunk/freewrt/package/mysql/patches/patch-configure_in

r2690	r2698
1	1	$FreeWRT$
2		--- mysql-5.0.18.orig/configure.in ~~Wed Dec 21 19:39:26 2005~~
3		+++ mysql-5.0.18/configure.in ~~Mon Jun 4 11:34:59 2007~~
	2	--- mysql-5.0.18.orig/configure.in 2005-12-21 19:39:48.000000000 +0000
	3	+++ mysql-5.0.18/configure.in 2007-06-04 14:35:23.000000000 +0000
4	4	@@ -87,8 +87,8 @@ AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS],
5	5
…	…
57	57	AC_PATH_PROG(uname_prog, uname, no)
58	58
59		@@ -790,80 +757,6 @@ struct request_info *req;
	59	@@ -790,80 +757,12 @@ struct request_info *req;
60	60	])
61	61	AC_SUBST(WRAPLIBS)
…	…
103	103	- [ USE_PSTACK=$withval ],
104	104	- [ USE_PSTACK=no ])
105		- pstack_libs=
106		- pstack_dirs=
	105	pstack_libs=
	106	pstack_dirs=
107	107	- if test "$USE_PSTACK" = yes -a "$TARGET_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386"
108	108	- then
…	…
121	121	- # We must link staticly when using pstack
122	122	- with_mysqld_ldflags="-all-static"
123		- AC_SUBST([pstack_dirs])
124		- AC_SUBST([pstack_libs])
	123	AC_SUBST([pstack_dirs])
	124	AC_SUBST([pstack_libs])
125	125	- AC_DEFINE([USE_PSTACK], [1], [the pstack backtrace library])
126	126	-dnl This check isn't needed, but might be nice to give some feedback....
…	…
132	132	- fi
133	133	- else
134		- USE_PSTACK="no"
	134	USE_PSTACK="no"
135	135	- fi
136	136	-fi
	137	+
137	138	AM_CONDITIONAL(COMPILE_PSTACK, test "$USE_PSTACK" = "yes")
138	139	AC_MSG_CHECKING([if we should use pstack])
139	140	AC_MSG_RESULT([$USE_PSTACK])
140		@@ -880,37 +773,7 @@ fi
	141	@@ -880,37 +779,7 @@ fi
141	142	NON_THREADED_LIBS="$LIBS"
142	143

Navigation

Changeset 2698

Legend:

trunk/freewrt/package/mysql/Config.in

trunk/freewrt/package/mysql/Makefile

trunk/freewrt/package/mysql/patches/patch-configure_in

Download in other formats: