diff options
47 files changed, 1413 insertions, 264 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 0d29de144a..1da58a924e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -199,7 +199,7 @@ oe_libinstall() { oefatal "oe_libinstall: $dir/$f not found." fi elif [ -L "$f" ]; then - __runcmd cp --no-dereference "$f" $destpath/ + __runcmd cp -P "$f" $destpath/ elif [ ! -L "$f" ]; then libfile="$f" __runcmd install -m 0755 $libfile $destpath/ diff --git a/conf/bitbake.conf b/conf/bitbake.conf index caba7b51d5..1df713f2eb 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -364,7 +364,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" # when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything. # # This works for functions as well, they are really just environment variables. -OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}" +OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}" ################################################################## # Include the rest of the config files. diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb index 3e1f51afd4..ec29ad9cb8 100644 --- a/packages/classpath/classpath_0.14.bb +++ b/packages/classpath/classpath_0.14.bb @@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "libs" PR = "r0" -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango jikes-native" +DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ diff --git a/packages/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb index 3e1f51afd4..ec29ad9cb8 100644 --- a/packages/classpath/classpath_0.15.bb +++ b/packages/classpath/classpath_0.15.bb @@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "libs" PR = "r0" -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango jikes-native" +DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ diff --git a/packages/classpath/classpath_0.16.bb b/packages/classpath/classpath_0.16.bb new file mode 100644 index 0000000000..ec29ad9cb8 --- /dev/null +++ b/packages/classpath/classpath_0.16.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "GNU Classpath standard Java libraries" +HOMEPAGE = "http://www.gnu.org/software/classpath/" +LICENSE = "Classpath" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "libs" +PR = "r0" + +DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" +RDEPENDS_${PN} = "${PN}-common (${PV})" + +SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ + file://disable-automake-checks.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--with-jikes" + +PACKAGES += " ${PN}-common ${PN}-examples" + +FILES_${PN} = "${libdir}/${PN}" +FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" +FILES_${PN}-examples = "${datadir}/${PN}/examples" + +do_install() { + autotools_do_install + mv ${D}${libdir}/security ${D}${libdir}/${PN} +} diff --git a/packages/udev/udev-042/.mtn2git_empty b/packages/gmp/gmp-4.1.4/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/udev/udev-042/.mtn2git_empty +++ b/packages/gmp/gmp-4.1.4/.mtn2git_empty diff --git a/packages/gmp/gmp-4.1.4/amd64.patch b/packages/gmp/gmp-4.1.4/amd64.patch new file mode 100644 index 0000000000..67be9dd350 --- /dev/null +++ b/packages/gmp/gmp-4.1.4/amd64.patch @@ -0,0 +1,14 @@ +--- gmp-4.1.4/longlong.h.orig 2004-04-22 00:34:28.000000000 +0200 ++++ gmp-4.1.4/longlong.h 2005-07-18 01:13:06.000000000 +0200 +@@ -738,8 +738,10 @@ + count is only an int. */ + #define count_trailing_zeros(count, x) \ + do { \ ++ UDItype __cbtmp; \ + ASSERT ((x) != 0); \ +- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \ ++ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ ++ (count) = __cbtmp; \ + } while (0) + #endif /* x86_64 */ + diff --git a/packages/gmp/gmp-4.1.4/configure.patch b/packages/gmp/gmp-4.1.4/configure.patch new file mode 100644 index 0000000000..4b6c4ec636 --- /dev/null +++ b/packages/gmp/gmp-4.1.4/configure.patch @@ -0,0 +1,837 @@ +--- gmp-1.4.4/acinclude.m4.orig 2004-09-21 15:03:09.000000000 +0200 ++++ gmp-1.4.4/acinclude.m4 2005-07-18 01:09:00.000000000 +0200 +@@ -21,10 +21,10 @@ + dnl MA 02111-1307, USA. + + +-define(X86_PATTERN, ++define([X86_PATTERN], + [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-*]]) + +-define(POWERPC64_PATTERN, ++define([POWERPC64_PATTERN], + [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-*]]) + + +@@ -32,7 +32,7 @@ + dnl ---------------------- + dnl Strip entries */subdir from $path. + +-define(GMP_STRIP_PATH, ++define([GMP_STRIP_PATH], + [tmp_path= + for i in $path; do + case $i in +@@ -53,7 +53,7 @@ + dnl GMP_INCLUDE_GMP_H_BITS_PER_MP_LIMB starts as a dummy, but gets + dnl redefined in GMP_C_SIZES when the right value is known. + +-define(GMP_INCLUDE_GMP_H, ++define([GMP_INCLUDE_GMP_H], + [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ + #define GMP_NAIL_BITS $GMP_NAIL_BITS] + GMP_INCLUDE_GMP_H_BITS_PER_MP_LIMB +@@ -61,7 +61,7 @@ + #include "$srcdir/gmp-h.in"] + ]) + +-define(GMP_INCLUDE_GMP_H_BITS_PER_MP_LIMB, ++define([GMP_INCLUDE_GMP_H_BITS_PER_MP_LIMB], + [[#define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */ + #define GMP_LIMB_BITS 123]]) + +@@ -72,7 +72,7 @@ + dnl FILE. The regexps here aren't very rugged, but are enough for gmp. + dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted. + +-define(GMP_HEADER_GETVAL, ++define([GMP_HEADER_GETVAL], + [patsubst(patsubst( + esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]), + [^.*$1[ ]+],[]), +@@ -86,7 +86,7 @@ + dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits + dnl like 3.0.1 if patchlevel > 0. + +-define(GMP_VERSION, ++define([GMP_VERSION], + [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl + .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl + ifelse(m4_eval(GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in) > 0),1, +@@ -97,13 +97,13 @@ + dnl ------------------------------ + dnl Setup an AC_SUBST of HAVE_FUNC_01 for each argument. + +-AC_DEFUN(GMP_SUBST_CHECK_FUNCS, ++AC_DEFUN([GMP_SUBST_CHECK_FUNCS], + [m4_if([$1],,, + [_GMP_SUBST_CHECK_FUNCS(ac_cv_func_[$1],HAVE_[]m4_translit([$1],[a-z],[A-Z])_01) + GMP_SUBST_CHECK_FUNCS(m4_shift($@))])]) + + dnl Called: _GMP_SUBST_CHECK_FUNCS(cachvar,substvar) +-AC_DEFUN(_GMP_SUBST_CHECK_FUNCS, ++AC_DEFUN([_GMP_SUBST_CHECK_FUNCS], + [case $[$1] in + yes) AC_SUBST([$2],1) ;; + no) [$2]=0 ;; +@@ -115,14 +115,14 @@ + dnl ---------------------------------- + dnl Setup an AC_SUBST of HAVE_FOO_H_01 for each argument. + +-AC_DEFUN(GMP_SUBST_CHECK_HEADERS, ++AC_DEFUN([GMP_SUBST_CHECK_HEADERS], + [m4_if([$1],,, + [_GMP_SUBST_CHECK_HEADERS(ac_cv_header_[]m4_translit([$1],[./],[__]), + HAVE_[]m4_translit([$1],[a-z./],[A-Z__])_01) + GMP_SUBST_CHECK_HEADERS(m4_shift($@))])]) + + dnl Called: _GMP_SUBST_CHECK_HEADERS(cachvar,substvar) +-AC_DEFUN(_GMP_SUBST_CHECK_HEADERS, ++AC_DEFUN([_GMP_SUBST_CHECK_HEADERS], + [case $[$1] in + yes) AC_SUBST([$2],1) ;; + no) [$2]=0 ;; +@@ -145,12 +145,12 @@ + dnl would test whether $major.$minor.$subminor is greater than or equal to + dnl 10.3.1. + +-AC_DEFUN(GMP_COMPARE_GE, ++AC_DEFUN([GMP_COMPARE_GE], + [gmp_compare_ge=no + GMP_COMPARE_GE_INTERNAL($@) + ]) + +-AC_DEFUN(GMP_COMPARE_GE_INTERNAL, ++AC_DEFUN([GMP_COMPARE_GE_INTERNAL], + [ifelse(len([$3]),0, + [if test -n "$1" && test "$1" -ge $2; then + gmp_compare_ge=yes +@@ -184,7 +184,7 @@ + dnl for instance to random.o (and others) on vax-dec-ultrix4.5. Naturally + dnl a user-selected $AR_FLAGS is left unchanged. + +-AC_DEFUN(GMP_PROG_AR, ++AC_DEFUN([GMP_PROG_AR], + [dnl Want to establish $AR before libtool initialization. + AC_BEFORE([$0],[AC_PROG_LIBTOOL]) + gmp_user_AR=$AR +@@ -212,7 +212,7 @@ + dnl CC_FOR_BUILD is used without testing. CC_FOR_BUILD is the new name for + dnl a build system compiler, see configfsf.guess. + +-AC_DEFUN(GMP_PROG_HOST_CC, ++AC_DEFUN([GMP_PROG_HOST_CC], + [AC_BEFORE([$0],[AC_PROG_LIBTOOL]) + AC_REQUIRE([AC_PROG_CC]) + AC_CACHE_CHECK([for HOST_CC build system compiler], +@@ -255,7 +255,7 @@ + dnl FIXME: This can be removed and just AM_PROG_LEX used, one that macro + dnl works properly. + +-AC_DEFUN(GMP_PROG_LEX, ++AC_DEFUN([GMP_PROG_LEX], + [AC_REQUIRE([AC_PROG_LEX]) + if test "$LEX" = :; then + LEX=${am_missing_run}flex +@@ -273,7 +273,7 @@ + dnl + dnl See mpn/asm-defs.m4 for details on the known bad m4s. + +-AC_DEFUN(GMP_PROG_M4, ++AC_DEFUN([GMP_PROG_M4], + [AC_ARG_VAR(M4,[m4 macro processor]) + AC_CACHE_CHECK([for suitable m4], + gmp_cv_prog_m4, +@@ -340,7 +340,7 @@ + dnl Enhancement: Maybe this could be in GMP_PROG_M4, and attempt to prefer + dnl an m4 with a working m4wrap, if it can be found. + +-AC_DEFUN(GMP_M4_M4WRAP_SPURIOUS, ++AC_DEFUN([GMP_M4_M4WRAP_SPURIOUS], + [AC_REQUIRE([GMP_PROG_M4]) + AC_CACHE_CHECK([if m4wrap produces spurious output], + gmp_cv_m4_m4wrap_spurious, +@@ -374,7 +374,7 @@ + dnl A user-selected $NM is always left unchanged. AC_PROG_NM is still run + dnl to get the "checking" message printed though. + +-AC_DEFUN(GMP_PROG_NM, ++AC_DEFUN([GMP_PROG_NM], + [dnl Make sure we're the first to call AC_PROG_NM, so our extra flags are + dnl used by everyone. + AC_BEFORE([$0],[AC_PROG_NM]) +@@ -426,7 +426,7 @@ + dnl will run is that a plain native "./configure" falls back on ABI=32, but + dnl ABI=64 is still available as a cross-compile. + +-AC_DEFUN(GMP_PROG_CC_WORKS, ++AC_DEFUN([GMP_PROG_CC_WORKS], + [AC_MSG_CHECKING([compiler $1]) + cat >conftest.c <<EOF + +@@ -481,7 +481,7 @@ + dnl cache the result. The same "ifndef" style test is used, to avoid + dnl problems with syntax checking cpp's used on NeXT and Apple systems. + +-AC_DEFUN(GMP_PROG_CC_IS_GNU, ++AC_DEFUN([GMP_PROG_CC_IS_GNU], + [cat >conftest.c <<EOF + #ifndef __GNUC__ + choke me +@@ -508,7 +508,7 @@ + dnl there is one then it's well hidden in xlc 3.1 on AIX 4.3, so just grep + dnl the man page printed when xlc is invoked with no arguments. + +-AC_DEFUN(GMP_PROG_CC_IS_XLC, ++AC_DEFUN([GMP_PROG_CC_IS_XLC], + [gmp_command="$1 2>&1 | grep xlc >/dev/null" + if AC_TRY_EVAL(gmp_command); then + AC_MSG_CHECKING([whether $1 is xlc]) +@@ -527,7 +527,7 @@ + dnl This test might be repeated for different compilers, so the result is + dnl not cached. + +-AC_DEFUN(GMP_HPC_HPPA_2_0, ++AC_DEFUN([GMP_HPC_HPPA_2_0], + [AC_MSG_CHECKING([whether HP compiler $1 is good for 64-bits]) + # Bad compiler output: + # ccom: HP92453-01 G.10.32.05 HP C Compiler +@@ -571,7 +571,7 @@ + dnl + dnl There's no caching here, so that different CC's can be tested. + +-AC_DEFUN(GMP_GCC_VERSION_GE, ++AC_DEFUN([GMP_GCC_VERSION_GE], + [tmp_version=`($1 --version) 2>&AC_FD_CC` + echo "$1 --version '$tmp_version'" >&AC_FD_CC + +@@ -608,7 +608,7 @@ + dnl size==1 case in mpn/generic/mode1o.c, and this shows up in + dnl tests/mpz/t-jac.c as a wrong result from mpz_kronecker_ui. + +-AC_DEFUN(GMP_GCC_ARM_UMODSI, ++AC_DEFUN([GMP_GCC_ARM_UMODSI], + [AC_MSG_CHECKING([whether ARM gcc unsigned division works]) + tmp_version=`$1 --version` + echo "$tmp_version" >&AC_FD_CC +@@ -635,7 +635,7 @@ + dnl This macro is used only once, after finalizing a choice of CC, so the + dnl result is cached. + +-AC_DEFUN(GMP_GCC_MARCH_PENTIUMPRO, ++AC_DEFUN([GMP_GCC_MARCH_PENTIUMPRO], + [AC_CACHE_CHECK([whether gcc -march=pentiumpro is good], + gmp_cv_gcc_march_pentiumpro, + [GMP_GCC_VERSION_GE([$1], 2,95,4) +@@ -659,7 +659,7 @@ + dnl gets rearranged or rewritten so the ICE doesn't happen then this can be + dnl removed. + +-AC_DEFUN(GMP_GCC_M68K_OPTIMIZE, ++AC_DEFUN([GMP_GCC_M68K_OPTIMIZE], + [case $host in + m68*-*-*) + if test $1 = gcc; then +@@ -681,7 +681,7 @@ + dnl gcc 2.95 accepts -mabi=32 but it only works on irix5, on irix6 it gives + dnl "cc1: The -mabi=32 support does not work yet". + +-AC_DEFUN(GMP_GCC_MIPS_O32, ++AC_DEFUN([GMP_GCC_MIPS_O32], + [AC_MSG_CHECKING([whether gcc supports o32]) + echo 'int x;' >conftest.c + echo "$1 -mabi=32 -c conftest.c" >&AC_FD_CC +@@ -716,7 +716,7 @@ + dnl watch for that and decide against the option in that case, to avoid + dnl confusing the user. + +-AC_DEFUN(GMP_GCC_NO_CPP_PRECOMP, ++AC_DEFUN([GMP_GCC_NO_CPP_PRECOMP], + [if test "$ccbase" = gcc; then + AC_MSG_CHECKING([compiler $2 $3 -no-cpp-precomp]) + result=no +@@ -752,7 +752,7 @@ + dnl This is intended for use on alpha, since only recent versions of gas + dnl accept -mev67, but there's nothing here that's alpha specific. + +-AC_DEFUN(GMP_GCC_WA_MCPU, ++AC_DEFUN([GMP_GCC_WA_MCPU], + [AC_MSG_CHECKING([assembler $1 $2]) + result=no + cat >conftest.c <<EOF +@@ -783,7 +783,7 @@ + dnl This test is designed to be run repeatedly with different cxx/cxxflags + dnl selections, so the result is not cached. + +-AC_DEFUN(GMP_PROG_CXX_WORKS, ++AC_DEFUN([GMP_PROG_CXX_WORKS], + [AC_MSG_CHECKING([C++ compiler $1]) + cat >conftest.cc <<EOF + #include <iostream> +@@ -817,7 +817,7 @@ + dnl FIXME: The generated config.m4 doesn't get recreated by config.status. + dnl Maybe the relevant "echo"s should go through AC_CONFIG_COMMANDS. + +-AC_DEFUN(GMP_INIT, ++AC_DEFUN([GMP_INIT], + [ifelse([$1], , gmp_configm4=config.m4, gmp_configm4="[$1]") + gmp_tmpconfigm4=cnfm4.tmp + gmp_tmpconfigm4i=cnfm4i.tmp +@@ -834,7 +834,9 @@ + echo ["define(<CONFIG_TOP_SRCDIR>,<\`$tmp'>)"] >>$gmp_tmpconfigm4 + + # All CPUs use asm-defs.m4 +-echo ["include(CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4')"] >>$gmp_tmpconfigm4i ++echo -n ["include("] >>$gmp_tmpconfigm4i ++echo -n ["CONFIG_TOP_SRCDIR\`/mpn/asm-defs.m4'"] >>$gmp_tmpconfigm4i ++echo [")"] >>$gmp_tmpconfigm4i + ]) + + +@@ -855,7 +857,7 @@ + dnl having a whole file as a macro argument would overflow the string space + dnl on BSD m4. + +-AC_DEFUN(GMP_FINISH, ++AC_DEFUN([GMP_FINISH], + [AC_REQUIRE([GMP_INIT]) + echo "creating $gmp_configm4" + echo ["d""nl $gmp_configm4. Generated automatically by configure."] > $gmp_configm4 +@@ -889,7 +891,7 @@ + dnl GMP_INCLUDE_MPN(`x86/x86-defs.m4') + dnl + +-AC_DEFUN(GMP_INCLUDE_MPN, ++AC_DEFUN([GMP_INCLUDE_MPN], + [AC_REQUIRE([GMP_INIT]) + echo ["include_mpn(\`$1')"] >> $gmp_tmpconfigm4i + ]) +@@ -905,7 +907,7 @@ + dnl create file config.m4. config.m4 uses `<' and '>' as quote characters + dnl for all defines. + +-AC_DEFUN(GMP_DEFINE, ++AC_DEFUN([GMP_DEFINE], + [AC_REQUIRE([GMP_INIT]) + echo ['define(<$1>, <$2>)'] >>ifelse([$3], [POST], + $gmp_tmpconfigm4p, $gmp_tmpconfigm4) +@@ -920,7 +922,7 @@ + dnl directives inserted by GMP_INCLUDE. Don't forget to invoke GMP_FINISH + dnl to create file config.m4. + +-AC_DEFUN(GMP_DEFINE_RAW, ++AC_DEFUN([GMP_DEFINE_RAW], + [AC_REQUIRE([GMP_INIT]) + echo [$1] >> ifelse([$2], [POST], $gmp_tmpconfigm4p, $gmp_tmpconfigm4) + ]) +@@ -938,7 +940,7 @@ + dnl This is not unlike AC_TRY_COMPILE, but there's no default includes or + dnl anything in "asm-code", everything wanted must be given explicitly. + +-AC_DEFUN(GMP_TRY_ASSEMBLE, ++AC_DEFUN([GMP_TRY_ASSEMBLE], + [cat >conftest.s <<EOF + [$1] + EOF +@@ -960,7 +962,7 @@ + dnl -------------------- + dnl Should a label have a colon or not? + +-AC_DEFUN(GMP_ASM_LABEL_SUFFIX, ++AC_DEFUN([GMP_ASM_LABEL_SUFFIX], + [AC_CACHE_CHECK([what assembly label suffix to use], + gmp_cv_asm_label_suffix, + [case $host in +@@ -984,7 +986,7 @@ + dnl in particular that grepping doesn't work with SunOS 4 native grep since + dnl that grep seems to have trouble with '\0's in files. + +-AC_DEFUN(GMP_ASM_UNDERSCORE, ++AC_DEFUN([GMP_ASM_UNDERSCORE], + [AC_REQUIRE([GMP_ASM_TEXT]) + AC_REQUIRE([GMP_ASM_GLOBL]) + AC_REQUIRE([GMP_ASM_LABEL_SUFFIX]) +@@ -1045,7 +1047,7 @@ + dnl ----------------- + dnl Is parameter to `.align' logarithmic? + +-AC_DEFUN(GMP_ASM_ALIGN_LOG, ++AC_DEFUN([GMP_ASM_ALIGN_LOG], + [AC_REQUIRE([GMP_ASM_GLOBL]) + AC_REQUIRE([GMP_ASM_DATA]) + AC_REQUIRE([GMP_ASM_LABEL_SUFFIX]) +@@ -1103,7 +1105,7 @@ + dnl The warning from solaris 2.8 is supressed to stop anyone worrying that + dnl something might be wrong. + +-AC_DEFUN(GMP_ASM_ALIGN_FILL_0x90, ++AC_DEFUN([GMP_ASM_ALIGN_FILL_0x90], + [AC_REQUIRE([GMP_ASM_TEXT]) + AC_CACHE_CHECK([if the .align directive accepts an 0x90 fill in .text], + gmp_cv_asm_align_fill_0x90, +@@ -1127,7 +1129,7 @@ + dnl GMP_ASM_TEXT + dnl ------------ + +-AC_DEFUN(GMP_ASM_TEXT, ++AC_DEFUN([GMP_ASM_TEXT], + [AC_CACHE_CHECK([how to switch to text section], + gmp_cv_asm_text, + [case $host in +@@ -1144,7 +1146,7 @@ + dnl ------------ + dnl Can we say `.data'? + +-AC_DEFUN(GMP_ASM_DATA, ++AC_DEFUN([GMP_ASM_DATA], + [AC_CACHE_CHECK([how to switch to data section], + gmp_cv_asm_data, + [case $host in +@@ -1172,7 +1174,7 @@ + dnl where foo is the object file. Might need to check for that if we use + dnl RODATA there. + +-AC_DEFUN(GMP_ASM_RODATA, ++AC_DEFUN([GMP_ASM_RODATA], + [AC_REQUIRE([GMP_ASM_TEXT]) + AC_REQUIRE([GMP_ASM_DATA]) + AC_REQUIRE([GMP_ASM_LABEL_SUFFIX]) +@@ -1229,7 +1231,7 @@ + dnl ------------- + dnl Can we say `.global'? + +-AC_DEFUN(GMP_ASM_GLOBL, ++AC_DEFUN([GMP_ASM_GLOBL], + [AC_CACHE_CHECK([how to export a symbol], + gmp_cv_asm_globl, + [case $host in +@@ -1245,7 +1247,7 @@ + dnl ------------------ + dnl Do we need something after `.global symbol'? + +-AC_DEFUN(GMP_ASM_GLOBL_ATTR, ++AC_DEFUN([GMP_ASM_GLOBL_ATTR], + [AC_CACHE_CHECK([if the export directive needs an attribute], + gmp_cv_asm_globl_attr, + [case $host in +@@ -1276,7 +1278,7 @@ + dnl letting the problem go unnoticed. tests/mpn/t-asmtype.c aims to check + dnl for it. + +-AC_DEFUN(GMP_ASM_TYPE, ++AC_DEFUN([GMP_ASM_TYPE], + [AC_CACHE_CHECK([for assembler .type directive], + gmp_cv_asm_type, + [gmp_cv_asm_type= +@@ -1298,7 +1300,7 @@ + dnl ------------ + dnl Can we say `.size'? + +-AC_DEFUN(GMP_ASM_SIZE, ++AC_DEFUN([GMP_ASM_SIZE], + [AC_CACHE_CHECK([for assembler .size directive], + gmp_cv_asm_size, + [gmp_cv_asm_size= +@@ -1341,7 +1343,7 @@ + dnl HP-UX nm prints an error message (though seems to give a 0 exit) if + dnl there's no symbols at all in an object file, hence the use of "dummy". + +-AC_DEFUN(GMP_ASM_LSYM_PREFIX, ++AC_DEFUN([GMP_ASM_LSYM_PREFIX], + [AC_REQUIRE([GMP_ASM_LABEL_SUFFIX]) + AC_REQUIRE([GMP_PROG_NM]) + AC_CACHE_CHECK([what prefix to use for a local label], +@@ -1386,7 +1388,7 @@ + dnl ----------- + dnl How to define a 32-bit word. + +-AC_DEFUN(GMP_ASM_W32, ++AC_DEFUN([GMP_ASM_W32], + [AC_REQUIRE([GMP_ASM_DATA]) + AC_REQUIRE([GMP_ASM_GLOBL]) + AC_REQUIRE([GMP_ASM_LABEL_SUFFIX]) +@@ -1443,7 +1445,7 @@ + dnl %mm1, %mm0"). It seems more trouble than it's worth to work around + dnl this in the code, so just detect and reject. + +-AC_DEFUN(GMP_ASM_X86_MMX, ++AC_DEFUN([GMP_ASM_X86_MMX], + [AC_CACHE_CHECK([if the assembler knows about MMX instructions], + gmp_cv_asm_x86_mmx, + [GMP_TRY_ASSEMBLE( +@@ -1495,7 +1497,7 @@ + dnl GMP_ASM_X86_SHLDL_CL + dnl -------------------- + +-AC_DEFUN(GMP_ASM_X86_SHLDL_CL, ++AC_DEFUN([GMP_ASM_X86_SHLDL_CL], + [AC_REQUIRE([GMP_ASM_TEXT]) + AC_CACHE_CHECK([if the assembler takes cl with shldl], + gmp_cv_asm_x86_shldl_cl, +@@ -1522,7 +1524,7 @@ + dnl it's all GMP_ASM_TEXT gives currently. Actually ".text" probably isn't + dnl needed at all, at least for just checking instruction syntax. + +-AC_DEFUN(GMP_ASM_X86_SSE2, ++AC_DEFUN([GMP_ASM_X86_SSE2], + [AC_CACHE_CHECK([if the assembler knows about SSE2 instructions], + gmp_cv_asm_x86_sse2, + [GMP_TRY_ASSEMBLE( +@@ -1585,7 +1587,7 @@ + dnl to get two variables (mcount_nonpic_reg and mcount_nonpic_call say) set + dnl from one block of commands? + +-AC_DEFUN(GMP_ASM_X86_MCOUNT, ++AC_DEFUN([GMP_ASM_X86_MCOUNT], + [AC_REQUIRE([AC_ENABLE_SHARED]) + AC_REQUIRE([AC_PROG_LIBTOOL]) + AC_MSG_CHECKING([how to call x86 mcount]) +@@ -1655,7 +1657,7 @@ + dnl instruction. It takes registers without "%", but a single operand + dnl "clrl %d0" only gives a warning, not an error. + +-AC_DEFUN(GMP_ASM_M68K_INSTRUCTION, ++AC_DEFUN([GMP_ASM_M68K_INSTRUCTION], + [AC_REQUIRE([GMP_ASM_TEXT]) + AC_CACHE_CHECK([assembler instruction and register style], + gmp_cv_asm_m68k_instruction, +@@ -1684,7 +1686,7 @@ + dnl GMP_ASM_M68K_ADDRESSING + dnl ----------------------- + +-AC_DEFUN(GMP_ASM_M68K_ADDRESSING, ++AC_DEFUN([GMP_ASM_M68K_ADDRESSING], + [AC_REQUIRE([GMP_ASM_TEXT]) + AC_REQUIRE([GMP_ASM_M68K_INSTRUCTION]) + AC_CACHE_CHECK([assembler addressing style], +@@ -1721,7 +1723,7 @@ + dnl 16-bits. This applies to the conditional branches "bcc" etc too. + dnl However "dbcc" etc on gas are already only as big as they need to be. + +-AC_DEFUN(GMP_ASM_M68K_BRANCHES, ++AC_DEFUN([GMP_ASM_M68K_BRANCHES], + [AC_REQUIRE([GMP_ASM_TEXT]) + AC_CACHE_CHECK([assembler shortest branches], + gmp_cv_asm_m68k_branches, +@@ -1752,7 +1754,7 @@ + dnl See also mpn/powerpc32/powerpc-defs.m4 which uses the result of this + dnl test. + +-AC_DEFUN(GMP_ASM_POWERPC_R_REGISTERS, ++AC_DEFUN([GMP_ASM_POWERPC_R_REGISTERS], + [AC_REQUIRE([GMP_ASM_TEXT]) + AC_CACHE_CHECK([if the assembler needs r on registers], + gmp_cv_asm_powerpc_r_registers, +@@ -1777,7 +1779,7 @@ + dnl + dnl See also mpn/sparc32/sparc-defs.m4 which uses the result of this test. + +-AC_DEFUN(GMP_ASM_SPARC_REGISTER, ++AC_DEFUN([GMP_ASM_SPARC_REGISTER], + [AC_REQUIRE([GMP_ASM_TEXT]) + AC_CACHE_CHECK([if the assembler accepts ".register"], + gmp_cv_asm_sparc_register, +@@ -1795,7 +1797,7 @@ + dnl GMP_C_ATTRIBUTE_CONST + dnl --------------------- + +-AC_DEFUN(GMP_C_ATTRIBUTE_CONST, ++AC_DEFUN([GMP_C_ATTRIBUTE_CONST], + [AC_CACHE_CHECK([whether gcc __attribute__ ((const)) works], + gmp_cv_c_attribute_const, + [AC_TRY_COMPILE([int foo (int x) __attribute__ ((const));], , +@@ -1814,7 +1816,7 @@ + dnl it's ignored. Pretend it doesn't exist in this case, to avoid that + dnl warning. + +-AC_DEFUN(GMP_C_ATTRIBUTE_MALLOC, ++AC_DEFUN([GMP_C_ATTRIBUTE_MALLOC], + [AC_CACHE_CHECK([whether gcc __attribute__ ((malloc)) works], + gmp_cv_c_attribute_malloc, + [cat >conftest.c <<EOF +@@ -1844,7 +1846,7 @@ + dnl -------------------- + dnl Introduced in gcc 2.2, but perhaps not in all Apple derived versions. + +-AC_DEFUN(GMP_C_ATTRIBUTE_MODE, ++AC_DEFUN([GMP_C_ATTRIBUTE_MODE], + [AC_CACHE_CHECK([whether gcc __attribute__ ((mode (XX))) works], + gmp_cv_c_attribute_mode, + [AC_TRY_COMPILE([typedef int SItype __attribute__ ((mode (SI)));], , +@@ -1860,7 +1862,7 @@ + dnl GMP_C_ATTRIBUTE_NORETURN + dnl ------------------------ + +-AC_DEFUN(GMP_C_ATTRIBUTE_NORETURN, ++AC_DEFUN([GMP_C_ATTRIBUTE_NORETURN], + [AC_CACHE_CHECK([whether gcc __attribute__ ((noreturn)) works], + gmp_cv_c_attribute_noreturn, + [AC_TRY_COMPILE([void foo (int x) __attribute__ ((noreturn));], , +@@ -1887,7 +1889,7 @@ + dnl used doesn't have functions or anything, so even an "old" awk should + dnl suffice. + +-AC_DEFUN(GMP_C_DOUBLE_FORMAT, ++AC_DEFUN([GMP_C_DOUBLE_FORMAT], + [AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_PROG_AWK]) + AC_CACHE_CHECK([format of `double' floating point], +@@ -2089,7 +2091,7 @@ + dnl + dnl FIXME: Hopefully autoconf will do this extra itself one day. + +-AC_DEFUN(GMP_C_INLINE, ++AC_DEFUN([GMP_C_INLINE], + [AC_CACHE_CHECK([for inline], gmp_cv_c_inline, + [gmp_cv_c_inline=no + for i in inline __inline__ __inline; do +@@ -2129,7 +2131,7 @@ + dnl "yes" is used in the cache variable if plain "restrict" works, to make + dnl the configure message look nicer. + +-AC_DEFUN(GMP_C_RESTRICT, ++AC_DEFUN([GMP_C_RESTRICT], + [AC_CACHE_CHECK([for restrict], gmp_cv_c_restrict, + [gmp_cv_c_restrict=no + for r in restrict __restrict__ __restrict; do +@@ -2178,7 +2180,7 @@ + dnl ulongs with bits=8*sizeof, so it's academic. Strange systems can + dnl always have the right values put in gmp-mparam.h explicitly. + +-AC_DEFUN(GMP_C_SIZES, ++AC_DEFUN([GMP_C_SIZES], + [BITS_PER_MP_LIMB=[`sed -n 's/^#define BITS_PER_MP_LIMB[ ][ ]*\([0-9]*\).*$/\1/p' $gmp_mparam_source`] + if test -n "$BITS_PER_MP_LIMB" \ + && grep "^#define BYTES_PER_MP_LIMB" $gmp_mparam_source >/dev/null; then : ; +@@ -2199,7 +2201,7 @@ + fi + fi + AC_SUBST(BITS_PER_MP_LIMB) +-define([GMP_INCLUDE_GMP_H_BITS_PER_MP_LIMB], ++define([[GMP_INCLUDE_GMP_H_BITS_PER_MP_LIMB]], + [[#define __GMP_BITS_PER_MP_LIMB $BITS_PER_MP_LIMB + #define GMP_LIMB_BITS $BITS_PER_MP_LIMB]]) + +@@ -2232,7 +2234,7 @@ + dnl or very likely by the setups for _PROTO in gmp.h. On the other hand + dnl this test is nice and direct, being what we're going to actually use. + +-AC_DEFUN(GMP_C_STDARG, ++AC_DEFUN([GMP_C_STDARG], + [AC_CACHE_CHECK([whether <stdarg.h> exists and works], + gmp_cv_c_stdarg, + [AC_TRY_COMPILE( +@@ -2261,7 +2263,7 @@ + dnl available, and also to use gmp-impl.h for the conditionals detecting + dnl compiler builtin alloca's. + +-AC_DEFUN(GMP_FUNC_ALLOCA, ++AC_DEFUN([GMP_FUNC_ALLOCA], + [AC_REQUIRE([GMP_HEADER_ALLOCA]) + AC_CACHE_CHECK([for alloca (via gmp-impl.h)], + gmp_cv_func_alloca, +@@ -2278,7 +2280,7 @@ + fi + ]) + +-AC_DEFUN(GMP_HEADER_ALLOCA, ++AC_DEFUN([GMP_HEADER_ALLOCA], + [# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + AC_CACHE_CHECK([for working alloca.h], +@@ -2299,7 +2301,7 @@ + dnl Decide what to do about --enable-alloca from the user. + dnl This is a macro so it can require GMP_FUNC_ALLOCA. + +-AC_DEFUN(GMP_OPTION_ALLOCA, ++AC_DEFUN([GMP_OPTION_ALLOCA], + [AC_REQUIRE([GMP_FUNC_ALLOCA]) + AC_CACHE_CHECK([how to allocate temporary memory], + gmp_cv_option_alloca, +@@ -2355,7 +2357,7 @@ + dnl + dnl FIXME: Run a program to try this, when doing a native build. + +-AC_DEFUN(GMP_FUNC_SSCANF_WRITABLE_INPUT, ++AC_DEFUN([GMP_FUNC_SSCANF_WRITABLE_INPUT], + [AC_CACHE_CHECK([whether sscanf needs writable input], + gmp_cv_func_sscanf_writable_input, + [case $host in +@@ -2391,7 +2393,7 @@ + dnl not sure which 2.0.x does which), but still puts the correct null + dnl terminated result into the buffer. + +-AC_DEFUN(GMP_FUNC_VSNPRINTF, ++AC_DEFUN([GMP_FUNC_VSNPRINTF], + [AC_REQUIRE([GMP_C_STDARG]) + AC_CHECK_FUNC(vsnprintf, + [gmp_vsnprintf_exists=yes], +@@ -2472,7 +2474,7 @@ + dnl ---------- + dnl Check whether gmp.h recognises the compiler as ANSI capable. + +-AC_DEFUN(GMP_H_ANSI, ++AC_DEFUN([GMP_H_ANSI], + [AC_REQUIRE([AC_PROG_CC_STDC]) + case $ac_cv_prog_cc_stdc in + no) +@@ -2495,7 +2497,7 @@ + dnl If the compiler has an "inline" of some sort, check whether the + dnl #ifdef's in gmp.h recognise it. + +-AC_DEFUN(GMP_H_EXTERN_INLINE, ++AC_DEFUN([GMP_H_EXTERN_INLINE], + [AC_REQUIRE([GMP_C_INLINE]) + case $gmp_cv_c_inline in + no) ;; +@@ -2522,7 +2524,7 @@ + dnl Check whether the #ifdef's in gmp.h recognise when stdio.h has been + dnl included to get FILE. + +-AC_DEFUN(GMP_H_HAVE_FILE, ++AC_DEFUN([GMP_H_HAVE_FILE], + [AC_TRY_COMPILE( + [#include <stdio.h>] + GMP_INCLUDE_GMP_H +@@ -2539,7 +2541,7 @@ + dnl Check whether the #ifdef's in gmp-impl.h recognise IEEE format and + dnl endianness. + +-AC_DEFUN(GMP_IMPL_H_IEEE_FLOATS, ++AC_DEFUN([GMP_IMPL_H_IEEE_FLOATS], + [case $host in + vax*-*-*) + # not IEEE (neither D nor G formats are IEEE) +--- gmp-1.4.4/configure.in.orig 2004-09-21 15:02:43.000000000 +0200 ++++ gmp-1.4.4/configure.in 2005-07-18 01:08:34.000000000 +0200 +@@ -26,15 +26,16 @@ + + + AC_REVISION($Revision: 1.425.2.25 $) +-AC_PREREQ(2.52) +-AC_INIT(gmp-impl.h) +-m4_pattern_forbid([^[ \t]*GMP_]) +-m4_pattern_forbid([^[ \t]*MPFR_CONFIGS]) +-m4_pattern_allow(GMP_LDFLAGS) +-m4_pattern_allow(GMP_LIMB_BITS) +-m4_pattern_allow(GMP_MPARAM_H_SUGGEST) +-m4_pattern_allow(GMP_NAIL_BITS) +-m4_pattern_allow(GMP_NUMB_BITS) ++AC_PREREQ(2.57) ++AC_INIT ++AC_CONFIG_SRCDIR([gmp-impl.h]) ++ ++ ++ ++ ++ ++ ++ + + # If --target is not used then $target_alias is empty, but if say + # "./configure athlon-pc-freebsd3.5" is used, then all three of +@@ -56,7 +57,7 @@ + GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_HOST_CPU_$tmp_host')", POST) + + AM_INIT_AUTOMAKE(gmp, GMP_VERSION) +-AM_CONFIG_HEADER(config.h:config.in) ++AC_CONFIG_HEADERS([config.h:config.in]) + AM_MAINTAINER_MODE + + +@@ -212,7 +213,7 @@ + # After GMP specific searches and tests, the standard autoconf AC_PROG_CC is + # called. User selections of CC etc are respected. + # +-# Care is taken not to use macros like AC_TRY_COMPILE during the GMP ++# Care is taken not to use macros like AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) during the GMP + # pre-testing, since they of course depend on AC_PROG_CC, and also some of + # them cache their results, which is not wanted. + # +@@ -299,7 +300,7 @@ + # FIXME: We'd like to prefer an ANSI compiler, perhaps by preferring + # c89 over cc here. But note that on HP-UX c89 provides a castrated + # environment, and would want to be excluded somehow. Maybe +-# AC_PROG_CC_STDC already does enough to stick cc into ANSI mode and ++# already does enough to stick cc into ANSI mode and + # we don't need to worry. + # + cclist="gcc cc" +@@ -1079,7 +1080,7 @@ + CFLAGS_or_unset=${CFLAGS-'(unset)'} + CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'} + +-cat >&AC_FD_CC <<EOF ++cat >&AS_MESSAGE_LOG_FD() <<EOF + configure:__line__: User: + ABI=$ABI + CC=$CC +@@ -1391,18 +1392,18 @@ + + # The C compiler and preprocessor, put into ANSI mode if possible. + AC_PROG_CC +-AC_PROG_CC_STDC ++ + AC_PROG_CPP + GMP_H_ANSI + + + # The C++ compiler, if desired. + want_cxx=no ++AC_PROG_CXX + if test $enable_cxx != no; then + test_CXXFLAGS=${CXXFLAGS+set} +- AC_PROG_CXX + +- echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC ++ echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD() + cxxflags_ac_prog_cxx=$CXXFLAGS + cxxflags_list=ac_prog_cxx + +@@ -1478,7 +1479,7 @@ + fi + + +-cat >&AC_FD_CC <<EOF ++cat >&AS_MESSAGE_LOG_FD() <<EOF + configure:__line__: Decided: + ABI=$ABI + CC=$CC +@@ -1720,9 +1721,9 @@ + + # FIXME: Autoconf 2.52 AC_C_BIGENDIAN bombs when cross compiling, but in the + # future the probes will be better and this override can be removed. +-if test "$cross_compiling" = yes; then +- ac_cv_c_bigendian=unknown +-fi ++#if test "$cross_compiling" = yes; then ++# ac_cv_c_bigendian=unknown ++#fi + AC_C_BIGENDIAN + # Enhancement: In the future AC_C_BIGENDIAN will accept these actions as + # parameters. +@@ -2168,7 +2169,7 @@ + + # Configs for demos/calc directory + # +-# AC_SUBST is used here since with AM_CONFIG_HEADER automake would put ++# AC_SUBST is used here since with AC_CONFIG_HEADERS([]) automake would put + # demos/calc in the default $(DEFAULT_INCLUDES) for every directory, + # which would look very strange. Likewise demos/expr below. + # +@@ -2207,7 +2208,7 @@ + # FIXME: Upcoming version of autoconf/automake may not like broken lines. + # Right now automake isn't accepting the new AC_CONFIG_FILES scheme. + +-AC_OUTPUT(Makefile \ ++AC_CONFIG_FILES([Makefile \ + mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile \ + mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile \ + tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile \ +@@ -2217,4 +2218,5 @@ + mpfr/Makefile mpfr/tests/Makefile \ + tune/Makefile \ + demos/Makefile demos/calc/Makefile demos/expr/Makefile \ +- gmp.h:gmp-h.in mp.h:mp-h.in) ++ gmp.h:gmp-h.in mp.h:mp-h.in]) ++AC_OUTPUT diff --git a/packages/gmp/gmp_4.1.4.bb b/packages/gmp/gmp_4.1.4.bb new file mode 100644 index 0000000000..c9348ea43e --- /dev/null +++ b/packages/gmp/gmp_4.1.4.bb @@ -0,0 +1,17 @@ +SECTION = "libs" +DESCRIPTION = "GNU multiprecision arithmetic library" +HOMEPAGE = "http://www.swox.com/gmp/" +LICENSE = "GPL LGPL" + +SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \ + file://configure.patch;patch=1 \ + file://amd64.patch;patch=1" + +inherit autotools + +acpaths = "" + +do_stage () { + oe_libinstall -so libgmp ${STAGING_LIBDIR} + install -m 0644 ${S}/gmp.h ${STAGING_INCDIR}/gmp.h +} diff --git a/packages/udev/udev-050/.mtn2git_empty b/packages/jamvm/jamvm-1.3.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/udev/udev-050/.mtn2git_empty +++ b/packages/jamvm/jamvm-1.3.1/.mtn2git_empty diff --git a/packages/jamvm/jamvm-1.3.1/size-defaults.patch b/packages/jamvm/jamvm-1.3.1/size-defaults.patch new file mode 100644 index 0000000000..a41beee982 --- /dev/null +++ b/packages/jamvm/jamvm-1.3.1/size-defaults.patch @@ -0,0 +1,12 @@ +--- jamvm-1.3.1.orig/src/jam.h 2005-07-17 23:53:34.000000000 +0200 ++++ jamvm-1.3.1/src/jam.h 2005-07-17 23:54:17.000000000 +0200 +@@ -548,7 +548,9 @@ + #endif + + /* default size of the Java stack */ ++#ifndef DEFAULT_STACK + #define DEFAULT_STACK 64*KB ++#endif + + /* size of emergency area - big enough to create + a StackOverflow exception */ diff --git a/packages/jamvm/jamvm_1.3.1.bb b/packages/jamvm/jamvm_1.3.1.bb new file mode 100644 index 0000000000..f33745d788 --- /dev/null +++ b/packages/jamvm/jamvm_1.3.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." +HOMEPAGE = "http://jamvm.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "interpreters" + +DEPENDS = "zlib classpath" +RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ + file://size-defaults.patch;patch=1" + +inherit autotools update-alternatives + +EXTRA_OECONF = "--with-classpath-install-dir=${prefix}" +CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" + +PROVIDES = "virtual/java" +ALTERNATIVE_NAME = "java" +ALTERNATIVE_PATH = "${bindir}/jamvm" +ALTERNATIVE_PRIORITY = "10" diff --git a/packages/udev/udev-054/.mtn2git_empty b/packages/libpcap/libpcap-0.9.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/udev/udev-054/.mtn2git_empty +++ b/packages/libpcap/libpcap-0.9.3/.mtn2git_empty diff --git a/packages/libpcap/libpcap-0.9.3/shared.patch b/packages/libpcap/libpcap-0.9.3/shared.patch new file mode 100644 index 0000000000..cc66a5e5ef --- /dev/null +++ b/packages/libpcap/libpcap-0.9.3/shared.patch @@ -0,0 +1,119 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libpcap-0.9.3/Makefile.in~shared ++++ libpcap-0.9.3/Makefile.in +@@ -37,6 +37,15 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + ++# some defines for shared library compilation - FIXME, if not matching ++MAJ=0.9 ++MIN=3 ++VERSION=$(MAJ).$(MIN) ++LIBNAME=pcap ++LIBRARY=lib$(LIBNAME).a ++SOLIBRARY=lib$(LIBNAME).so ++SHAREDLIB=$(SOLIBRARY).$(VERSION) ++ + # + # You shouldn't need to edit anything below. + # +@@ -50,6 +59,7 @@ + + # Standard CFLAGS + CFLAGS = $(CCOPT) $(INCLS) $(DEFS) ++CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ) + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -70,6 +80,9 @@ + .c.o: + @rm -f $@ + $(CC) $(CFLAGS) -c $(srcdir)/$*.c ++%_pic.o: %.c ++ @rm -f $@ ++ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c + + PSRC = pcap-@V_PCAP@.c + FSRC = fad-@V_FINDALLDEVS@.c +@@ -84,6 +97,7 @@ + # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot + # hack the extra indirection + OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) ++OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) + HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ + ethertype.h gencode.h gnuc.h + GENHDR = \ +@@ -95,15 +109,22 @@ + TAGFILES = \ + $(SRC) $(HDR) $(TAGHDR) + +-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c ++CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* + +-all: libpcap.a ++all: libpcap.a $(SHAREDLIB) + + libpcap.a: $(OBJ) + @rm -f $@ + ar rc $@ $(OBJ) $(LIBS) + $(RANLIB) $@ + ++$(SHAREDLIB): $(OBJ_PIC) ++ -@rm -f $@ ++ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) ++ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc ++ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) ++ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) ++ + shared: libpcap.$(DYEXT) + + # +@@ -129,6 +150,9 @@ + scanner.o: scanner.c tokdefs.h + $(CC) $(CFLAGS) -c scanner.c + ++scanner_pic.o: scanner.c tokdefs.h ++ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c ++ + pcap.o: version.h + + tokdefs.h: grammar.c +@@ -142,9 +166,16 @@ + @rm -f $@ + $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c + ++grammer_pic.o: grammar.c ++ @rm -f $@ ++ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c ++ + version.o: version.c + $(CC) $(CFLAGS) -c version.c + ++version_pic.o: version.c ++ $(CC) -fPIC $(CFLAGS) -c version.c -o $@ ++ + snprintf.o: $(srcdir)/missing/snprintf.c + $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c + +@@ -170,11 +201,17 @@ + bpf_filter.o: bpf_filter.c + $(CC) $(CFLAGS) -c bpf_filter.c + ++bpf_filter_pic.o: bpf_filter.c ++ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@ ++ + install: libpcap.a + [ -d $(DESTDIR)$(libdir) ] || \ + (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a + $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a ++ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ ++ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) ++ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) + [ -d $(DESTDIR)$(includedir) ] || \ + (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) + $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h diff --git a/packages/libpcap/libpcap_0.9.3.bb b/packages/libpcap/libpcap_0.9.3.bb new file mode 100644 index 0000000000..7436533a95 --- /dev/null +++ b/packages/libpcap/libpcap_0.9.3.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Network Packet Capture Library" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +SECTION = "libs/network" +PR = "r0" + +SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \ + file://shared.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--with-pcap=linux" + +CPPFLAGS_prepend = "-I${S} " +CFLAGS_prepend = "-I${S} " +CXXFLAGS_prepend = "-I${S} " + +do_configure_prepend () { + if [ ! -e acinclude.m4 ]; then + cat aclocal.m4 > acinclude.m4 + fi +} + +do_stage () { + install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h + install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h + install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h + oe_libinstall -a -so libpcap ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/net + ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h +} diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc index 991805e1ab..44f466ef49 100644 --- a/packages/linux/nslu2-kernel.inc +++ b/packages/linux/nslu2-kernel.inc @@ -25,6 +25,7 @@ # file://ixp4xx_copy_from.patch;patch=1 # file://anonymiser.patch;patch=1 # file://xscale-reset.patch;patch=1 +# file://mtd-shutdown.patch;patch=1 # ${N2K_EXTRA_PATCHES} # # N2K_SUFFIX - the suffix to add after 'zImage-' in the @@ -194,6 +195,7 @@ N2K_PATCHES ?= "\ file://ixp4xx_copy_from.patch;patch=1 \ file://anonymiser.patch;patch=1 \ file://xscale-reset.patch;patch=1 \ + file://mtd-shutdown.patch;patch=1 \ ${N2K_EXTRA_PATCHES}" N2K_SUFFIX ?= "openslug" diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index 8ab9379708..6fbb5d02ae 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r1" +PR = "r3" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include @@ -20,4 +20,5 @@ N2K_PATCHES = "\ file://anonymiser.patch;patch=1 \ file://xscale-reset.patch;patch=1 \ file://x1205-rtc.c-id.patch;patch=1 \ + file://mtd-shutdown.patch;patch=1 \ " diff --git a/packages/linux/nslu2-kernel_2.6.12.bb b/packages/linux/nslu2-kernel_2.6.12.bb index e3e536fe3e..6cea8a4daa 100644 --- a/packages/linux/nslu2-kernel_2.6.12.bb +++ b/packages/linux/nslu2-kernel_2.6.12.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r0" +PR = "r2" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include @@ -20,4 +20,5 @@ N2K_PATCHES = "\ file://anonymiser.patch;patch=1 \ file://xscale-reset.patch;patch=1 \ file://x1205-rtc.c-id.patch;patch=1 \ + file://mtd-shutdown.patch;patch=1 \ " diff --git a/packages/linux/openslug-kernel-2.6.11.2/mtd-shutdown.patch b/packages/linux/openslug-kernel-2.6.11.2/mtd-shutdown.patch new file mode 100644 index 0000000000..e7cce4ebc0 --- /dev/null +++ b/packages/linux/openslug-kernel-2.6.11.2/mtd-shutdown.patch @@ -0,0 +1,66 @@ +# Ensure that the MTD is shut down on halt/reboot, otherwise the +# hardware reset hangs + +--- linux-2.6.12.2/drivers/mtd/maps/ixp4xx.c.orig 2005-07-17 15:07:47.790388300 -0700 ++++ linux-2.6.12.2/drivers/mtd/maps/ixp4xx.c 2005-07-17 17:00:08.082672710 -0700 +@@ -144,6 +144,52 @@ + return 0; + } + ++static void ixp4xx_flash_shutdown(struct device *_dev) ++{ ++ struct platform_device *dev = to_platform_device(_dev); ++ struct flash_platform_data *plat = dev->dev.platform_data; ++ struct ixp4xx_flash_info *info = dev_get_drvdata(&dev->dev); ++ map_word d; ++ ++ dev_set_drvdata(&dev->dev, NULL); ++ ++ if(!info) ++ return; ++ ++ /* ++ * This is required for a soft reboot to work. ++ */ ++ d.x[0] = 0xff; ++ ixp4xx_write16(&info->map, d, 0x55 * 0x2); ++ ++#if 0 ++ /* This is commented out because it seems to cause a kernel ++ * panic (at least if it isn't commented out the kernel fails ++ * to shut down). Should be investigated. ++ */ ++ if (info->mtd) { ++ del_mtd_partitions(info->mtd); ++ map_destroy(info->mtd); ++ } ++#endif ++ if (info->map.map_priv_1) ++ iounmap((void *) info->map.map_priv_1); ++ ++ if (info->partitions) ++ kfree(info->partitions); ++ ++ if (info->res) { ++ release_resource(info->res); ++ kfree(info->res); ++ } ++ ++ if (plat->exit) ++ plat->exit(); ++ ++ /* Disable flash write */ ++ *IXP4XX_EXP_CS0 &= ~IXP4XX_FLASH_WRITABLE; ++} ++ + static int ixp4xx_flash_probe(struct device *_dev) + { + struct platform_device *dev = to_platform_device(_dev); +@@ -243,6 +289,7 @@ + .bus = &platform_bus_type, + .probe = ixp4xx_flash_probe, + .remove = ixp4xx_flash_remove, ++ .shutdown = ixp4xx_flash_shutdown, + }; + + static int __init ixp4xx_flash_init(void) diff --git a/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch b/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch index 3995ba691e..4e68456e20 100644 --- a/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch +++ b/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch @@ -102,7 +102,7 @@ + ldr r7, =IXP4XX_TIMER_BASE_VIRT + ldr r8, =IXP4XX_WDT_KEY @ set key + str r8, [r7, #IXP4XX_OSWK_OFFSET] -+ mov r8, #0x10000000 @ about 4 seconds ++ mov r8, #0x1000000 @ about 0.25 seconds + str r8, [r7, #IXP4XX_OSWT_OFFSET] @ set timer + mov r8, #(IXP4XX_WDT_RESET_ENABLE | IXP4XX_WDT_COUNT_ENABLE) + str r8, [r7, #IXP4XX_OSWE_OFFSET] @ enable reset diff --git a/packages/linux/openslug-kernel_2.6.11.2.bb b/packages/linux/openslug-kernel_2.6.11.2.bb index c4408ae479..8e2555d014 100644 --- a/packages/linux/openslug-kernel_2.6.11.2.bb +++ b/packages/linux/openslug-kernel_2.6.11.2.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys NSLU2 device" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -PR = "r13" +PR = "r15" KERNEL_SUFFIX = "openslug" @@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.2.tar.bz2 \ file://ixp4xx_copy_from.patch;patch=1 \ file://anonymiser.patch;patch=1 \ file://xscale-reset.patch;patch=1 \ + file://mtd-shutdown.patch;patch=1 \ file://defconfig \ file://x1205-rtc.c \ file://nslu2-io.c \ diff --git a/packages/monotone/files/configure.ac.patch b/packages/monotone/files/configure.ac.patch new file mode 100644 index 0000000000..2d3e75531a --- /dev/null +++ b/packages/monotone/files/configure.ac.patch @@ -0,0 +1,36 @@ +--- monotone-0.21/configure.ac.orig 2005-07-17 19:23:29.580829434 -0700 ++++ monotone-0.21/configure.ac 2005-07-17 19:28:50.237223287 -0700 +@@ -82,9 +82,14 @@ + AC_DEFUN([BOOST_VERSION_CHECK], + [AC_CACHE_CHECK([boost version 1.32 or newer], ac_cv_version_boost, + [ +- AC_TRY_RUN( ++ AC_TRY_COMPILE( + [#include <boost/version.hpp> +- int main() { return (BOOST_VERSION < 103200); }], ++ #if BOOST_VERSION < 103200 ++ int main() { return (BOOST_VERSION < 103200); } ++ #else ++ #error boost version is ok ++ #endif ++ ], + ac_cv_version_boost=yes, + ac_cv_version_boost=no) + ]) +@@ -101,9 +106,14 @@ + AC_DEFUN([BOOST_FIX_VERSION], + [AC_CACHE_CHECK([if boost requires extra flags to compile], ac_fix_boost, + [ +- AC_TRY_RUN( ++ AC_TRY_COMPILE( + [#include <boost/version.hpp> +- int main() { return (BOOST_VERSION != 103200); }], ++ #if BOOST_VERSION != 103200 ++ int main() { return (BOOST_VERSION != 103200); } ++ #else ++ #error boost version is not 1.32.0 ++ #endif ++ ], + ac_fix_boost=yes, + ac_fix_boost=no) + ]) diff --git a/packages/monotone/files/uclibc.database.hh.stdarg.patch b/packages/monotone/files/uclibc.database.hh.stdarg.patch new file mode 100644 index 0000000000..1590b7dded --- /dev/null +++ b/packages/monotone/files/uclibc.database.hh.stdarg.patch @@ -0,0 +1,10 @@ +--- monotone-0.21/database.hh.orig 2005-07-17 19:59:00.312846093 -0700 ++++ monotone-0.21/database.hh 2005-07-17 19:59:56.259365537 -0700 +@@ -14,6 +14,7 @@ + #include <set> + #include <map> + #include <string> ++#include <stdarg.h> + + #include <boost/filesystem/path.hpp> + diff --git a/packages/monotone/monotone-5_0.21.bb b/packages/monotone/monotone-5_0.21.bb new file mode 100644 index 0000000000..ec31e22bfb --- /dev/null +++ b/packages/monotone/monotone-5_0.21.bb @@ -0,0 +1,12 @@ +include monotone.inc + +PR = "r0" + +SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \ + file://txt2c-cross.patch;patch=1 \ + file://cryptopp-endianness.patch;patch=1 \ + file://configure.ac.patch;patch=1 \ + file://uclibc.database.hh.stdarg.patch;patch=1 \ + " + +ALTERNATIVE_PRIORITY = "50" diff --git a/packages/monotone/monotone.inc b/packages/monotone/monotone.inc index a0b9463cd8..7248a9843d 100644 --- a/packages/monotone/monotone.inc +++ b/packages/monotone/monotone.inc @@ -40,6 +40,6 @@ do_install_append() { PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" tsd = "/home/monotone/${PN}" FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests" -RDEPENDS_${PN}-testsuite += "bash sed grep cvs" +RDEPENDS_${PN}-testsuite += "bash sed grep cvs patch" # The testsuite also requires the following - not yet available... -#RDEPENDS_${PN}-testsuite += "patch perl" +#RDEPENDS_${PN}-testsuite += "perl" diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh b/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh index b7ae8b76e5..da39b425f8 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh +++ b/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh @@ -1,5 +1,18 @@ #!/bin/sh # # umount /mnt, which is where the initrd ends up mounted -# if the directory /initrd is not present -exec umount /mnt 2>/dev/null +# if the directory /initrd is not present, if this fails +# then the /initrd is mounted and we want to remount that +# ro - this works round the shutdown -r hang problem +umount /mnt 2>/dev/null || { + # need the device for a remount + . /etc/default/functions + ffspart=Flashdisk + ffsdev="$(mtblockdev $ffspart)" + if test -n "$ffsdev" -a -b "$ffsdev" + then + mount -o remount,ro "$ffsdev" /initrd + else + echo "Flashdisk: $ffsdev: flash device not found" >&2 + fi +} diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb index 537760f8d5..59b8c0fd5d 100644 --- a/packages/openslug-init/openslug-init_0.10.bb +++ b/packages/openslug-init/openslug-init_0.10.bb @@ -3,7 +3,7 @@ SECTION = "console/network" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r37" +PR = "r38" SRC_URI = "file://linuxrc \ file://boot/flash \ diff --git a/packages/patcher/files/.mtn2git_empty b/packages/patcher/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/patcher/files/.mtn2git_empty diff --git a/packages/patcher/files/freebsd_gpatch.patch b/packages/patcher/files/freebsd_gpatch.patch new file mode 100644 index 0000000000..ee6365f49d --- /dev/null +++ b/packages/patcher/files/freebsd_gpatch.patch @@ -0,0 +1,28 @@ +On FreeBSD the default patch program has a different command line +interface than GNU patch. Make patcher use the GNU patch. + + +--- patcher/patcher.py.old Mon Sep 13 21:59:05 2004 ++++ patcher/patcher.py Sun Jul 17 14:24:50 2005 +@@ -631,8 +631,8 @@ + my $res; + + # ... then we look if the patch would apply cleanly ... +- print "DEBUG: patch --dry-run $opt\n" if $debug > 1; +- $res = system("patch --dry-run $opt >$patchlog 2>/dev/null"); ++ print "DEBUG: gpatch --dry-run $opt\n" if $debug > 1; ++ $res = system("gpatch --dry-run $opt >$patchlog 2>/dev/null"); + if ($res != 0) { + unless ($do_force) { + unlink($patchlog); +@@ -669,8 +669,8 @@ + # Finally we apply the patch. No need to create backup copies with -b, + # that has been done by PutIntoPatch() + $opt = "-f $opt" if $do_force; +- print "DEBUG: patch $opt\n" if $debug > 1; +- $res = system("patch $opt >$patchlog"); ++ print "DEBUG: gpatch $opt\n" if $debug > 1; ++ $res = system("gpatch $opt >$patchlog"); + unlink($patchlog); + $res = 0 if $do_force && $res == 256; + if ($res != 0) { diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb index e1ac1c1ca2..833ca21a53 100644 --- a/packages/patcher/patcher-native_20040913.bb +++ b/packages/patcher/patcher-native_20040913.bb @@ -11,10 +11,12 @@ PR = "r1" inherit native SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2" +SRC_URI_append_build-freebsd = " file://freebsd_gpatch.patch;patch=1 " S = "${WORKDIR}/patcher" PATCHCLEANCMD = "" PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" +PATCHCMD_build-freebsd = "num='%s'; name='%s'; file='%s'; gpatch -p "$num" -i "$file"" do_stage() { install -m 0755 patcher.py ${STAGING_BINDIR}/patcher diff --git a/packages/python/python-imdbpy_1.9.bb b/packages/python/python-imdbpy_2.0.bb index 5e098478b2..2df3b4229c 100644 --- a/packages/python/python-imdbpy_1.9.bb +++ b/packages/python/python-imdbpy_2.0.bb @@ -3,10 +3,11 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -SRCNAME = "imdbpy" +SRCNAME = "IMDbPY" +PR = "ml0" -SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/IMDbPY-${PV}" +SRC_URI = "${SOURCEFORGE_MIRROR}/imbdbpy/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils diff --git a/packages/sablevm/sablevm/.mtn2git_empty b/packages/sablevm/sablevm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sablevm/sablevm/.mtn2git_empty diff --git a/packages/sablevm/sablevm/no-internal-libs.patch b/packages/sablevm/sablevm/no-internal-libs.patch new file mode 100644 index 0000000000..d082bfd076 --- /dev/null +++ b/packages/sablevm/sablevm/no-internal-libs.patch @@ -0,0 +1,20 @@ +--- sablevm-1.12.orig/src/Makefile.am 2005-07-05 03:10:33.000000000 +0200 ++++ sablevm-1.12/src/Makefile.am 2005-07-17 22:30:28.000000000 +0200 +@@ -6,16 +6,8 @@ + ## * modification of this source file. * + ## * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +-DIST_SUBDIRS = include libffi libpopt libsablevm sablevm ++DIST_SUBDIRS = include libsablevm sablevm + + SUBDIRS = include + +-if CONV_LIBFFI +-SUBDIRS += libffi +-endif +- +-if CONV_LIBPOPT +-SUBDIRS += libpopt +-endif +- + SUBDIRS += libsablevm sablevm diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb new file mode 100644 index 0000000000..d3422539ce --- /dev/null +++ b/packages/tcpdump/tcpdump_3.9.3.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +SECTION = "console/network" +PRIORITY = "optional" +DEPENDS = "libpcap-0.9.3 openssl" +PR = "r0" + +SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz" + +inherit autotools + +do_configure() { + gnu-configize + oe_runconf +} + diff --git a/packages/udev/udev-042/flags.patch b/packages/udev/udev-042/flags.patch deleted file mode 100644 index a5a791df33..0000000000 --- a/packages/udev/udev-042/flags.patch +++ /dev/null @@ -1,67 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-042/Makefile~flags -+++ udev-042/Makefile -@@ -119,16 +119,18 @@ - endif - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DLOG -+ override CFLAGS += -DLOG - endif - - # if DEBUG is enabled, then we do not strip or optimize -+override CFLAGS += -D_GNU_SOURCE - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE -+ CFLAGS += -O1 -g -+ override CFLAGS += -DDEBUG - LDFLAGS += -Wl,-warn-common - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE -+ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer - LDFLAGS += -s -Wl,-warn-common - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif -@@ -150,8 +152,8 @@ - - CRT0 = $(KLIBC_DIR)/crt0.o - LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) -- CFLAGS += $(WARNINGS) -nostdinc \ -- $(OPTFLAGS) \ -+ CFLAGS += $(WARNINGS) $(OPTFLAGS) -+ override CFLAGS += -nostdinc \ - -D__KLIBC__ -fno-builtin-printf \ - -I$(KLIBC_FIXUPS_DIR) \ - -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \ -@@ -161,12 +163,13 @@ - -I$(GCCINCDIR) \ - -I$(LINUX_INCLUDE_DIR) - LIB_OBJS = -- LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs -+ override LDFLAGS += --static --nostdlib -nostartfiles -nodefaultlibs - else - WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - CRT0 = - LIBC = -- CFLAGS += $(WARNINGS) -I$(GCCINCDIR) -+ CFLAGS += $(WARNINGS) -+ override CFLAGS += -I$(GCCINCDIR) - LIB_OBJS = -lc - LDFLAGS = - endif -@@ -176,8 +179,8 @@ - LIB_OBJS += -lselinux - endif - --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -- -I$(PWD)/libsysfs -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+ -I$(PWD)/libsysfs - - # config files automatically generated - GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf diff --git a/packages/udev/udev-050/flags.patch b/packages/udev/udev-050/flags.patch deleted file mode 100644 index b59825f7ac..0000000000 --- a/packages/udev/udev-050/flags.patch +++ /dev/null @@ -1,69 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: udev-050/Makefile -=================================================================== ---- udev-050.orig/Makefile 2004-12-18 00:53:07.000000000 -0500 -+++ udev-050/Makefile 2005-01-21 19:23:45.699728872 -0500 -@@ -114,16 +114,18 @@ - CFLAGS := -pipe - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DLOG -+ override CFLAGS += -DLOG - endif - - # if DEBUG is enabled, then we do not strip or optimize -+override CFLAGS += -D_GNU_SOURCE - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE -+ CFLAGS += -O1 -g -+ override CFLAGS += -DDEBUG - LDFLAGS += -Wl,-warn-common - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE -+ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer - LDFLAGS += -s -Wl,-warn-common - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif -@@ -144,8 +146,8 @@ - - CRT0 = $(KLIBC_DIR)/crt0.o - LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) -- CFLAGS += $(WARNINGS) -nostdinc \ -- $(OPTFLAGS) \ -+ CFLAGS += $(WARNINGS) $(OPTFLAGS) -+ override CFLAGS += -nostdinc \ - -D__KLIBC__ -fno-builtin-printf \ - -I$(KLIBC_FIXUPS_DIR) \ - -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \ -@@ -155,12 +157,13 @@ - -I$(GCCINCDIR) \ - -I$(LINUX_INCLUDE_DIR) - LIB_OBJS = -- LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs -+ override LDFLAGS += --static --nostdlib -nostartfiles -nodefaultlibs - else - WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - CRT0 = - LIBC = -- CFLAGS += $(WARNINGS) -I$(GCCINCDIR) -+ CFLAGS += $(WARNINGS) -+ override CFLAGS += -I$(GCCINCDIR) - LIB_OBJS = -lc - LDFLAGS = - endif -@@ -170,8 +173,8 @@ - LIB_OBJS += -lselinux - endif - --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -- -I$(PWD)/libsysfs -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+ -I$(PWD)/libsysfs - - # config files automatically generated - GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf diff --git a/packages/udev/udev-050/kill_logname.patch b/packages/udev/udev-050/kill_logname.patch deleted file mode 100644 index 4e30ab444e..0000000000 --- a/packages/udev/udev-050/kill_logname.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: udev-050/extras/volume_id/udev_volume_id.c -=================================================================== ---- udev-050.orig/extras/volume_id/udev_volume_id.c 2004-12-18 00:53:07.000000000 -0500 -+++ udev-050/extras/volume_id/udev_volume_id.c 2005-01-21 19:26:44.992472232 -0500 -@@ -37,7 +37,6 @@ - #define BLKGETSIZE64 _IOR(0x12,114,size_t) - - #ifdef LOG --unsigned char logname[LOGNAME_SIZE]; - void log_message(int level, const char *format, ...) - { - va_list args; diff --git a/packages/udev/udev-054/flags.patch b/packages/udev/udev-054/flags.patch deleted file mode 100644 index 2bd9a364da..0000000000 --- a/packages/udev/udev-054/flags.patch +++ /dev/null @@ -1,75 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: udev-054/Makefile -=================================================================== ---- udev-054.orig/Makefile 2005-02-25 21:18:21.000000000 -0600 -+++ udev-054/Makefile 2005-02-26 01:06:10.000000000 -0600 -@@ -154,20 +154,22 @@ - - SYSFS = $(PWD)/libsysfs/sysfs.a - --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ - -I$(PWD)/libsysfs - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DLOG -+ override CFLAGS += -DLOG - endif - - # if DEBUG is enabled, then we do not strip or optimize -+override CFLAGS += -D_GNU_SOURCE - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE -+ CFLAGS += -O1 -g -+ override CFLAGS += -DDEBUG - LDFLAGS += -Wl,-warn-common - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE -+ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer - LDFLAGS += -s -Wl,-warn-common - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif -@@ -187,8 +189,8 @@ - - CRT0 = $(KLIBC_DIR)/crt0.o - LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) -- CFLAGS += $(WARNINGS) -nostdinc \ -- $(OPTFLAGS) \ -+ CFLAGS += $(WARNINGS) $(OPTFLAGS) -+ override CFLAGS += -nostdinc \ - -D__KLIBC__ -fno-builtin-printf \ - -I$(KLIBC_FIXUPS_DIR) \ - -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \ -@@ -198,7 +200,7 @@ - -I$(GCCINCDIR) \ - -I$(LINUX_INCLUDE_DIR) - LIB_OBJS = -- LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs -+ override LDFLAGS += --static --nostdlib -nostartfiles -nodefaultlibs - - HEADERS += \ - klibc_fixups/klibc_fixups.h \ -@@ -213,7 +215,8 @@ - WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - CRT0 = - LIBC = -- CFLAGS += $(WARNINGS) -I$(GCCINCDIR) -+ CFLAGS += $(WARNINGS) -+ override CFLAGS += -I$(GCCINCDIR) - LIB_OBJS = -lc - LDFLAGS = - endif -@@ -221,7 +224,7 @@ - ifeq ($(strip $(USE_SELINUX)),true) - UDEV_OBJS += udev_selinux.o - LIB_OBJS += -lselinux -- CFLAGS += -DUSE_SELINUX -+ override CFLAGS += -DUSE_SELINUX - endif - - ifeq ($(strip $(V)),false) diff --git a/packages/udev/udev-063/.mtn2git_empty b/packages/udev/udev-063/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/udev-063/.mtn2git_empty diff --git a/packages/udev/udev-063/flags.patch b/packages/udev/udev-063/flags.patch new file mode 100644 index 0000000000..e6969f2f63 --- /dev/null +++ b/packages/udev/udev-063/flags.patch @@ -0,0 +1,53 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-062/Makefile~flags.patch ++++ udev-062/Makefile +@@ -151,16 +151,17 @@ + + SYSFS = $(PWD)/libsysfs/sysfs.a + +-CFLAGS += -I$(PWD)/libsysfs/sysfs \ ++override CFLAGS += -I$(PWD)/libsysfs/sysfs \ + -I$(PWD)/libsysfs + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++ override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip or optimize + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -O1 -g -DDEBUG ++ CFLAGS += -O1 -g ++ override CFLAGS += -DDEBUG + LDFLAGS += -Wl + STRIPCMD = /bin/true -Since_we_are_debugging + else +@@ -176,19 +177,20 @@ + KLCC = $(KLIBC_INSTALL)/bin/$(CROSS)klcc + CC = $(KLCC) + LD = $(KLCC) ++ override LDFLAGS += -static + else +- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations ++ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations + endif + + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(USE_STATIC)),true) +- CFLAGS += -DUSE_STATIC +- LDFLAGS += -static ++ override CFLAGS += -DUSE_STATIC ++ override LDFLAGS += -static + endif + + ifeq ($(strip $(V)),false) diff --git a/packages/udev/udev-063/noasmlinkage.patch b/packages/udev/udev-063/noasmlinkage.patch new file mode 100644 index 0000000000..0d8e854c0e --- /dev/null +++ b/packages/udev/udev-063/noasmlinkage.patch @@ -0,0 +1,38 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-062/udev.c~noasmlinkage.patch ++++ udev-062/udev.c +@@ -54,7 +54,7 @@ + } + #endif + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: +--- udev-062/udevd.c~noasmlinkage.patch ++++ udev-062/udevd.c +@@ -639,7 +639,7 @@ + return msg; + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + int rc; + +--- udev-062/udevstart.c~noasmlinkage.patch ++++ udev-062/udevstart.c +@@ -323,7 +323,7 @@ + exec_list(&device_list); + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc index 0648034276..00abd36ba2 100644 --- a/packages/udev/udev.inc +++ b/packages/udev/udev.inc @@ -1,7 +1,6 @@ DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \ /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." LICENSE = "GPL" -PR = "r3" UDEV_DEVFS_RULES ?= "0" @@ -37,4 +36,7 @@ do_install () { if [ "${UDEV_DEVFS_RULES}" = "1" ]; then install -m 0644 ${S}/etc/udev/udev.rules.devfs ${D}${sysconfdir}/udev/rules.d/50-udev.rules fi + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${S}/etc/udev/debian/permissions.rules ${D}${sysconfdir}/udev/rules.d/ } + diff --git a/packages/udev/udev_050.bb b/packages/udev/udev_050.bb deleted file mode 100644 index be616b5493..0000000000 --- a/packages/udev/udev_050.bb +++ /dev/null @@ -1,8 +0,0 @@ -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://flags.patch;patch=1 \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://kill_logname.patch;patch=1 \ - file://init" - -include udev.inc diff --git a/packages/udev/udev_054.bb b/packages/udev/udev_054.bb deleted file mode 100644 index 4c54c56b57..0000000000 --- a/packages/udev/udev_054.bb +++ /dev/null @@ -1,7 +0,0 @@ -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://flags.patch;patch=1 \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://init" - -include udev.inc diff --git a/packages/udev/udev_058.bb b/packages/udev/udev_058.bb index 20f49ac7c5..539e7aedb8 100644 --- a/packages/udev/udev_058.bb +++ b/packages/udev/udev_058.bb @@ -8,8 +8,3 @@ include udev.inc PR = "r3" # CFLAGS += -I${STAGING_INCDIR}/sysfs - -do_install_append() { - install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${S}/etc/udev/debian/permissions.rules ${D}${sysconfdir}/udev/rules.d/ -} diff --git a/packages/udev/udev_042.bb b/packages/udev/udev_063.bb index af03818cfd..60340ca175 100644 --- a/packages/udev/udev_042.bb +++ b/packages/udev/udev_063.bb @@ -1,9 +1,13 @@ -PR = "r3" - SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://flags.patch;patch=1 \ file://tmpfs.patch;patch=1 \ file://noasmlinkage.patch;patch=1 \ + file://flags.patch;patch=1 \ file://init" include udev.inc + +PR = "r0" + +#FIXME a) udevd doesn't start with our init script (the init script seems to be pretty oudated) +#FIXME b) lots of alignment errors when manually starting udevd +DEFAULT_PREFERENCE = "-1" diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc index df97498c49..5d4ed8063a 100644 --- a/packages/util-linux/util-linux.inc +++ b/packages/util-linux/util-linux.inc @@ -33,5 +33,10 @@ do_compile () { } do_install () { - oe_runmake 'DESTDIR=${D}' install + # with ccache the timestamps on compiled files may + # end up earlier than on their inputs, this allows + # for the resultant compilation in the install step. + oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ + 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ + 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install } |