[oe-commits] org.oe.dev merge of '0c1bf31806b2e4fc83b4405655fc3b14a98915c5'
xjqian commit
openembedded-commits at lists.openembedded.org
Fri Nov 23 05:29:26 UTC 2007
merge of '0c1bf31806b2e4fc83b4405655fc3b14a98915c5'
and '4ddcde2cef4794d1b3f1a9b16da170dd6f4a97a6'
Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 32dd4eac9d28161db1a48fe59153d6369965dfcd
ViewMTN: http://monotone.openembedded.org/revision/info/32dd4eac9d28161db1a48fe59153d6369965dfcd
Files:
1
packages/octave/octave_2.1.71.bb
packages/octave/octave_2.1.73.bb
packages/octave/files
packages/octave/files/configure.patch
packages/octave/octave.inc
packages/octave/octave_2.9.17.bb
MAINTAINERS
packages/fftw/fftw.inc
packages/gcc/gcc-package.inc
packages/gcc/gcc3-build.inc
packages/gcc/gcc_4.1.2.bb
packages/gcc/gcc-4.1.2/pr34130.patch
packages/gcc/gcc-cross_4.1.2.bb
Diffs:
#
# mt diff -r0c1bf31806b2e4fc83b4405655fc3b14a98915c5 -r32dd4eac9d28161db1a48fe59153d6369965dfcd
#
#
#
# rename "packages/octave/octave_2.1.71.bb"
# to "packages/octave/octave_2.1.73.bb"
#
# add_dir "packages/octave/files"
#
# add_file "packages/octave/files/configure.patch"
# content [70d1b41778702736488c58c82728937a3091901e]
#
# add_file "packages/octave/octave.inc"
# content [ee444b2bd09390c3cf0f543fd839457a3a0fb8c3]
#
# add_file "packages/octave/octave_2.9.17.bb"
# content [028a53a764b76cb30a096e4ddaa61129061e6629]
#
# patch "MAINTAINERS"
# from [1ded1e429f8171d33e507e4cebb7bd6cd431d85f]
# to [bf1ee44523aae87cd663a75d807708a6419b0343]
#
# patch "packages/fftw/fftw.inc"
# from [e7bfbc9da005bf47d582dff8d6b4c26e0c98ea0a]
# to [65b61e991db9e392a7740d8b38268470d8f36e00]
#
# patch "packages/gcc/gcc-package.inc"
# from [b77b1684159d4b5050a27f6b70d7a246d5a94153]
# to [fb44f67e25ac9898fae35ea8786446b7969aa444]
#
# patch "packages/gcc/gcc3-build.inc"
# from [6a501794e83ad070120fbf96a142d7c1dd57b9d2]
# to [fd1d8e1a435e000a557d01da93aafa359e8f84ba]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [f83d37a6eb350627b87317b6e2b770377361267e]
# to [f7e006ab2bdebfe7116f5af1505b28bf1a790d73]
#
# patch "packages/octave/octave_2.1.73.bb"
# from [78e27523063cd8236102912792240a3029e2e1b5]
# to [028ace8fc5a864067196732b53fb3568c0000830]
#
============================================================
--- packages/octave/files/configure.patch 70d1b41778702736488c58c82728937a3091901e
+++ packages/octave/files/configure.patch 70d1b41778702736488c58c82728937a3091901e
@@ -0,0 +1,15 @@
+--- octave-2.9.17/configure.old 2007-11-17 18:57:35.000000000 -0600
++++ octave-2.9.17/configure 2007-11-17 19:08:33.000000000 -0600
+@@ -22598,11 +22598,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
============================================================
--- packages/octave/octave.inc ee444b2bd09390c3cf0f543fd839457a3a0fb8c3
+++ packages/octave/octave.inc ee444b2bd09390c3cf0f543fd839457a3a0fb8c3
@@ -0,0 +1,29 @@
+DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
+It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
+and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
+It may also be used as a batch-oriented language."
+HOMEPAGE = "http://www.gnu.org/software/octave/"
+SECTION = "console/scientific"
+LICENSE = "GPL"
+DEPENDS = "readline ncurses fftw"
+RDEPENDS = "libfftw3"
+# fftw compiled with --disable-fortran
+
+inherit autotools
+
+EXTRA_OECONF = "--without-hdf5"
+
+do_configure() {
+ gnu-configize
+ oe_runconf
+}
+
+PACKAGES =+ "octave-m"
+
+# octave-m provides matlab routines in .m file format
+FILES_${PN}-m = "${datadir}/${PN}/*"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/octave/octave_2.9.17.bb 028a53a764b76cb30a096e4ddaa61129061e6629
+++ packages/octave/octave_2.9.17.bb 028a53a764b76cb30a096e4ddaa61129061e6629
@@ -0,0 +1,27 @@
+require octave.inc
+
+SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
+ file://configure.patch;patch=1"
+
+PR = "r0"
+
+PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
+ libcruft-dev liboctave-dev liboctinterp-dev \
+ libcruft-dbg liboctave-dbg liboctinterp-dbg"
+
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft-dbg = "${libdir}/${PN}-${PV}/.debug/libcruft*"
+
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave-dbg = "${libdir}/${PN}-${PV}/.debug/liboctave*"
+
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp-dbg = "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
+
+# octave-oct provides subroutines in .oct file format
+FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct"
+
+FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug"
============================================================
--- MAINTAINERS 1ded1e429f8171d33e507e4cebb7bd6cd431d85f
+++ MAINTAINERS bf1ee44523aae87cd663a75d807708a6419b0343
@@ -94,7 +94,7 @@ Distros: Ångström
Mail: xjqian at gmail.com
Machines: tosa, borzoi, nokia770
Distros: Ångström
-Recipes: gnuplot
+Recipes: gnuplot octave
Person: Justin Patrin
Mail: papercrane at reversefold.com
============================================================
--- packages/fftw/fftw.inc e7bfbc9da005bf47d582dff8d6b4c26e0c98ea0a
+++ packages/fftw/fftw.inc 65b61e991db9e392a7740d8b38268470d8f36e00
@@ -1,7 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "FFTW"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
+RPROVIDES += "libfftw3"
PR = "r1"
============================================================
--- packages/gcc/gcc-package.inc b77b1684159d4b5050a27f6b70d7a246d5a94153
+++ packages/gcc/gcc-package.inc fb44f67e25ac9898fae35ea8786446b7969aa444
@@ -5,6 +5,7 @@ PACKAGES = "libgcc ${PN} ${PN}-symlinks
g++ g++-symlinks \
cpp cpp-symlinks \
g77 g77-symlinks \
+ gfortran gfortran-symlinks \
gcov gcov-symlinks \
libmudflap libmudflap-dev \
libstdc++ libg2c \
@@ -28,6 +29,11 @@ FILES_g77-symlinks = "${bindir}/g77 \
FILES_g77-symlinks = "${bindir}/g77 \
${bindir}/f77"
+FILES_gfortran = "${bindir}/${TARGET_PREFIX}gfortran \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951"
+FILES_gfortran-symlinks = "${bindir}/gfortran \
+ ${bindir}/f95"
+
FILES_cpp = "${bindir}/${TARGET_PREFIX}cpp \
${base_libdir}/cpp"
FILES_cpp-symlinks = "${bindir}/cpp"
@@ -115,9 +121,11 @@ do_install () {
# Symlinks so we can use these trivially on the target
ln -sf ${TARGET_SYS}-g77 g77
+ ln -sf ${TARGET_SYS}-gfortran gfortran
ln -sf ${TARGET_SYS}-g++ g++
ln -sf ${TARGET_SYS}-gcc gcc
ln -sf g77 f77
+ ln -sf gfortran f95
ln -sf g++ c++
ln -sf gcc cc
ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp
============================================================
--- packages/gcc/gcc3-build.inc 6a501794e83ad070120fbf96a142d7c1dd57b9d2
+++ packages/gcc/gcc3-build.inc fd1d8e1a435e000a557d01da93aafa359e8f84ba
@@ -16,7 +16,7 @@ JAVA_sh3 ?= ""
JAVA_armeb ?= ""
JAVA_mipsel ?= ""
JAVA_sh3 ?= ""
-# gcc4-build sets this to f95
+# gcc4-build sets this to fortran
FORTRAN ?= ",f77"
LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
============================================================
--- packages/gcc/gcc_4.1.2.bb f83d37a6eb350627b87317b6e2b770377361267e
+++ packages/gcc/gcc_4.1.2.bb f7e006ab2bdebfe7116f5af1505b28bf1a790d73
@@ -42,6 +42,7 @@ FORTRAN = ""
#Set the fortran bits
# ',fortran' or '', not 'f77' like gcc3 had
FORTRAN = ""
+FORTRAN_linux-gnueabi = ",fortran"
#Set the java bits
JAVA = ""
============================================================
--- packages/octave/octave_2.1.71.bb 78e27523063cd8236102912792240a3029e2e1b5
+++ packages/octave/octave_2.1.73.bb 028ace8fc5a864067196732b53fb3568c0000830
@@ -1,17 +1,11 @@
-DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
-It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
-and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
-It may also be used as a batch-oriented language."
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "readline ncurses"
-SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz"
+require octave.inc
-inherit autotools
+SRC_URI = "ftp://ftp.octave.org/pub/octave/obsolete/${PN}-${PV}.tar.gz"
-FILES_${PN}-dev += "${libdir}/octave-${PV}/*.la ${libdir}/octave-${PV}/*.a"
+PR = "r0"
+PACKAGES =+ "libcruft-dev liboctave-dev liboctinterp-dev"
+
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*"
-do_configure() {
- gnu-configize
- oe_runconf
-}
#
# mt diff -r4ddcde2cef4794d1b3f1a9b16da170dd6f4a97a6 -r32dd4eac9d28161db1a48fe59153d6369965dfcd
#
#
#
# add_file "packages/gcc/gcc-4.1.2/pr34130.patch"
# content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
#
# patch "packages/gcc/gcc-cross_4.1.2.bb"
# from [a848d98b3c6945c2d1c6945793cd4c470e593886]
# to [83f877f5f2ae3f14b9bf2a68b64d508fd1835087]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [a5f44bb9fbea67e32cb70527b86d211308a2bf94]
# to [f7e006ab2bdebfe7116f5af1505b28bf1a790d73]
#
============================================================
--- packages/gcc/gcc-4.1.2/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
+++ packages/gcc/gcc-4.1.2/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c 2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c 2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+ }
+ break;
+ }
+- /* FALLTHROUGH */
++ /* If the constant is negative, we cannot simplify this. */
++ if (tree_int_cst_sgn (c) == -1)
++ break;
++ /* FALLTHROUGH */
+ case NEGATE_EXPR:
+ if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
============================================================
--- packages/gcc/gcc-cross_4.1.2.bb a848d98b3c6945c2d1c6945793cd4c470e593886
+++ packages/gcc/gcc-cross_4.1.2.bb 83f877f5f2ae3f14b9bf2a68b64d508fd1835087
@@ -1,11 +1,11 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require gcc_${PV}.bb
# path mangling, needed by the cross packaging
require gcc-paths-cross.inc
inherit cross
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR. If the main .oe changes something that affects its *build*
+# NOTE: split PR. If the main .bb changes something that affects its *build*
# remember to increment this one too.
-PR = "r10"
+PR = "r11"
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc_4.1.2.bb a5f44bb9fbea67e32cb70527b86d211308a2bf94
+++ packages/gcc/gcc_4.1.2.bb f7e006ab2bdebfe7116f5af1505b28bf1a790d73
@@ -1,8 +1,10 @@
-PR = "r7"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+# NOTE: split PR. If the main .bb changes something that affects its *build*
+# remember to increment the -cross .bb PR too.
+PR = "r8"
inherit autotools gettext
@@ -32,6 +34,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://cache-amnesia.patch;patch=1 \
file://gfortran.patch;patch=1 \
file://gcc-4.0.2-e300c2c3.patch;patch=1 \
+ file://pr34130.patch;patch=1 \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
More information about the Openembedded-commits
mailing list