From b703aeae0906cefdd0fdf5a84ad3da0668758bb6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 5 May 2006 16:21:46 +0000 Subject: site/arm-linux-gnueabi: update site file with dpkg and enca bits --- site/arm-linux-gnueabi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/site/arm-linux-gnueabi b/site/arm-linux-gnueabi index aff569c013..7c9fb85d0b 100644 --- a/site/arm-linux-gnueabi +++ b/site/arm-linux-gnueabi @@ -367,3 +367,11 @@ with_broken_putenv=${with_broken_putenv=no} # xffm jm_cv_func_working_readdir=yes + +# dpkg +dpkg_cv_va_copy=${ac_cv_va_copy=no} +dpkg_cv___va_copy=${ac_cv___va_copy=yes} + +# enca +yeti_cv_func_scanf_modif_size_t=yes + -- cgit v1.2.3 From da7b90aadf644db9e6156670882ba537503f228d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 5 May 2006 17:18:47 +0000 Subject: mysql: updated to 4.1.18 (security fixes) --- packages/mysql/files/.mtn2git_empty | 0 packages/mysql/files/autofoo.patch | 317 +++++++++++++++++++++++++ packages/mysql/files/gen_lex_hash.patch | 19 ++ packages/mysql/mysql-4.1.16/.mtn2git_empty | 0 packages/mysql/mysql-4.1.16/autofoo.patch | 317 ------------------------- packages/mysql/mysql-4.1.16/gen_lex_hash.patch | 19 -- packages/mysql/mysql-native_4.1.16.bb | 16 -- packages/mysql/mysql-native_4.1.18.bb | 16 ++ packages/mysql/mysql_4.1.16.bb | 46 ---- packages/mysql/mysql_4.1.18.bb | 46 ++++ 10 files changed, 398 insertions(+), 398 deletions(-) create mode 100644 packages/mysql/files/.mtn2git_empty create mode 100644 packages/mysql/files/autofoo.patch create mode 100644 packages/mysql/files/gen_lex_hash.patch delete mode 100644 packages/mysql/mysql-4.1.16/.mtn2git_empty delete mode 100644 packages/mysql/mysql-4.1.16/autofoo.patch delete mode 100644 packages/mysql/mysql-4.1.16/gen_lex_hash.patch delete mode 100644 packages/mysql/mysql-native_4.1.16.bb create mode 100644 packages/mysql/mysql-native_4.1.18.bb delete mode 100644 packages/mysql/mysql_4.1.16.bb create mode 100644 packages/mysql/mysql_4.1.18.bb diff --git a/packages/mysql/files/.mtn2git_empty b/packages/mysql/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mysql/files/autofoo.patch b/packages/mysql/files/autofoo.patch new file mode 100644 index 0000000000..f2d5354572 --- /dev/null +++ b/packages/mysql/files/autofoo.patch @@ -0,0 +1,317 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- mysql-4.1.15/acinclude.m4~autofoo ++++ mysql-4.1.15/acinclude.m4 +@@ -1,5 +1,88 @@ + # Local macros for automake & autoconf + ++AH_TEMPLATE([SPRINTF_RETURNS_INT], [sprintf returns an int]) ++AH_TEMPLATE([SPRINTF_RETURNS_PTR], [sprintf returns a char *]) ++AH_TEMPLATE([SPRINTF_RETURNS_GARBAGE], [sprintf returns something unknown to us]) ++ ++AC_DEFUN([MYSQL_SPRINTF_RET], [ ++ AC_CACHE_CHECK([return type of sprintf], ++ [mysql_cv_func_sprintf_ret], [ ++ old_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" ++ AC_COMPILE_IFELSE([ ++#include ++int sprintf(char *str, const char *format, ...); ++ ], [mysql_cv_func_sprintf_ret=int], ++ AC_COMPILE_IFELSE([ ++#include ++char * sprintf(char *str, const char *format, ...); ++ ], [mysql_cv_func_sprintf_ret=ptr], ++ [mysql_cv_func_sprintf_ret=unknown]) ++ ) ++ CFLAGS="$old_CFLAGS" ++ ]) ++ if test x"$mysql_cv_func_sprintf_ret" = "xint"; then ++ AC_DEFINE([SPRINTF_RETURNS_INT], [1]) ++ elif test x"$mysql_cv_func_sprintf_ret" = "xptr"; then ++ AC_DEFINE([SPRINTF_RETURNS_PTR], [1]) ++ else ++ AC_DEFINE([SPRINTF_RETURNS_GARBAGE], [1]) ++ fi ++]) ++ ++# _MYSQL_FUNC_ATOMIC_ADD ++# ---------------------- ++# Check for Linux specific atomic_add function ++AC_DEFUN([_MYSQL_FUNC_ATOMIC_ADD], ++[AC_CACHE_CHECK([for atomic_add], [mysql_cv_func_atomic_add], ++[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ [ ++int main() ++{ ++ atomic_t v; ++ ++ atomic_set(&v, 23); ++ atomic_add(5, &v); ++ return atomic_read(&v) == 28 ? 0 : -1; ++} ++ ])], ++ [mysql_cv_func_atomic_add=yes], ++ [mysql_cv_func_atomic_add=no])]) ++ if test x"$mysql_func_atomic_add" = "xyes"; then ++ AC_DEFINE([HAVE_ATOMIC_ADD], [1]) ++ fi[]dnl ++])# _MYSQL_FUNC_ATOMIC_ADD ++ ++# _MYSQL_FUNC_ATOMIC_SUB ++# ---------------------- ++# Check for Linux specific atomic_sub function ++AC_DEFUN([_MYSQL_FUNC_ATOMIC_SUB], ++[AC_CACHE_CHECK([for atomic_sub], [mysql_cv_func_atomic_sub], ++[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ [ ++int main() ++{ ++ atomic_t v; ++ ++ atomic_set(&v, 23); ++ atomic_sub(5, &v); ++ return atomic_read(&v) == 18 ? 0 : -1; ++} ++ ])], ++ [mysql_cv_func_atomic_sub=yes], ++ [mysql_cv_func_atomic_sub=no])]) ++ if test x"$mysql_func_atomic_sub" = "xyes"; then ++ AC_DEFINE([HAVE_ATOMIC_SUB], [1]) ++ fi[]dnl ++])# _MYSQL_FUNC_ATOMIC_SUB ++ ++# MYSQL_FUNCS_ATOMIC ++# ------------------ ++# Check for Linux specific atomic add and sub functions ++AC_DEFUN([MYSQL_FUNCS_ATOMIC], [ ++ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_ADD])dnl ++ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_SUB])dnl ++])# MYSQL_FUNCS_ATOMIC + + AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [ + AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared, +@@ -340,7 +423,7 @@ + AC_DEFUN([MYSQL_CHECK_ULONG], + [AC_MSG_CHECKING(for type ulong) + AC_CACHE_VAL(ac_cv_ulong, +-[AC_TRY_RUN([#include ++[AC_TRY_LINK([#include + #include + main() + { +@@ -358,7 +441,7 @@ + AC_DEFUN([MYSQL_CHECK_UCHAR], + [AC_MSG_CHECKING(for type uchar) + AC_CACHE_VAL(ac_cv_uchar, +-[AC_TRY_RUN([#include ++[AC_TRY_LINK([#include + #include + main() + { +@@ -376,7 +459,7 @@ + AC_DEFUN([MYSQL_CHECK_UINT], + [AC_MSG_CHECKING(for type uint) + AC_CACHE_VAL(ac_cv_uint, +-[AC_TRY_RUN([#include ++[AC_TRY_LINK([#include + #include + main() + { +@@ -395,7 +478,7 @@ + AC_DEFUN([MYSQL_CHECK_IN_ADDR_T], + [AC_MSG_CHECKING(for type in_addr_t) + AC_CACHE_VAL(ac_cv_in_addr_t, +-[AC_TRY_RUN([#include ++[AC_TRY_LINK([#include + #include + #include + #include +@@ -456,7 +539,7 @@ + AC_DEFUN([MYSQL_CHECK_FP_EXCEPT], + [AC_MSG_CHECKING(for type fp_except) + AC_CACHE_VAL(ac_cv_fp_except, +-[AC_TRY_RUN([#include ++[AC_TRY_LINK([#include + #include + #include + main() +--- mysql-4.1.15/configure.in~autofoo ++++ mysql-4.1.15/configure.in +@@ -234,8 +234,6 @@ + else + AC_PATH_PROG(AS, as, as) + fi +-# Still need ranlib for readline; local static use only so no libtool. +-AC_PROG_RANLIB + # We use libtool + #AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL +@@ -256,44 +254,7 @@ + AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf) + AC_CHECK_PROG(DVIS, tex, manual.dvi) + +-AC_MSG_CHECKING("return type of sprintf") +- +-#check the return type of sprintf +-case $SYSTEM_TYPE in +- *netware*) +- AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int") +- ;; +- *) +-AC_TRY_RUN([ +- int main() +- { +- char* s = "hello"; +- char buf[6]; +- if((int)sprintf(buf, s) == strlen(s)) +- return 0; +- +- return -1; +- } +- ], +- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf]) +- AC_MSG_RESULT("int")], +- [AC_TRY_RUN([ +- int main() +- { +- char* s = "hello"; +- char buf[6]; +- if((char*)sprintf(buf,s) == buf + strlen(s)) +- return 0; +- return -1; +- } ], +- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf]) +- AC_MSG_RESULT("ptr")], +- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf]) +- AC_MSG_RESULT("garbage")]) +- ]) +- ;; +-esac +- ++MYSQL_SPRINTF_RET + + # option, cache_name, variable, + # code to execute if yes, code to exectute if fail +@@ -870,42 +831,7 @@ + AC_SUBST(WRAPLIBS) + + if test "$TARGET_LINUX" = "true"; then +- AC_MSG_CHECKING([for atomic operations]) +- +- atom_ops= +- AC_TRY_RUN([ +-#include +-int main() +-{ +- atomic_t v; +- +- atomic_set(&v, 23); +- atomic_add(5, &v); +- return atomic_read(&v) == 28 ? 0 : -1; +-} +- ], +- [AC_DEFINE([HAVE_ATOMIC_ADD], [1], +- [atomic_add() from (Linux only)]) +- atom_ops="${atom_ops}atomic_add "], +- ) +- AC_TRY_RUN([ +-#include +-int main() +-{ +- atomic_t v; +- +- atomic_set(&v, 23); +- atomic_sub(5, &v); +- return atomic_read(&v) == 18 ? 0 : -1; +-} +- ], +- [AC_DEFINE([HAVE_ATOMIC_SUB], [1], +- [atomic_sub() from (Linux only)]) +- atom_ops="${atom_ops}atomic_sub "], +- ) +- +- if test -z "$atom_ops"; then atom_ops="no"; fi +- AC_MSG_RESULT($atom_ops) ++ MYSQL_FUNCS_ATOMIC + + AC_ARG_WITH(pstack, + [ --with-pstack Use the pstack backtrace library], +@@ -958,13 +884,13 @@ + # Later in this script LIBS will be augmented with a threads library. + NON_THREADED_LIBS="$LIBS" + +-AC_MSG_CHECKING([for int8]) ++AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [ + case $SYSTEM_TYPE in + *netware) +- AC_MSG_RESULT([no]) ++ mysql_cv_type_int8=no + ;; + *) +-AC_TRY_RUN([ ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #ifdef HAVE_STDLIB_H + #include + #endif +@@ -975,22 +901,21 @@ + + #ifdef HAVE_SYS_TYPES_H + #include +-#endif +- ++#endif]], [ + int main() + { + int8 i; + return 0; +-} +-], +-[AC_DEFINE([HAVE_INT_8_16_32], [1], +- [whether int8, int16 and int32 types exist]) +-AC_MSG_RESULT([yes])], +-[AC_MSG_RESULT([no])] +-) ++}])], [mysql_cv_type_int8=yes], [mysql_cv_type_int8=no]) + ;; + esac + ++if test x"$mysql_cv_type_int8" = "xyes"; then ++ AC_DEFINE([HAVE_INT_8_16_32], [1], ++ [whether int8, int16 and int32 types exist]) ++fi ++]) ++ + # + # Some system specific hacks + # +@@ -1798,7 +1723,7 @@ + AC_MSG_ERROR("MySQL needs a long long type.") + fi + # off_t is not a builtin type +-MYSQL_CHECK_SIZEOF(off_t, 4) ++AC_CHECK_SIZEOF(off_t, 4) + if test "$ac_cv_sizeof_off_t" -eq 0 + then + AC_MSG_ERROR("MySQL needs a off_t type.") +--- mysql-4.1.15/innobase/configure.in~autofoo ++++ mysql-4.1.15/innobase/configure.in +@@ -3,6 +3,7 @@ + AC_CANONICAL_SYSTEM + AM_MAINTAINER_MODE + AM_CONFIG_HEADER(ib_config.h) ++AC_CONFIG_AUX_DIR([..]) + AM_INIT_AUTOMAKE(ib, 0.90) + + # This is need before AC_PROG_CC +@@ -32,7 +33,6 @@ + CXXFLAGS="$CXXFLAGS " + + AC_PROG_CC +-AC_PROG_RANLIB + AC_PROG_INSTALL + AC_PROG_LIBTOOL + AC_CHECK_HEADERS(aio.h sched.h) diff --git a/packages/mysql/files/gen_lex_hash.patch b/packages/mysql/files/gen_lex_hash.patch new file mode 100644 index 0000000000..c398d048dc --- /dev/null +++ b/packages/mysql/files/gen_lex_hash.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- mysql-4.1.15/sql/Makefile.am~gen_lexhash ++++ mysql-4.1.15/sql/Makefile.am +@@ -137,8 +137,10 @@ + @echo "If it fails, re-run configure with --with-low-memory" + $(CXXCOMPILE) $(LM_CFLAGS) -c $< + ++GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT) ++ + lex_hash.h: gen_lex_hash$(EXEEXT) +- ./gen_lex_hash$(EXEEXT) > $@ ++ $(GEN_LEX_HASH) > $@ + + # For testing of udf_example.so; Works on platforms with gcc + # (This is not part of our build process but only provided as an example) diff --git a/packages/mysql/mysql-4.1.16/.mtn2git_empty b/packages/mysql/mysql-4.1.16/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mysql/mysql-4.1.16/autofoo.patch b/packages/mysql/mysql-4.1.16/autofoo.patch deleted file mode 100644 index f2d5354572..0000000000 --- a/packages/mysql/mysql-4.1.16/autofoo.patch +++ /dev/null @@ -1,317 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- mysql-4.1.15/acinclude.m4~autofoo -+++ mysql-4.1.15/acinclude.m4 -@@ -1,5 +1,88 @@ - # Local macros for automake & autoconf - -+AH_TEMPLATE([SPRINTF_RETURNS_INT], [sprintf returns an int]) -+AH_TEMPLATE([SPRINTF_RETURNS_PTR], [sprintf returns a char *]) -+AH_TEMPLATE([SPRINTF_RETURNS_GARBAGE], [sprintf returns something unknown to us]) -+ -+AC_DEFUN([MYSQL_SPRINTF_RET], [ -+ AC_CACHE_CHECK([return type of sprintf], -+ [mysql_cv_func_sprintf_ret], [ -+ old_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" -+ AC_COMPILE_IFELSE([ -+#include -+int sprintf(char *str, const char *format, ...); -+ ], [mysql_cv_func_sprintf_ret=int], -+ AC_COMPILE_IFELSE([ -+#include -+char * sprintf(char *str, const char *format, ...); -+ ], [mysql_cv_func_sprintf_ret=ptr], -+ [mysql_cv_func_sprintf_ret=unknown]) -+ ) -+ CFLAGS="$old_CFLAGS" -+ ]) -+ if test x"$mysql_cv_func_sprintf_ret" = "xint"; then -+ AC_DEFINE([SPRINTF_RETURNS_INT], [1]) -+ elif test x"$mysql_cv_func_sprintf_ret" = "xptr"; then -+ AC_DEFINE([SPRINTF_RETURNS_PTR], [1]) -+ else -+ AC_DEFINE([SPRINTF_RETURNS_GARBAGE], [1]) -+ fi -+]) -+ -+# _MYSQL_FUNC_ATOMIC_ADD -+# ---------------------- -+# Check for Linux specific atomic_add function -+AC_DEFUN([_MYSQL_FUNC_ATOMIC_ADD], -+[AC_CACHE_CHECK([for atomic_add], [mysql_cv_func_atomic_add], -+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], -+ [ -+int main() -+{ -+ atomic_t v; -+ -+ atomic_set(&v, 23); -+ atomic_add(5, &v); -+ return atomic_read(&v) == 28 ? 0 : -1; -+} -+ ])], -+ [mysql_cv_func_atomic_add=yes], -+ [mysql_cv_func_atomic_add=no])]) -+ if test x"$mysql_func_atomic_add" = "xyes"; then -+ AC_DEFINE([HAVE_ATOMIC_ADD], [1]) -+ fi[]dnl -+])# _MYSQL_FUNC_ATOMIC_ADD -+ -+# _MYSQL_FUNC_ATOMIC_SUB -+# ---------------------- -+# Check for Linux specific atomic_sub function -+AC_DEFUN([_MYSQL_FUNC_ATOMIC_SUB], -+[AC_CACHE_CHECK([for atomic_sub], [mysql_cv_func_atomic_sub], -+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], -+ [ -+int main() -+{ -+ atomic_t v; -+ -+ atomic_set(&v, 23); -+ atomic_sub(5, &v); -+ return atomic_read(&v) == 18 ? 0 : -1; -+} -+ ])], -+ [mysql_cv_func_atomic_sub=yes], -+ [mysql_cv_func_atomic_sub=no])]) -+ if test x"$mysql_func_atomic_sub" = "xyes"; then -+ AC_DEFINE([HAVE_ATOMIC_SUB], [1]) -+ fi[]dnl -+])# _MYSQL_FUNC_ATOMIC_SUB -+ -+# MYSQL_FUNCS_ATOMIC -+# ------------------ -+# Check for Linux specific atomic add and sub functions -+AC_DEFUN([MYSQL_FUNCS_ATOMIC], [ -+ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_ADD])dnl -+ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_SUB])dnl -+])# MYSQL_FUNCS_ATOMIC - - AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [ - AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared, -@@ -340,7 +423,7 @@ - AC_DEFUN([MYSQL_CHECK_ULONG], - [AC_MSG_CHECKING(for type ulong) - AC_CACHE_VAL(ac_cv_ulong, --[AC_TRY_RUN([#include -+[AC_TRY_LINK([#include - #include - main() - { -@@ -358,7 +441,7 @@ - AC_DEFUN([MYSQL_CHECK_UCHAR], - [AC_MSG_CHECKING(for type uchar) - AC_CACHE_VAL(ac_cv_uchar, --[AC_TRY_RUN([#include -+[AC_TRY_LINK([#include - #include - main() - { -@@ -376,7 +459,7 @@ - AC_DEFUN([MYSQL_CHECK_UINT], - [AC_MSG_CHECKING(for type uint) - AC_CACHE_VAL(ac_cv_uint, --[AC_TRY_RUN([#include -+[AC_TRY_LINK([#include - #include - main() - { -@@ -395,7 +478,7 @@ - AC_DEFUN([MYSQL_CHECK_IN_ADDR_T], - [AC_MSG_CHECKING(for type in_addr_t) - AC_CACHE_VAL(ac_cv_in_addr_t, --[AC_TRY_RUN([#include -+[AC_TRY_LINK([#include - #include - #include - #include -@@ -456,7 +539,7 @@ - AC_DEFUN([MYSQL_CHECK_FP_EXCEPT], - [AC_MSG_CHECKING(for type fp_except) - AC_CACHE_VAL(ac_cv_fp_except, --[AC_TRY_RUN([#include -+[AC_TRY_LINK([#include - #include - #include - main() ---- mysql-4.1.15/configure.in~autofoo -+++ mysql-4.1.15/configure.in -@@ -234,8 +234,6 @@ - else - AC_PATH_PROG(AS, as, as) - fi --# Still need ranlib for readline; local static use only so no libtool. --AC_PROG_RANLIB - # We use libtool - #AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL -@@ -256,44 +254,7 @@ - AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf) - AC_CHECK_PROG(DVIS, tex, manual.dvi) - --AC_MSG_CHECKING("return type of sprintf") -- --#check the return type of sprintf --case $SYSTEM_TYPE in -- *netware*) -- AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int") -- ;; -- *) --AC_TRY_RUN([ -- int main() -- { -- char* s = "hello"; -- char buf[6]; -- if((int)sprintf(buf, s) == strlen(s)) -- return 0; -- -- return -1; -- } -- ], -- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf]) -- AC_MSG_RESULT("int")], -- [AC_TRY_RUN([ -- int main() -- { -- char* s = "hello"; -- char buf[6]; -- if((char*)sprintf(buf,s) == buf + strlen(s)) -- return 0; -- return -1; -- } ], -- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf]) -- AC_MSG_RESULT("ptr")], -- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf]) -- AC_MSG_RESULT("garbage")]) -- ]) -- ;; --esac -- -+MYSQL_SPRINTF_RET - - # option, cache_name, variable, - # code to execute if yes, code to exectute if fail -@@ -870,42 +831,7 @@ - AC_SUBST(WRAPLIBS) - - if test "$TARGET_LINUX" = "true"; then -- AC_MSG_CHECKING([for atomic operations]) -- -- atom_ops= -- AC_TRY_RUN([ --#include --int main() --{ -- atomic_t v; -- -- atomic_set(&v, 23); -- atomic_add(5, &v); -- return atomic_read(&v) == 28 ? 0 : -1; --} -- ], -- [AC_DEFINE([HAVE_ATOMIC_ADD], [1], -- [atomic_add() from (Linux only)]) -- atom_ops="${atom_ops}atomic_add "], -- ) -- AC_TRY_RUN([ --#include --int main() --{ -- atomic_t v; -- -- atomic_set(&v, 23); -- atomic_sub(5, &v); -- return atomic_read(&v) == 18 ? 0 : -1; --} -- ], -- [AC_DEFINE([HAVE_ATOMIC_SUB], [1], -- [atomic_sub() from (Linux only)]) -- atom_ops="${atom_ops}atomic_sub "], -- ) -- -- if test -z "$atom_ops"; then atom_ops="no"; fi -- AC_MSG_RESULT($atom_ops) -+ MYSQL_FUNCS_ATOMIC - - AC_ARG_WITH(pstack, - [ --with-pstack Use the pstack backtrace library], -@@ -958,13 +884,13 @@ - # Later in this script LIBS will be augmented with a threads library. - NON_THREADED_LIBS="$LIBS" - --AC_MSG_CHECKING([for int8]) -+AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [ - case $SYSTEM_TYPE in - *netware) -- AC_MSG_RESULT([no]) -+ mysql_cv_type_int8=no - ;; - *) --AC_TRY_RUN([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_STDLIB_H - #include - #endif -@@ -975,22 +901,21 @@ - - #ifdef HAVE_SYS_TYPES_H - #include --#endif -- -+#endif]], [ - int main() - { - int8 i; - return 0; --} --], --[AC_DEFINE([HAVE_INT_8_16_32], [1], -- [whether int8, int16 and int32 types exist]) --AC_MSG_RESULT([yes])], --[AC_MSG_RESULT([no])] --) -+}])], [mysql_cv_type_int8=yes], [mysql_cv_type_int8=no]) - ;; - esac - -+if test x"$mysql_cv_type_int8" = "xyes"; then -+ AC_DEFINE([HAVE_INT_8_16_32], [1], -+ [whether int8, int16 and int32 types exist]) -+fi -+]) -+ - # - # Some system specific hacks - # -@@ -1798,7 +1723,7 @@ - AC_MSG_ERROR("MySQL needs a long long type.") - fi - # off_t is not a builtin type --MYSQL_CHECK_SIZEOF(off_t, 4) -+AC_CHECK_SIZEOF(off_t, 4) - if test "$ac_cv_sizeof_off_t" -eq 0 - then - AC_MSG_ERROR("MySQL needs a off_t type.") ---- mysql-4.1.15/innobase/configure.in~autofoo -+++ mysql-4.1.15/innobase/configure.in -@@ -3,6 +3,7 @@ - AC_CANONICAL_SYSTEM - AM_MAINTAINER_MODE - AM_CONFIG_HEADER(ib_config.h) -+AC_CONFIG_AUX_DIR([..]) - AM_INIT_AUTOMAKE(ib, 0.90) - - # This is need before AC_PROG_CC -@@ -32,7 +33,6 @@ - CXXFLAGS="$CXXFLAGS " - - AC_PROG_CC --AC_PROG_RANLIB - AC_PROG_INSTALL - AC_PROG_LIBTOOL - AC_CHECK_HEADERS(aio.h sched.h) diff --git a/packages/mysql/mysql-4.1.16/gen_lex_hash.patch b/packages/mysql/mysql-4.1.16/gen_lex_hash.patch deleted file mode 100644 index c398d048dc..0000000000 --- a/packages/mysql/mysql-4.1.16/gen_lex_hash.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- mysql-4.1.15/sql/Makefile.am~gen_lexhash -+++ mysql-4.1.15/sql/Makefile.am -@@ -137,8 +137,10 @@ - @echo "If it fails, re-run configure with --with-low-memory" - $(CXXCOMPILE) $(LM_CFLAGS) -c $< - -+GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT) -+ - lex_hash.h: gen_lex_hash$(EXEEXT) -- ./gen_lex_hash$(EXEEXT) > $@ -+ $(GEN_LEX_HASH) > $@ - - # For testing of udf_example.so; Works on platforms with gcc - # (This is not part of our build process but only provided as an example) diff --git a/packages/mysql/mysql-native_4.1.16.bb b/packages/mysql/mysql-native_4.1.16.bb deleted file mode 100644 index c871a8f9da..0000000000 --- a/packages/mysql/mysql-native_4.1.16.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "console/network" -include mysql_${PV}.bb -inherit native - -PACKAGES = "" -DEPENDS = "ncurses-native" -EXTRA_OEMAKE = "" -EXTRA_OECONF = " --with-embedded-server " - -do_stage() { - install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/ -} - -do_install() { - : -} diff --git a/packages/mysql/mysql-native_4.1.18.bb b/packages/mysql/mysql-native_4.1.18.bb new file mode 100644 index 0000000000..c871a8f9da --- /dev/null +++ b/packages/mysql/mysql-native_4.1.18.bb @@ -0,0 +1,16 @@ +SECTION = "console/network" +include mysql_${PV}.bb +inherit native + +PACKAGES = "" +DEPENDS = "ncurses-native" +EXTRA_OEMAKE = "" +EXTRA_OECONF = " --with-embedded-server " + +do_stage() { + install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/ +} + +do_install() { + : +} diff --git a/packages/mysql/mysql_4.1.16.bb b/packages/mysql/mysql_4.1.16.bb deleted file mode 100644 index fe8c42dd88..0000000000 --- a/packages/mysql/mysql_4.1.16.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "The MySQL Open Source Database System" -SECTION = "libs" -DEPENDS += "ncurses mysql-native" -LICENSE = "GPL" - -SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \ - file://autofoo.patch;patch=1 \ - file://gen_lex_hash.patch;patch=1" - -S = "${WORKDIR}/mysql-${PV}" - -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - -BINCONFIG_GLOB = "mysql_config" -inherit autotools binconfig - - -EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'" -EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " - -do_stage() { - autotools_stage_includes - oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR} - oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install - mv -f ${D}${libdir}/mysql/* ${D}${libdir} - rmdir ${D}${libdir}/mysql -} - -pkg_postinst () { - grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql -} - -pkg_postrm () { - grep mysql /etc/passwd && deluser mysql -} - -PACKAGES =+ "libmysqlclient libmysqlclient-dev" - -FILES_libmysqlclient = "${libdir}/libmysqlclient*.so.*" -FILES_libmysqlclient-dev = "${incdir}/mysql ${libdir}/lib* \ - ${bindir}/mysql_config" - diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb new file mode 100644 index 0000000000..fe8c42dd88 --- /dev/null +++ b/packages/mysql/mysql_4.1.18.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "The MySQL Open Source Database System" +SECTION = "libs" +DEPENDS += "ncurses mysql-native" +LICENSE = "GPL" + +SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \ + file://autofoo.patch;patch=1 \ + file://gen_lex_hash.patch;patch=1" + +S = "${WORKDIR}/mysql-${PV}" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +BINCONFIG_GLOB = "mysql_config" +inherit autotools binconfig + + +EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'" +EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " + +do_stage() { + autotools_stage_includes + oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR} + oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + mv -f ${D}${libdir}/mysql/* ${D}${libdir} + rmdir ${D}${libdir}/mysql +} + +pkg_postinst () { + grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql +} + +pkg_postrm () { + grep mysql /etc/passwd && deluser mysql +} + +PACKAGES =+ "libmysqlclient libmysqlclient-dev" + +FILES_libmysqlclient = "${libdir}/libmysqlclient*.so.*" +FILES_libmysqlclient-dev = "${incdir}/mysql ${libdir}/lib* \ + ${bindir}/mysql_config" + -- cgit v1.2.3 From 6d70a8b8c6ecba9fad63754a1ee2b3ea7eec67e0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 5 May 2006 17:25:47 +0000 Subject: wpa_gui: added 0.4.8 - its GUI tool to scan and configure WiFi networks - need qt3/x11 --- packages/wpa-supplicant/wpa-gui_0.4.8.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/wpa-supplicant/wpa-gui_0.4.8.bb diff --git a/packages/wpa-supplicant/wpa-gui_0.4.8.bb b/packages/wpa-supplicant/wpa-gui_0.4.8.bb new file mode 100644 index 0000000000..0908a5c995 --- /dev/null +++ b/packages/wpa-supplicant/wpa-gui_0.4.8.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Qt interface for choosing which configured network to connect \ +to. It also provides a method for browsing 802.11 SSID scan results, an event \ +history log of messages generated by wpa_supplicant, and a method to add or \ +edit wpa_supplicant networks." +SECTION = "network" +LICENSE = "GPL BSD" +HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" + +SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz " + +S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_gui/" + +inherit qmake qt3x11 + +EXTRA_QMAKEVARS_POST += "CONFIG+=thread" + +do_install () { + install -d ${D}${sbindir} + install -m 755 wpa_gui ${D}${sbindir} +} -- cgit v1.2.3 From 987f0243ed22a455d2b2fec3eaf3526cd37ac454 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 5 May 2006 18:28:11 +0000 Subject: added irdadump 0.9.16 --- packages/irda-utils/irdadump_0.9.16.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/irda-utils/irdadump_0.9.16.bb diff --git a/packages/irda-utils/irdadump_0.9.16.bb b/packages/irda-utils/irdadump_0.9.16.bb new file mode 100644 index 0000000000..98d28b60a3 --- /dev/null +++ b/packages/irda-utils/irdadump_0.9.16.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Utility to dump IrDA traffic." +SECTION = "base" +LICENSE = "GPL" +DEPENDS = "glib-1.2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz" + +S="${WORKDIR}/irda-utils-${PV}/irdadump" + +EXTRA_CFLAGS += "-I${STAGING_INCDIR}/glib-1.2/" +EXTRA_LDFLAGS += "-lglib" + +inherit autotools + +do_compile() { + oe_runmake CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}" LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}" +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${S}/shell/.libs/irdadump ${D}${bindir} +} -- cgit v1.2.3 From 07423bdbbb7ce2d14455d6b886d4b0156cd28a18 Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Fri, 5 May 2006 21:28:39 +0000 Subject: Merge of fix in oz354fam083 branch for familair bug 1606. --- packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 | 6 +++++- packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 index 97aeac5392..0c3aca3e10 100644 --- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 +++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 @@ -235,7 +235,11 @@ CONFIG_ALIGNMENT_TRAP=y # # Parallel port support # -# CONFIG_PARPORT is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_PCMCIA=m +CONFIG_PARPORT_NOT_PC=y # # Memory Technology Devices (MTD) diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 index ad30591336..dfff54a0d1 100644 --- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 +++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 @@ -235,7 +235,11 @@ CONFIG_ALIGNMENT_TRAP=y # # Parallel port support # -# CONFIG_PARPORT is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_PCMCIA=m +CONFIG_PARPORT_NOT_PC=y # # Memory Technology Devices (MTD) -- cgit v1.2.3 From fcb80fdd84521a656ec4e57dde83c10c7f589182 Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Mon, 8 May 2006 19:19:13 +0000 Subject: Phil's fix for glibc and mmap_threshold default. --- packages/glibc/glibc_2.3.5+cvs20050627.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index c8f1d56841..e164e5e537 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell " FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r3" +PR = "r4" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -95,7 +95,12 @@ do_munge() { addtask munge before do_patch after do_unpack +export default_mmap_threshold_familiar = "32*1024" + do_configure () { + if [ "x$default_mmap_threshold" != "x" ]; then + echo "malloc-CPPFLAGS=-DDEFAULT_MMAP_THRESHOLD=\"(${default_mmap_threshold})\"" >configparms + fi # override this function to avoid the autoconf/automake/aclocal/autoheader # calls for now # don't pass CPPFLAGS into configure, since it upsets the kernel-headers -- cgit v1.2.3 From 2b82709ff01a6f234554f2c952c1123c3fea17d7 Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Tue, 23 May 2006 20:25:22 +0000 Subject: Backing out PARPORT config since it causes oops on h3600. --- packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 | 6 +----- packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 index 0c3aca3e10..97aeac5392 100644 --- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 +++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 @@ -235,11 +235,7 @@ CONFIG_ALIGNMENT_TRAP=y # # Parallel port support # -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_PCMCIA=m -CONFIG_PARPORT_NOT_PC=y +# CONFIG_PARPORT is not set # # Memory Technology Devices (MTD) diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 index dfff54a0d1..ad30591336 100644 --- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 +++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 @@ -235,11 +235,7 @@ CONFIG_ALIGNMENT_TRAP=y # # Parallel port support # -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_PCMCIA=m -CONFIG_PARPORT_NOT_PC=y +# CONFIG_PARPORT is not set # # Memory Technology Devices (MTD) -- cgit v1.2.3 From de1d2a3d79046f46866116bbb47b5f5b1391938d Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Wed, 24 May 2006 19:03:09 +0000 Subject: The init script says it has restart in the usage. But it didn't have a restart in its list of cases. So this patch adds it. --- packages/kbdd/files/kbdd.init | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/kbdd/files/kbdd.init b/packages/kbdd/files/kbdd.init index c9e0a0deac..00aec07aa7 100644 --- a/packages/kbdd/files/kbdd.init +++ b/packages/kbdd/files/kbdd.init @@ -12,6 +12,11 @@ case $1 in killall kbdd ;; +'restart') + $0 stop + $o start + ;; + *) echo "usage: $0 { start | stop | restart }" ;; -- cgit v1.2.3 From 41f94a6622c5302ae0b6a20e96e55b1bdbfffaea Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Thu, 25 May 2006 15:15:24 +0000 Subject: documentation.conf: add to documentation - update RDEPENDS & PROVIDES - add RPROVIDES --- conf/documentation.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/documentation.conf b/conf/documentation.conf index 20bcc53f5f..b072ac8c67 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -63,8 +63,9 @@ HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net." GROUP_dependencies[doc] = "The keys in this group influence the dependency handling of BitBake \ and the resulting packages." DEPENDS[doc] = "Build time dependencies, things needed to build the package. @group dependencies" -RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run. @group dependencies" -PROVIDES[doc] = "Names for additional dependencies that this package will provide. @group dependencies" +RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run. This is used to populate the ipkg:Depends field. @group dependencies" +PROVIDES[doc] = "Names for additional build time dependencies that this package will provide. @group dependencies" +RPROVIDES[doc] = "Names for additional run time dependencies that this package will provide. This is used to populate the ipkg:Provides field. @group dependencies" # packaging @@ -98,4 +99,4 @@ SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread" COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names supported by the package/file. Failure to match will cause the file to be skipped by the parser." -COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser." \ No newline at end of file +COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser." -- cgit v1.2.3 From 9a5608bd2dc4af7f2584afcb35057a711270d091 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Thu, 25 May 2006 15:21:16 +0000 Subject: clearsilver 0.10.3: add clearsilver to OE --- packages/clearsilver/.mtn2git_empty | 0 packages/clearsilver/clearsilver_0.10.3.bb | 27 ++++++++++++ packages/clearsilver/files/.mtn2git_empty | 0 packages/clearsilver/files/crosscompile.patch | 59 +++++++++++++++++++++++++++ 4 files changed, 86 insertions(+) create mode 100644 packages/clearsilver/.mtn2git_empty create mode 100644 packages/clearsilver/clearsilver_0.10.3.bb create mode 100644 packages/clearsilver/files/.mtn2git_empty create mode 100644 packages/clearsilver/files/crosscompile.patch diff --git a/packages/clearsilver/.mtn2git_empty b/packages/clearsilver/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/clearsilver/clearsilver_0.10.3.bb b/packages/clearsilver/clearsilver_0.10.3.bb new file mode 100644 index 0000000000..0e5a86ede2 --- /dev/null +++ b/packages/clearsilver/clearsilver_0.10.3.bb @@ -0,0 +1,27 @@ +# Clearsilver +SECTION = "net" +DESCRIPTION = "Clearsilver is a fast, powerful, and language-neutral HTML template system" +LICENSE = "Neotonic ClearSilver License" +DEPENDS = "python" +MAINTAINER = "Cliff Brake " +PR = "r0" + +SRC_URI = "http://www.clearsilver.net/downloads/${P}.tar.gz \ + file://crosscompile.patch;patch=1" + +EXTRA_OECONF = "--disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp --enable-gettext --with-python=${STAGING_BINDIR}/python" + +inherit autotools + +FILES_${PN} += "/usr/lib/python*" + +do_compile() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} oe_runmake +} + +do_configure() { + gnu-configize + oe_runconf +} + + diff --git a/packages/clearsilver/files/.mtn2git_empty b/packages/clearsilver/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/clearsilver/files/crosscompile.patch b/packages/clearsilver/files/crosscompile.patch new file mode 100644 index 0000000000..1b73bd5576 --- /dev/null +++ b/packages/clearsilver/files/crosscompile.patch @@ -0,0 +1,59 @@ +Index: clearsilver-0.10.3/cgi/Makefile +=================================================================== +--- clearsilver-0.10.3.orig/cgi/Makefile ++++ clearsilver-0.10.3/cgi/Makefile +@@ -30,13 +30,13 @@ $(CGI_LIB): $(CGI_OBJ) + $(RANLIB) $@ + + $(STATIC_EXE): $(STATIC_OBJ) $(DEP_LIBS) +- $(LD) $@ $(STATIC_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS) ++ $(LD) $@ $(STATIC_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS) $(LDFLAGS) + + $(STATIC_CSO): $(STATIC_OBJ) $(DEP_LIBS) +- $(LDSHARED) -o $@ $(STATIC_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS) ++ $(LDSHARED) -o $@ $(STATIC_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS) $(LDFLAGS) + + $(CGICSTEST_EXE): $(CGICSTEST_OBJ) $(DEP_LIBS) +- $(LD) $@ $(CGICSTEST_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS) ++ $(LD) $@ $(CGICSTEST_OBJ) -L$(LIB_DIR) $(DLIBS) $(LIBS) $(LDFLAGS) + + install: all + $(NEOTONIC_ROOT)/mkinstalldirs $(DESTDIR)$(cs_includedir)/cgi +Index: clearsilver-0.10.3/cs/Makefile +=================================================================== +--- clearsilver-0.10.3.orig/cs/Makefile ++++ clearsilver-0.10.3/cs/Makefile +@@ -22,9 +22,9 @@ CSDUMP_EXE = csdump + CSDUMP_SRC = csdump.c + CSDUMP_OBJ = $(CSDUMP_SRC:%.c=%.o) + +-LIBS += -L$(LIB_DIR) -lneo_cs -lneo_utl # -lefence ++LIBS += -L$(LIB_DIR) -lneo_cs -lneo_utl $(LDFLAGS) # -lefence + +-TARGETS = $(CS_LIB) $(CSTEST_EXE) $(CSR_EXE) test ++TARGETS = $(CS_LIB) $(CSR_EXE) $(CSTEST_EXE) + + CS_TESTS = test.cs test2.cs test3.cs test4.cs test5.cs test6.cs test7.cs \ + test8.cs test9.cs test10.cs test11.cs test12.cs test13.cs \ +Index: clearsilver-0.10.3/python/Makefile +=================================================================== +--- clearsilver-0.10.3.orig/python/Makefile ++++ clearsilver-0.10.3/python/Makefile +@@ -11,7 +11,7 @@ NEO_UTIL_PYD = neo_cgi.pyd + NEO_UTIL_SRC = neo_cgi.c neo_util.c neo_cs.c + NEO_UTIL_OBJ = $(NEO_UTIL_SRC:%.c=%.o) + +-CFLAGS += $(PYTHON_INC) ++#CFLAGS += $(PYTHON_INC) + DLIBS += -lneo_cgi -lneo_cs -lneo_utl + LIBS += -L$(LIB_DIR) $(DLIBS) $(DB2_LIB) + +@@ -21,6 +21,8 @@ else + TARGETS = $(NEO_UTIL_SO) + endif + ++PYTHON_SITE = /usr/lib/python2.4/site-packages/ ++ + all: $(TARGETS) + + $(NEO_UTIL_SO): setup.py $(NEO_UTIL_SRC) $(DEP_LIBS) -- cgit v1.2.3 From 9125d5edcf62b504cb876afb8e70fd25ee01d157 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 25 May 2006 15:53:23 +0000 Subject: samba: Add samba-essential, a cut-down bare-bone samba server --- packages/samba/files/Managing-Samba.txt | 34 ++++ packages/samba/files/smb-essential.conf | 295 +++++++++++++++++++++++++++++++ packages/samba/samba-essential.inc | 37 ++++ packages/samba/samba-essential_3.0.20.bb | 61 +++++++ 4 files changed, 427 insertions(+) create mode 100644 packages/samba/files/Managing-Samba.txt create mode 100644 packages/samba/files/smb-essential.conf create mode 100644 packages/samba/samba-essential.inc create mode 100644 packages/samba/samba-essential_3.0.20.bb diff --git a/packages/samba/files/Managing-Samba.txt b/packages/samba/files/Managing-Samba.txt new file mode 100644 index 0000000000..079cf34e4b --- /dev/null +++ b/packages/samba/files/Managing-Samba.txt @@ -0,0 +1,34 @@ +This device is running a bare-bone Samba server which allows easy +transfer of files and directories between any networked desktop PC and +your networked PDA. + +Since it is generally a bad idea to allow everyone read and write access +to your PDA, you will have to configure at least one user to get access to +any shared folder but "tmp" (tmp is read-write for everyone). + +How to create a Samba user with password: + +- If you haven't already created a non-root user, do so now: + root@poodle:/usr/bin# adduser testuser + Changing password for testuser + Enter the new password (minimum of 5, maximum of 8 characters) + Please use a combination of upper and lower case letters and numbers. + Enter new password: + Bad password: too short. + + Warning: weak password (continuing). + Re-enter new password: + Password changed. + root@poodle:/usr/bin# + +- Note that the password you entered will _not_ be your samba password. + Samba uses its own password database. + +- Add a Samba password for your user: + root@poodle:/usr/bin# smbpasswd -a testuser + New SMB password: + Retype new SMB password: + Added user testuser. + root@poodle:/usr/bin# + +- Done ;) diff --git a/packages/samba/files/smb-essential.conf b/packages/samba/files/smb-essential.conf new file mode 100644 index 0000000000..29681f3a64 --- /dev/null +++ b/packages/samba/files/smb-essential.conf @@ -0,0 +1,295 @@ +# This is the main Samba configuration file. You should read the +# smb.conf(5) manual page in order to understand the options listed +# here. Samba has a huge number of configurable options (perhaps too +# many!) most of which are not shown in this example +# +# For a step to step guide on installing, configuring and using samba, +# read the Samba-HOWTO-Collection. This may be obtained from: +# http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf +# +# Many working examples of smb.conf files can be found in the +# Samba-Guide which is generated daily and can be downloaded from: +# http://www.samba.org/samba/docs/Samba-Guide.pdf +# +# Any line which starts with a ; (semi-colon) or a # (hash) +# is a comment and is ignored. In this example we will use a # +# for commentry and a ; for parts of the config file that you +# may wish to enable +# +# NOTE: Whenever you modify this file you should run the command "testparm" +# to check that you have not made any basic syntactic errors. +# +#======================= Global Settings ===================================== +[global] + +# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH + workgroup = ZAURUS + +# server string is the equivalent of the NT Description field + server string = OpenZaurus Samba Server + +# Security mode. Defines in which mode Samba will operate. Possible +# values are share, user, server, domain and ads. Most people will want +# user level security. See the Samba-HOWTO-Collection for details. + security = user + +# This option is important for security. It allows you to restrict +# connections to machines which are on your local network. The +# following example restricts access to two C class networks and +# the "loopback" interface. For more examples of the syntax see +# the smb.conf man page +; hosts allow = 192.168.1. 192.168.2. 127. + +# If you want to automatically load your printer list rather +# than setting them up individually then you'll need this + load printers = no + +# you may wish to override the location of the printcap file +; printcap name = /etc/printcap + +# on SystemV system setting printcap name to lpstat should allow +# you to automatically obtain a printer list from the SystemV spool +# system +; printcap name = lpstat + +# It should not be necessary to specify the print system type unless +# it is non-standard. Currently supported print systems include: +# bsd, cups, sysv, plp, lprng, aix, hpux, qnx +; printing = cups + +# Uncomment this if you want a guest account, you must add this to /etc/passwd +# otherwise the user "nobody" is used +; guest account = pcguest + +# this tells Samba to use a separate log file for each machine +# that connects + log file = /var/log.%m + +# Put a capping on the size of the log files (in Kb). + max log size = 50 + +# Use password server option only with security = server +# The argument list may include: +# password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name] +# or to auto-locate the domain controller/s +# password server = * +; password server = + +# Use the realm option only with security = ads +# Specifies the Active Directory realm the host is part of +; realm = MY_REALM + +# Backend to store user information in. New installations should +# use either tdbsam or ldapsam. smbpasswd is available for backwards +# compatibility. tdbsam requires no further configuration. +; passdb backend = tdbsam + +# Using the following line enables you to customise your configuration +# on a per machine basis. The %m gets replaced with the netbios name +# of the machine that is connecting. +# Note: Consider carefully the location in the configuration file of +# this line. The included file is read at that point. +; include = /usr/local/samba/lib/smb.conf.%m + +# Most people will find that this option gives better performance. +# See the chapter 'Samba performance issues' in the Samba HOWTO Collection +# and the manual pages for details. +# You may want to add the following on a Linux system: +# SO_RCVBUF=8192 SO_SNDBUF=8192 + socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 + +# Configure Samba to use multiple interfaces +# If you have multiple network interfaces then you must list them +# here. See the man page for details. +; interfaces = 192.168.12.2/24 192.168.13.2/24 + +# Browser Control Options: +# set local master to no if you don't want Samba to become a master +# browser on your network. Otherwise the normal election rules apply +; local master = yes + +# OS Level determines the precedence of this server in master browser +# elections. The default value should be reasonable +; os level = 33 + +# Domain Master specifies Samba to be the Domain Master Browser. This +# allows Samba to collate browse lists between subnets. Don't use this +# if you already have a Windows NT domain controller doing this job +; domain master = yes + +# Preferred Master causes Samba to force a local browser election on startup +# and gives it a slightly higher chance of winning the election +; preferred master = yes + +# Enable this if you want Samba to be a domain logon server for +# Windows95 workstations. +; domain logons = yes + +# if you enable domain logons then you may want a per-machine or +# per user logon script +# run a specific logon batch file per workstation (machine) +; logon script = %m.bat +# run a specific logon batch file per username +; logon script = %U.bat + +# Where to store roving profiles (only for Win95 and WinNT) +# %L substitutes for this servers netbios name, %U is username +# You must uncomment the [Profiles] share below +; logon path = \\%L\Profiles\%U + +# Windows Internet Name Serving Support Section: +# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server +; wins support = yes + +# WINS Server - Tells the NMBD components of Samba to be a WINS Client +# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both +; wins server = w.x.y.z + +# WINS Proxy - Tells Samba to answer name resolution queries on +# behalf of a non WINS capable client, for this to work there must be +# at least one WINS Server on the network. The default is NO. +; wins proxy = yes + +# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names +# via DNS nslookups. The default is NO. + dns proxy = no + +# These scripts are used on a domain controller or stand-alone +# machine to add or delete corresponding unix accounts +; add user script = /usr/sbin/useradd %u +; add group script = /usr/sbin/groupadd %g +; add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u +; delete user script = /usr/sbin/userdel %u +; delete user from group script = /usr/sbin/deluser %u %g +; delete group script = /usr/sbin/groupdel %g + + +#============================ Share Definitions ============================== +[homes] + comment = Home Directories + browseable = no + writable = yes + +# Un-comment the following and create the netlogon directory for Domain Logons +; [netlogon] +; comment = Network Logon Service +; path = /usr/local/samba/lib/netlogon +; guest ok = yes +; writable = no +; share modes = no + + +# Un-comment the following to provide a specific roving profile share +# the default is to use the user's home directory +;[Profiles] +; path = /usr/local/samba/profiles +; browseable = no +; guest ok = yes + + +# This one is useful for people to share files +[tmp] + comment = Temporary file space + path = /tmp + read only = no + public = yes + +[CompactFlash] + comment = Compact Flash Storage + path = /media/cf + writable = yes + printable = no + public = no + +[SD-MMC] + comment = SD & MMC Storage + path = /media/card + writable = yes + printable = no + public = no + +[RootFS] + comment = Zaurus Rootfs + path = / + writable = yes + printable = no + public = no + +[Samba-Help] + comment = How to configure Samba + path = /usr/share/samba/help + writable = no + public = yes + printable = no + +# A publicly accessible directory, but read only, except for people in +# the "staff" group +;[public] +; comment = Public Stuff +; path = /home/samba +; public = yes +; writable = yes +; printable = no +; write list = @staff + +# Other examples. +# +# A private printer, usable only by fred. Spool data will be placed in fred's +# home directory. Note that fred must have write access to the spool directory, +# wherever it is. +;[fredsprn] +; comment = Fred's Printer +; valid users = fred +; path = /homes/fred +; printer = freds_printer +; public = no +; writable = no +; printable = yes + +# A private directory, usable only by fred. Note that fred requires write +# access to the directory. +;[fredsdir] +; comment = Fred's Service +; path = /usr/somewhere/private +; valid users = fred +; public = no +; writable = yes +; printable = no + +# a service which has a different directory for each machine that connects +# this allows you to tailor configurations to incoming machines. You could +# also use the %U option to tailor it by user name. +# The %m gets replaced with the machine name that is connecting. +;[pchome] +; comment = PC Directories +; path = /usr/pc/%m +; public = no +; writable = yes + +# A publicly accessible directory, read/write to all users. Note that all files +# created in the directory by users will be owned by the default user, so +# any user with access can delete any other user's files. Obviously this +# directory must be writable by the default user. Another user could of course +# be specified, in which case all files would be owned by that user instead. +;[public] +; path = /usr/somewhere/else/public +; public = yes +; only guest = yes +; writable = yes +; printable = no + +# The following two entries demonstrate how to share a directory so that two +# users can place files there that will be owned by the specific users. In this +# setup, the directory should be writable by both users and should have the +# sticky bit set on it to prevent abuse. Obviously this could be extended to +# as many users as required. +;[myshare] +; comment = Mary's and Fred's stuff +; path = /usr/somewhere/shared +; valid users = mary fred +; public = no +; writable = yes +; printable = no +; create mask = 0765 + + diff --git a/packages/samba/samba-essential.inc b/packages/samba/samba-essential.inc new file mode 100644 index 0000000000..55d14c2a4c --- /dev/null +++ b/packages/samba/samba-essential.inc @@ -0,0 +1,37 @@ +SECTION = "console/network" +DEPENDS = readline +LICENSE = "GPL" + +inherit autotools + +EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \ + --without-ads --without-automount --without-smbmount --without-syslog \ + --without-ldapsam --without-quotas --without-nisplus-home \ + --without-sys-quotas --without-libsmbclient --without-winbind \ + --without-acl-support' + +do_configure_prepend () { + ./script/mkversion.sh + if [ ! -e acinclude.m4 ]; then + cat aclocal.m4 > acinclude.m4 + fi +} + +do_compile () { + oe_runmake proto_exists + base_do_compile +} + +do_install_append() { + rm -f ${D}${bindir}/*.old + rm -f ${D}${sbindir}/*.old + + mkdir -p ${D}/sbin/ +} + +do_install_prepend() { + + mkdir -p ${D}/sbin/ + +} + diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb new file mode 100644 index 0000000000..21130bb0ab --- /dev/null +++ b/packages/samba/samba-essential_3.0.20.bb @@ -0,0 +1,61 @@ +PR = "r1" + +SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ + file://configure.patch;patch=1 \ + file://cifs.patch;patch=1 \ + file://config-lfs.patch;patch=1 \ + file://init \ + file://quota.patch;patch=1;pnum=0 \ + file://smb-essential.conf \ + file://Managing-Samba.txt" + +S := ${WORKDIR}/samba-${PV}/source + +RCONFILCTS = samba + +include samba-essential.inc +inherit update-rc.d + +INITSCRIPT_NAME = "samba" +# No dependencies, goes in at level 20 (NOTE: take care with the +# level, later levels put the shutdown later too - see the links +# in rc6.d, the shutdown must precede network shutdown). +INITSCRIPT_PARAMS = "defaults" +CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" + +# The file system settings --foodir=dirfoo and overridden unconditionally +# in the samba config by --with-foodir=dirfoo - even if the --with is not +# specified! Fix that here. Set the privatedir to /etc/samba/private. +EXTRA_OECONF += "\ + --with-configdir=${sysconfdir}/samba \ + --with-privatedir=${sysconfdir}/samba/private \ + --with-lockdir=${localstatedir}/lock \ + --with-piddir=${localstatedir}/run \ + --with-logfilebase=${localstatedir}/log \ + --with-libdir=${libdir} \ + --with-mandir=${mandir} \ + " + +do_install_append() { + install -d "${D}${localstatedir}/log" + rm -f ${D}/sbin/mount.smbfs + rmdir ${D}/sbin + install -d "${D}${sysconfdir}/init.d" + install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba + + install -d "${D}${sysconfdir}/samba" + install -d "${D}/usr/share/samba/help" + + install ${WORKDIR}/smb-essential.conf "${D}${sysconfdir}/samba/smb.conf" + install ${WORKDIR}/Managing-Samba.txt ${D}/usr/share/samba/help + +} + +FILES_${PN} = "${bindir}/smbpasswd \ + ${sbindir}/nmbd \ + ${sbindir}/smbd \ + ${libdir}/charset \ + ${libdir}/vfs \ + ${libdir}/*.dat \ + /usr/share/samba \ + /etc" -- cgit v1.2.3 From af10842f3a8a80c39d97ca7aa725ae9fb24fd195 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 25 May 2006 16:34:58 +0000 Subject: gcc: add gcc 4.1.1 toolchain --- packages/gcc/gcc-4.1.1/.mtn2git_empty | 0 packages/gcc/gcc-4.1.1/arm-nolibfloat.patch | 24 +++++++++ packages/gcc/gcc-4.1.1/arm-softfloat.patch | 16 ++++++ packages/gcc/gcc-4.1.1/armeb-fix.patch | 62 ++++++++++++++++++++++ packages/gcc/gcc-4.1.1/gcc-4.1.0/.mtn2git_empty | 0 .../gcc/gcc-4.1.1/gcc-4.1.0/arm-nolibfloat.patch | 24 +++++++++ .../gcc/gcc-4.1.1/gcc-4.1.0/arm-softfloat.patch | 16 ++++++ packages/gcc/gcc-4.1.1/gcc-4.1.0/armeb-fix.patch | 62 ++++++++++++++++++++++ packages/gcc/gcc-4.1.1/gcc-4.1.0/ldflags.patch | 22 ++++++++ .../gcc-4.1.0/zecke-no-host-includes.patch | 31 +++++++++++ packages/gcc/gcc-4.1.1/ldflags.patch | 22 ++++++++ packages/gcc/gcc-cross-initial_4.1.1.bb | 30 +++++++++++ packages/gcc/gcc-cross_4.1.1.bb | 18 +++++++ packages/gcc/gcc_4.1.1.bb | 26 +++++++++ 14 files changed, 353 insertions(+) create mode 100644 packages/gcc/gcc-4.1.1/.mtn2git_empty create mode 100644 packages/gcc/gcc-4.1.1/arm-nolibfloat.patch create mode 100644 packages/gcc/gcc-4.1.1/arm-softfloat.patch create mode 100644 packages/gcc/gcc-4.1.1/armeb-fix.patch create mode 100644 packages/gcc/gcc-4.1.1/gcc-4.1.0/.mtn2git_empty create mode 100644 packages/gcc/gcc-4.1.1/gcc-4.1.0/arm-nolibfloat.patch create mode 100644 packages/gcc/gcc-4.1.1/gcc-4.1.0/arm-softfloat.patch create mode 100644 packages/gcc/gcc-4.1.1/gcc-4.1.0/armeb-fix.patch create mode 100644 packages/gcc/gcc-4.1.1/gcc-4.1.0/ldflags.patch create mode 100644 packages/gcc/gcc-4.1.1/gcc-4.1.0/zecke-no-host-includes.patch create mode 100644 packages/gcc/gcc-4.1.1/ldflags.patch create mode 100644 packages/gcc/gcc-cross-initial_4.1.1.bb create mode 100644 packages/gcc/gcc-cross_4.1.1.bb create mode 100644 packages/gcc/gcc_4.1.1.bb diff --git a/packages/gcc/gcc-4.1.1/.mtn2git_empty b/packages/gcc/gcc-4.1.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.1.1/arm-nolibfloat.patch b/packages/gcc/gcc-4.1.1/arm-nolibfloat.patch new file mode 100644 index 0000000000..c4897c0330 --- /dev/null +++ b/packages/gcc/gcc-4.1.1/arm-nolibfloat.patch @@ -0,0 +1,24 @@ +# Dimitry Andric , 2004-05-01 +# +# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed +# anymore. (The required functions are now in libgcc.) +# +# Fixes errors like +# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat +# collect2: ld returned 1 exit status +# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1 +# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat + +Index: gcc-4.0.2/gcc/config/arm/linux-elf.h +=================================================================== +--- gcc-4.0.2.orig/gcc/config/arm/linux-elf.h 2005-03-04 16:14:01.000000000 +0000 ++++ gcc-4.0.2/gcc/config/arm/linux-elf.h 2005-11-11 18:02:54.000000000 +0000 +@@ -56,7 +56,7 @@ + %{shared:-lc} \ + %{!shared:%{profile:-lc_p}%{!profile:-lc}}" + +-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" ++#define LIBGCC_SPEC "-lgcc" + + /* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add + the GNU/Linux magical crtbegin.o file (see crtstuff.c) which diff --git a/packages/gcc/gcc-4.1.1/arm-softfloat.patch b/packages/gcc/gcc-4.1.1/arm-softfloat.patch new file mode 100644 index 0000000000..c86c83ed15 --- /dev/null +++ b/packages/gcc/gcc-4.1.1/arm-softfloat.patch @@ -0,0 +1,16 @@ +Index: gcc-4.0.2/gcc/config/arm/t-linux +=================================================================== +--- gcc-4.0.2.orig/gcc/config/arm/t-linux 2004-05-15 12:41:35.000000000 +0000 ++++ gcc-4.0.2/gcc/config/arm/t-linux 2005-11-11 16:07:53.000000000 +0000 +@@ -4,7 +4,10 @@ + LIBGCC2_DEBUG_CFLAGS = -g0 + + LIB1ASMSRC = arm/lib1funcs.asm +-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx ++LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ ++ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ ++ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ ++ _fixsfsi _fixunssfsi _floatdidf _floatdisf + + # MULTILIB_OPTIONS = mhard-float/msoft-float + # MULTILIB_DIRNAMES = hard-float soft-float diff --git a/packages/gcc/gcc-4.1.1/armeb-fix.patch b/packages/gcc/gcc-4.1.1/armeb-fix.patch new file mode 100644 index 0000000000..42bb4ea9ab --- /dev/null +++ b/packages/gcc/gcc-4.1.1/armeb-fix.patch @@ -0,0 +1,62 @@ +--- gcc-4.0-20050305/gcc/config/arm/linux-elf.h.orig 2005-03-23 18:44:54.822707377 +0100 ++++ gcc-4.0-20050305/gcc/config/arm/linux-elf.h 2005-03-23 18:46:18.228560206 +0100 +@@ -31,19 +31,33 @@ + /* Do not assume anything about header files. */ + #define NO_IMPLICIT_EXTERN_C + ++/* ++ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for ++ * arm*b-*-linux* (big endian) configurations. ++ */ ++#if TARGET_BIG_ENDIAN_DEFAULT ++#define TARGET_ENDIAN_DEFAULT ARM_FLAG_BIG_END ++#define TARGET_ENDIAN_OPTION "mbig-endian" ++#define TARGET_LINKER_EMULATION "armelfb_linux" ++#else ++#define TARGET_ENDIAN_DEFAULT 0 ++#define TARGET_ENDIAN_OPTION "mlittle-endian" ++#define TARGET_LINKER_EMULATION "armelf_linux" ++#endif ++ + #undef TARGET_DEFAULT_FLOAT_ABI + #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD + + #undef TARGET_DEFAULT +-#define TARGET_DEFAULT (0) ++#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT) + + #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6 + +-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p" ++#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p" + + #undef MULTILIB_DEFAULTS + #define MULTILIB_DEFAULTS \ +- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" } ++ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" } + + /* The GNU C++ standard library requires that these macros be defined. */ + #undef CPLUSPLUS_CPP_SPEC +@@ -90,7 +104,7 @@ + %{rdynamic:-export-dynamic} \ + %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \ + -X \ +- %{mbig-endian:-EB}" \ ++ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \ + SUBTARGET_EXTRA_LINK_SPEC + + #define TARGET_OS_CPP_BUILTINS() \ +--- gcc-4.0-20050305/gcc/config.gcc.orig 2005-03-23 18:46:23.318105335 +0100 ++++ gcc-4.0-20050305/gcc/config.gcc 2005-03-23 18:47:41.592546386 +0100 +@@ -650,6 +650,11 @@ + ;; + arm*-*-linux*) # ARM GNU/Linux with ELF + tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h" ++ case $target in ++ arm*b-*-linux*) ++ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1" ++ ;; ++ esac + tmake_file="${tmake_file} arm/t-arm arm/t-linux" + extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o" + gnu_ld=yes diff --git a/packages/gcc/gcc-4.1.1/gcc-4.1.0/.mtn2git_empty b/packages/gcc/gcc-4.1.1/gcc-4.1.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.1.1/gcc-4.1.0/arm-nolibfloat.patch b/packages/gcc/gcc-4.1.1/gcc-4.1.0/arm-nolibfloat.patch new file mode 100644 index 0000000000..c4897c0330 --- /dev/null +++ b/packages/gcc/gcc-4.1.1/gcc-4.1.0/arm-nolibfloat.patch @@ -0,0 +1,24 @@ +# Dimitry Andric , 2004-05-01 +# +# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed +# anymore. (The required functions are now in libgcc.) +# +# Fixes errors like +# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat +# collect2: ld returned 1 exit status +# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1 +# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat + +Index: gcc-4.0.2/gcc/config/arm/linux-elf.h +=================================================================== +--- gcc-4.0.2.orig/gcc/config/arm/linux-elf.h 2005-03-04 16:14:01.000000000 +0000 ++++ gcc-4.0.2/gcc/config/arm/linux-elf.h 2005-11-11 18:02:54.000000000 +0000 +@@ -56,7 +56,7 @@ + %{shared:-lc} \ + %{!shared:%{profile:-lc_p}%{!profile:-lc}}" + +-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" ++#define LIBGCC_SPEC "-lgcc" + + /* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add + the GNU/Linux magical crtbegin.o file (see crtstuff.c) which diff --git a/packages/gcc/gcc-4.1.1/gcc-4.1.0/arm-softfloat.patch b/packages/gcc/gcc-4.1.1/gcc-4.1.0/arm-softfloat.patch new file mode 100644 index 0000000000..c86c83ed15 --- /dev/null +++ b/packages/gcc/gcc-4.1.1/gcc-4.1.0/arm-softfloat.patch @@ -0,0 +1,16 @@ +Index: gcc-4.0.2/gcc/config/arm/t-linux +=================================================================== +--- gcc-4.0.2.orig/gcc/config/arm/t-linux 2004-05-15 12:41:35.00000000