Changeset e0357f8 in freewrt

Timestamp:

Jun 4, 2007, 4:37:32 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

a3e474f

Parents:

876ff87

Message:

improve the situation, we're almost there

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2698 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/mysql

Files:

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

package/mysql/Config.in

@@ -16 +16 @@
           http://dev.mysql.com/
 
+config FWRT_PACKAGE_MYSQL_SERVER
+        prompt "mysql-server...................... MySQL dæmon"
+        tristate
+        default n
+        select FWRT_PACKAGE_MYSQL_CLIENT
+        help
+          MySQL server.
+          
+          http://dev.mysql.com/

package/mysql/Makefile

@@ -17 +17 @@
 
 $(eval $(call PKG_template,MYSQL_CLIENT,mysql-client,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,MYSQL_SERVER,mysql-server,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 
 CONFIGURE_STYLE:=       gnu
@@ -36 +37 @@
                         --without-pstack \
                         --with-low-memory \
-                        --without-server \
+                        --with-server \
                         --without-embedded-server \
                         --without-query-cache \
                         --without-mysqlfs \
-                        --without-vio \
+                        --with-vio \
                         --without-openssl \
                         --without-docs \
                         --without-bench \
+                        --without-innodb \
                         --with-libedit
 
+HOSTTOOLFLAGS=          CC="${HOSTCC}" \
+                        CXX='c++' \
+                        CFLAGS='${HOSTCFLAGS}' \
+                        CXXFLAGS='${HOSTCFLAGS}' \
+                        LDFLAGS='${HOSTLDFLAGS}' \
+                        CPPFLAGS='${HOSTCPPFLAGS}' \
+                        CXXLINK='c++ ${HOSTCFLAGS} ${HOSTLDFLAGS} -o $$@' \
+                        LINK='${HOSTCC} ${HOSTCFLAGS} ${HOSTLDFLAGS} -o $$@'
 ifneq (${OStype},Linux)
 HOSTTOOLFLAGS+=         LIBS='-lm -lz'
@@ -56 +66 @@
                 all install
         ${MAKE} -C "${WRKBUILD}/libmysql" \
-                CC="${HOSTCC}" \
                 LINK="${HOSTCC} -o conf_to_src -lc" \
-                CFLAGS="" \
-                LDFLAGS="" \
-                CPPFLAGS="" \
                 ${HOSTTOOLFLAGS} \
                 conf_to_src
         ${MAKE} -C "${WRKBUILD}" \
+                ${HOSTTOOLFLAGS} \
+                SUBDIRS="strings mysys dbug regex" \
+                clean
+        ${MAKE} -C "${WRKBUILD}" \
+                ${HOSTTOOLFLAGS} \
+                SUBDIRS="strings mysys dbug regex" \
+                all
+        ${MAKE} -C "${WRKBUILD}/extra" \
+                ${HOSTTOOLFLAGS} \
+                comp_err
+        ${MAKE} -C "${WRKBUILD}/sql" \
+                ${HOSTTOOLFLAGS} \
+                clean
+        ${MAKE} -C "${WRKBUILD}/sql" \
+                ${HOSTTOOLFLAGS} \
+                lex_hash.h
+        ${MAKE} -C "${WRKBUILD}" \
+                ${HOSTTOOLFLAGS} \
+                SUBDIRS="strings mysys dbug regex" \
+                clean
+        ${MAKE} -C "${WRKBUILD}" \
                 CFLAGS="${TARGET_CFLAGS}" \
-                SUBDIRS="libmysql" \
+                SUBDIRS="strings mysys dbug" \
                 DESTDIR="${WRKINST}" \
-                all install
+                all
+#       ${MAKE} -C "${WRKBUILD}/innobase" \
+#               CFLAGS="${TARGET_CFLAGS}" \
+#               DESTDIR="${WRKINST}" \
+#               all
+        ${MAKE} -C "${WRKBUILD}" \
+                CFLAGS="${TARGET_CFLAGS}" \
+                SUBDIRS="myisam myisammrg heap vio regex" \
+                DESTDIR="${WRKINST}" \
+                all
+        cd ${WRKBUILD}/sql && \
+            for file in gen_lex_hash.o gen_lex_hash lex_hash.h; do \
+                touch $$file; \
+        done
+        ${MAKE} -C "${WRKBUILD}/sql" \
+                CFLAGS="${TARGET_CFLAGS}" \
+                DESTDIR="${WRKINST}" \
+                all
+        ${MAKE} -C "${WRKBUILD}/libmysql" \
+                CFLAGS="${TARGET_CFLAGS}" \
+                DESTDIR="${WRKINST}" \
+                all
+        ${MAKE} -C "${WRKBUILD}" \
+                CFLAGS="${TARGET_CFLAGS}" \
+                SUBDIRS="strings mysys dbug extra  myisam myisammrg heap vio regex" \
+                DESTDIR="${WRKINST}" \
+                install
+        ${MAKE} -C "${WRKBUILD}/sql" \
+                CFLAGS="${TARGET_CFLAGS}" \
+                DESTDIR="${WRKINST}" \
+                install
+        ${MAKE} -C "${WRKBUILD}/libmysql" \
+                CFLAGS="${TARGET_CFLAGS}" \
+                DESTDIR="${WRKINST}" \
+                install
         ${MAKE} -C "${WRKBUILD}" \
                 CFLAGS="${TARGET_CFLAGS}" \
@@ -76 +137 @@
 
 do-install:
-        ${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT}/usr/lib
-        ${CP} ${WRKINST}/usr/lib/mysql/libmysqlclient.so.* \
-                ${IDIR_LIBMYSQLCLIENT}/usr/lib/
+        cd ${WRKINST} && pax -rw -pe -v usr/lib/mysql/libmysqlclient.so.* \
+            ${IDIR_MYSQL_CLIENT}/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/mysql/patches/patch-configure_in

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