Changeset a3e474f in freewrt


Ignore:
Timestamp:
Jun 4, 2007, 4:53:24 PM (19 years ago)
Author:
Thorsten Glaser <tg@…>
Children:
a2a9be9
Parents:
e0357f8
Message:
  • regenerate configure script and patches
  • as mysql-server uses C++, depend on libgcc_s

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

Location:
package/mysql
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • package/mysql/Config.in

    re0357f8 ra3e474f  
    2121        default n
    2222        select FWRT_PACKAGE_MYSQL_CLIENT
     23        select FWRT_PACKAGE_LIBGCC
    2324        help
    2425          MySQL server.

  • package/mysql/ipkg/mysql-server.control

    re0357f8 ra3e474f  
    22Priority: optional
    33Section: libs
    4 Depends: mysql-client
     4Depends: mysql-client, libgcc
    55Description: MySQL daemon

  • package/mysql/patches/patch-configure

    re0357f8 ra3e474f  
    11$FreeWRT$
    22--- mysql-5.0.18.orig/configure Wed Dec 21 19:41:24 2005
    3 +++ mysql-5.0.18/configure      Mon Jun  4 11:35:00 2007
    4 @@ -477,7 +477,7 @@ ac_includes_default="\
    5  #endif"
    6  
    7  ac_subdirs_all="$ac_subdirs_all innobase"
    8 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MYSQL_NO_DASH_VERSION MYSQL_BASE_VERSION MYSQL_VERSION_ID PROTOCOL_VERSION DOT_FRM_VERSION SHARED_LIB_VERSION AVAILABLE_LANGUAGES NDB_VERSION_MAJOR NDB_VERSION_MINOR NDB_VERSION_BUILD NDB_VERSION_STATUS SYSTEM_TYPE MACHINE_TYPE CONF_COMMAND SAVE_ASFLAGS SAVE_CFLAGS SAVE_CXXFLAGS SAVE_LDFLAGS SAVE_CXXLDFLAGS CXXLDFLAGS AR RANLIB DARWIN_MWCC_TRUE DARWIN_MWCC_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP CC_VERSION CXX_VERSION AS ac_ct_RANLIB EGREP LN_S ECHO ac_ct_AR CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC PDFMANUAL DVIS uname_prog LD ARFLAGS MYSQLD_DEFAULT_SWITCHES TARGET_LINUX LN LN_CP_F MV RM CP SED CMP CHMOD HOSTNAME TAR PERL PERL5 DOXYGEN PDFLATEX MAKEINDEX PS FIND_PROC KILL CHECK_PID CCAS CCASFLAGS NOINST_LDFLAGS MYSQL_SERVER_SUFFIX ASSEMBLER_x86_TRUE ASSEMBLER_x86_FALSE ASSEMBLER_sparc32_TRUE ASSEMBLER_sparc32_FALSE ASSEMBLER_sparc64_TRUE ASSEMBLER_sparc64_FALSE ASSEMBLER_TRUE ASSEMBLER_FALSE MYSQL_UNIX_ADDR MYSQL_TCP_PORT MYSQL_TCP_PORT_DEFAULT MYSQLD_USER GETCONF ac_ct_GETCONF zlib_dir ZLIB_LIBS ZLIB_DEPS ZLIB_INCLUDES WRAPLIBS pstack_dirs pstack_libs COMPILE_PSTACK_TRUE COMPILE_PSTACK_FALSE LIBDL MYSQLD_EXTRA_LDFLAGS CLIENT_EXTRA_LDFLAGS LIB_EXTRA_CCFLAGS LM_CFLAGS COMPILATION_COMMENT ALLOCA MAKE_SHELL TERMCAP_LIB LIBEDIT_LOBJECTS tools_dirs openssl_libs openssl_includes yassl_taocrypt_extra_cxxflags yassl_libs yassl_libs_with_path yassl_includes yassl_dir HAVE_YASSL_TRUE HAVE_YASSL_FALSE libmysqld_dirs linked_libmysqld_targets docs_dirs man_dirs man1_files bench_dirs readline_dir readline_topdir readline_basedir readline_link readline_h_ln_cmd bdb_includes bdb_libs bdb_libs_with_path innodb_includes innodb_libs innodb_system_libs NDB_SCI_INCLUDES NDB_SCI_LIBS HAVE_NDBCLUSTER_DB_TRUE HAVE_NDBCLUSTER_DB_FALSE ndbcluster_includes ndbcluster_libs ndbcluster_system_libs ndb_mgmclient_libs CLIENT_LIBS NON_THREADED_LIBS STATIC_NSS_FLAGS sql_client_dirs linked_client_targets netware_dir linked_netware_sources HAVE_NETWARE_TRUE HAVE_NETWARE_FALSE THREAD_LOBJECTS subdirs sql_server_dirs thread_dirs server_scripts sql_union_dirs GXX NDB_DEFS ndb_cxxflags_fix ndb_port ndb_transporter_opt_objs ndb_bin_am_ldflags ndb_opt_subdirs NDB_SIZEOF_CHARP NDB_SIZEOF_CHAR NDB_SIZEOF_SHORT NDB_SIZEOF_INT NDB_SIZEOF_LONG NDB_SIZEOF_LONG_LONG MAKE_BINARY_DISTRIBUTION_OPTIONS LIBOBJS LTLIBOBJS'
    9 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MYSQL_NO_DASH_VERSION MYSQL_BASE_VERSION MYSQL_VERSION_ID PROTOCOL_VERSION DOT_FRM_VERSION SHARED_LIB_VERSION AVAILABLE_LANGUAGES NDB_VERSION_MAJOR NDB_VERSION_MINOR NDB_VERSION_BUILD NDB_VERSION_STATUS SYSTEM_TYPE MACHINE_TYPE CONF_COMMAND SAVE_ASFLAGS SAVE_CFLAGS SAVE_CXXFLAGS SAVE_LDFLAGS SAVE_CXXLDFLAGS CXXLDFLAGS AR RANLIB DARWIN_MWCC_TRUE DARWIN_MWCC_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP CC_VERSION CXX_VERSION AS ac_ct_RANLIB EGREP LN_S ECHO ac_ct_AR CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC PDFMANUAL DVIS uname_prog LD ARFLAGS MYSQLD_DEFAULT_SWITCHES TARGET_LINUX LN LN_CP_F MV RM CP SED CMP CHMOD HOSTNAME TAR PERL PERL5 DOXYGEN PDFLATEX MAKEINDEX PS FIND_PROC KILL CHECK_PID CCAS CCASFLAGS NOINST_LDFLAGS MYSQL_SERVER_SUFFIX ASSEMBLER_x86_TRUE ASSEMBLER_x86_FALSE ASSEMBLER_sparc32_TRUE ASSEMBLER_sparc32_FALSE ASSEMBLER_sparc64_TRUE ASSEMBLER_sparc64_FALSE ASSEMBLER_TRUE ASSEMBLER_FALSE MYSQL_UNIX_ADDR MYSQL_TCP_PORT MYSQL_TCP_PORT_DEFAULT MYSQLD_USER GETCONF ac_ct_GETCONF zlib_dir ZLIB_LIBS ZLIB_DEPS ZLIB_INCLUDES WRAPLIBS COMPILE_PSTACK_TRUE COMPILE_PSTACK_FALSE LIBDL MYSQLD_EXTRA_LDFLAGS CLIENT_EXTRA_LDFLAGS LIB_EXTRA_CCFLAGS LM_CFLAGS COMPILATION_COMMENT ALLOCA MAKE_SHELL TERMCAP_LIB LIBEDIT_LOBJECTS tools_dirs openssl_libs openssl_includes yassl_taocrypt_extra_cxxflags yassl_libs yassl_libs_with_path yassl_includes yassl_dir HAVE_YASSL_TRUE HAVE_YASSL_FALSE libmysqld_dirs linked_libmysqld_targets docs_dirs man_dirs man1_files bench_dirs readline_dir readline_topdir readline_basedir readline_link readline_h_ln_cmd bdb_includes bdb_libs bdb_libs_with_path innodb_includes innodb_libs innodb_system_libs NDB_SCI_INCLUDES NDB_SCI_LIBS HAVE_NDBCLUSTER_DB_TRUE HAVE_NDBCLUSTER_DB_FALSE ndbcluster_includes ndbcluster_libs ndbcluster_system_libs ndb_mgmclient_libs CLIENT_LIBS NON_THREADED_LIBS STATIC_NSS_FLAGS sql_client_dirs linked_client_targets netware_dir linked_netware_sources HAVE_NETWARE_TRUE HAVE_NETWARE_FALSE THREAD_LOBJECTS subdirs sql_server_dirs thread_dirs server_scripts sql_union_dirs GXX NDB_DEFS ndb_cxxflags_fix ndb_port ndb_transporter_opt_objs ndb_bin_am_ldflags ndb_opt_subdirs NDB_SIZEOF_CHARP NDB_SIZEOF_CHAR NDB_SIZEOF_SHORT NDB_SIZEOF_INT NDB_SIZEOF_LONG NDB_SIZEOF_LONG_LONG MAKE_BINARY_DISTRIBUTION_OPTIONS LIBOBJS LTLIBOBJS'
    10  ac_subst_files=''
    11  
    12  # Initialize some variables set by options.
     3+++ mysql-5.0.18/configure      Mon Jun  4 14:48:47 2007
    134@@ -1083,8 +1083,7 @@ Optional Packages:
    145   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    … …  
    457448 set dummy uname; ac_word=$2
    458449 echo "$as_me:$LINENO: checking for $ac_word" >&5
    459 @@ -25576,290 +25459,8 @@ fi
     450@@ -25576,290 +25459,14 @@ fi
    460451 fi;
    461452 
    … …  
    464455-  echo "$as_me:$LINENO: checking for atomic operations" >&5
    465456-echo $ECHO_N "checking for atomic operations... $ECHO_C" >&6
    466  
     457-
    467458-  atom_ops=
    468459-  if test "$cross_compiling" = yes; then
    … …  
    479470-cat >>conftest.$ac_ext <<_ACEOF
    480471-/* end confdefs.h.  */
    481  
     472-
    482473-#include <asm/atomic.h>
    483474-int main()
    … …  
    579570-   USE_PSTACK=no
    580571-fi;
    581 -  pstack_libs=
    582 -  pstack_dirs=
     572   pstack_libs=
     573   pstack_dirs=
    583574-  if test "$USE_PSTACK" = yes -a "$TARGET_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386"
    584575-  then
    … …  
    598589-cat >>conftest.$ac_ext <<_ACEOF
    599590-/* end confdefs.h.  */
    600 -
     591 
    601592-/* Override any gcc2 internal prototype to avoid an error.  */
    602593-#ifdef __cplusplus
    … …  
    640631-  echo "$as_me: failed program was:" >&5
    641632-sed 's/^/| /' conftest.$ac_ext >&5
    642 -
     633 
    643634-ac_cv_lib_iberty_fdmatch=no
    644635-fi
    … …  
    740731-    fi
    741732-  else
    742 -    USE_PSTACK="no"
     733     USE_PSTACK="no"
    743734-  fi
    744735-fi
    745 -
    746 -
     736 
     737 
     738+
    747739 if test "$USE_PSTACK" = "yes"; then
    748740   COMPILE_PSTACK_TRUE=
    749741   COMPILE_PSTACK_FALSE='#'
    750 @@ -26054,78 +25655,9 @@ NON_THREADED_LIBS="$LIBS"
     742@@ -26054,77 +25661,8 @@ NON_THREADED_LIBS="$LIBS"
    751743 
    752744 echo "$as_me:$LINENO: checking for int8" >&5
    … …  
    817809 echo "$as_me:$LINENO: result: no" >&5
    818810 echo "${ECHO_T}no" >&6
    819  
     811-
    820812-fi
    821813-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    … …  
    823815-    ;;
    824816-esac
    825 -
     817 
    826818 #
    827819 # Some system specific hacks
    828  #
    829 @@ -42602,8 +42134,6 @@ s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t
    830  s,@ZLIB_DEPS@,$ZLIB_DEPS,;t t
    831  s,@ZLIB_INCLUDES@,$ZLIB_INCLUDES,;t t
    832  s,@WRAPLIBS@,$WRAPLIBS,;t t
    833 -s,@pstack_dirs@,$pstack_dirs,;t t
    834 -s,@pstack_libs@,$pstack_libs,;t t
    835  s,@COMPILE_PSTACK_TRUE@,$COMPILE_PSTACK_TRUE,;t t
    836  s,@COMPILE_PSTACK_FALSE@,$COMPILE_PSTACK_FALSE,;t t
    837  s,@LIBDL@,$LIBDL,;t t

  • package/mysql/patches/patch-configure_in

    re0357f8 ra3e474f  
    11$FreeWRT$
    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
     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 14:47:48 2007
    44@@ -87,8 +87,8 @@ AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS],
    55 
Note: See TracChangeset for help on using the changeset viewer.