[oe-commits] org.oe.dev merge of '28f2be15a1987cef44b7ffbdc930f5e483a49de4'
oe commit
oe at amethyst.openembedded.net
Mon May 12 00:33:31 UTC 2008
merge of '28f2be15a1987cef44b7ffbdc930f5e483a49de4'
and 'b0651d742b7cf6671d07f2ab5026e017142e5166'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: ecf50bcd3a15915d3f0eabbf8a4f812546c9b015
ViewMTN: http://monotone.openembedded.org/revision/info/ecf50bcd3a15915d3f0eabbf8a4f812546c9b015
Files:
1
packages/gcc/gcc-csl-arm/fortran-static-linking.patch
packages/gcc/gcc-csl-arm/gcc41-configure.in.patch
packages/gcc/gcc-csl-arm/ldflags.patch
packages/gcc/gcc-csl-arm/pr34130.patch
packages/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
packages/gcc/gcc-csl-arm-2008q1.inc
classes/autotools.bbclass
packages/gnash/gnash-minimal.inc
Diffs:
#
# mt diff -r28f2be15a1987cef44b7ffbdc930f5e483a49de4 -recf50bcd3a15915d3f0eabbf8a4f812546c9b015
#
#
#
# add_file "packages/gcc/gcc-csl-arm/fortran-static-linking.patch"
# content [e51538f27d036e3418faae17b7dcd656ae38313a]
#
# add_file "packages/gcc/gcc-csl-arm/gcc41-configure.in.patch"
# content [baa3cf740d1ea329fcdef9bc110461df8952fc02]
#
# add_file "packages/gcc/gcc-csl-arm/ldflags.patch"
# content [64f8908c9e364510562ad336363270389079e3ad]
#
# add_file "packages/gcc/gcc-csl-arm/pr34130.patch"
# content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
#
# add_file "packages/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch"
# content [3df45360067c99ecdec52e388d544e6bd01f5efd]
#
# patch "packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb"
# from [44102db1950367b7c49915ce10725bde9e268907]
# to [209670b2c97a07d8fe90c67d0482db2ce4dab692]
#
# patch "packages/gcc/gcc-csl-arm-2008q1.inc"
# from [7c5b63e905bed09caf2498b3609f935c1756221b]
# to [d39832893be05c77db65a419983a198973a81460]
#
============================================================
--- packages/gcc/gcc-csl-arm/fortran-static-linking.patch e51538f27d036e3418faae17b7dcd656ae38313a
+++ packages/gcc/gcc-csl-arm/fortran-static-linking.patch e51538f27d036e3418faae17b7dcd656ae38313a
@@ -0,0 +1,48 @@
+f951 (fortran) links to MPFR and GMP of our staging area but when executing
+the command the libs can not be found. Use rpath like all the other apps in
+our staging bin/ directory.
+
+Patch the configure to avoid the regeneration...
+
+Index: gcc-4.2.2/configure
+===================================================================
+--- gcc-4.2.2.orig/configure 2008-01-15 23:23:41.000000000 +0100
++++ gcc-4.2.2/configure 2008-01-15 23:25:20.000000000 +0100
+@@ -2278,14 +2278,14 @@
+
+
+ if test "x$with_mpfr" != x; then
+- gmplibs="-L$with_mpfr/lib $gmplibs"
++ gmplibs="-static -L$with_mpfr/lib $gmplibs"
+ gmpinc="-I$with_mpfr/include"
+ fi
+ if test "x$with_mpfr_include" != x; then
+ gmpinc="-I$with_mpfr_include"
+ fi
+ if test "x$with_mpfr_lib" != x; then
+- gmplibs="-L$with_mpfr_lib $gmplibs"
++ gmplibs="-static -L$with_mpfr_lib $gmplibs"
+ fi
+
+ # Specify a location for gmp
+Index: gcc-4.2.2/configure.in
+===================================================================
+--- gcc-4.2.2.orig/configure.in 2008-01-15 23:23:41.000000000 +0100
++++ gcc-4.2.2/configure.in 2008-01-15 23:24:36.000000000 +0100
+@@ -1066,14 +1066,14 @@
+ AC_ARG_WITH(mpfr_lib, [ --with-mpfr-lib=PATH Specify the directory for the installed MPFR library])
+
+ if test "x$with_mpfr" != x; then
+- gmplibs="-L$with_mpfr/lib $gmplibs"
++ gmplibs="-static -L$with_mpfr/lib $gmplibs"
+ gmpinc="-I$with_mpfr/include"
+ fi
+ if test "x$with_mpfr_include" != x; then
+ gmpinc="-I$with_mpfr_include"
+ fi
+ if test "x$with_mpfr_lib" != x; then
+- gmplibs="-L$with_mpfr_lib $gmplibs"
++ gmplibs="-static -L$with_mpfr_lib $gmplibs"
+ fi
+
+ # Specify a location for gmp
============================================================
--- packages/gcc/gcc-csl-arm/gcc41-configure.in.patch baa3cf740d1ea329fcdef9bc110461df8952fc02
+++ packages/gcc/gcc-csl-arm/gcc41-configure.in.patch baa3cf740d1ea329fcdef9bc110461df8952fc02
@@ -0,0 +1,22 @@
+--- gcc-3.4.4/configure.in.orig 2005-08-09 19:57:51.504323183 -0700
++++ gcc-3.4.4/configure.in 2005-08-09 20:00:12.073168623 -0700
+@@ -1907,7 +1907,7 @@
+ *) gxx_include_dir=${with_gxx_include_dir} ;;
+ esac
+
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+ *" newlib "*)
+ case " $target_configargs " in
+--- gcc-3.4.4/configure.orig 2005-08-09 21:02:29.668360660 -0700
++++ gcc-3.4.4/configure 2005-08-09 21:02:50.157649970 -0700
+@@ -2669,7 +2669,7 @@
+ *) gxx_include_dir=${with_gxx_include_dir} ;;
+ esac
+
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+ *" newlib "*)
+ case " $target_configargs " in
============================================================
--- packages/gcc/gcc-csl-arm/ldflags.patch 64f8908c9e364510562ad336363270389079e3ad
+++ packages/gcc/gcc-csl-arm/ldflags.patch 64f8908c9e364510562ad336363270389079e3ad
@@ -0,0 +1,22 @@
+--- /tmp/Makefile.in 2006-02-23 20:56:01.399758728 +0100
++++ gcc-4.1-20060217/Makefile.in 2006-02-23 20:56:16.874406224 +0100
+@@ -334,7 +334,7 @@
+ CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
+ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+ LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+-LDFLAGS_FOR_TARGET =
++LDFLAGS_FOR_TARGET = @LDFLAGS@
+ PICFLAG_FOR_TARGET =
+
+ # ------------------------------------
+--- /tmp/Makefile.tpl 2006-02-23 20:50:34.077519272 +0100
++++ gcc-4.1-20060217/Makefile.tpl 2006-02-23 21:04:31.092273688 +0100
+@@ -337,7 +337,7 @@
+ CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
+ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+ LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+-LDFLAGS_FOR_TARGET =
++LDFLAGS_FOR_TARGET = @LDFLAGS@
+ PICFLAG_FOR_TARGET =
+
+ # ------------------------------------
============================================================
--- packages/gcc/gcc-csl-arm/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
+++ packages/gcc/gcc-csl-arm/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-csl-arm/zecke-xgcc-cpp.patch 3df45360067c99ecdec52e388d544e6bd01f5efd
+++ packages/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch 3df45360067c99ecdec52e388d544e6bd01f5efd
@@ -0,0 +1,16 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
+Index: gcc-4.1.1/Makefile.in
+===================================================================
+--- gcc-4.1.1.orig/Makefile.in 2006-08-06 13:32:44.000000000 +0200
++++ gcc-4.1.1/Makefile.in 2006-08-06 13:32:46.000000000 +0200
+@@ -194,6 +194,7 @@
+ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ CC="$(CC_FOR_TARGET)"; export CC; \
+ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++ CPP="$(CC_FOR_TARGET) -E"; export CCP; \
+ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
============================================================
--- packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb 44102db1950367b7c49915ce10725bde9e268907
+++ packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb 209670b2c97a07d8fe90c67d0482db2ce4dab692
@@ -3,5 +3,4 @@ S = "${WORKDIR}/gcc-4.2"
S = "${WORKDIR}/gcc-4.2"
+EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
-EXTRA_OECONF += "--disable-libmudflap \
- --disable-libssp"
============================================================
--- packages/gcc/gcc-csl-arm-2008q1.inc 7c5b63e905bed09caf2498b3609f935c1756221b
+++ packages/gcc/gcc-csl-arm-2008q1.inc d39832893be05c77db65a419983a198973a81460
@@ -6,6 +6,11 @@ SRC_URI = "http://www.codesourcery.com/p
FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q1-126-arm-none-eabi.src.tar.bz2 \
+ file://gcc41-configure.in.patch;patch=1 \
+ file://ldflags.patch;patch=1 \
+ file://zecke-xgcc-cpp.patch;patch=1 \
+ file://gfortran.patch;patch=1 \
+ file://fortran-static-linking.patch;patch=1 \
# file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
# file://gcc-new-makeinfo.patch;patch=1 \
"
#
# mt diff -rb0651d742b7cf6671d07f2ab5026e017142e5166 -recf50bcd3a15915d3f0eabbf8a4f812546c9b015
#
#
#
# patch "classes/autotools.bbclass"
# from [a1ec1e20a8e54947ec2b6b362378264caa8dec67]
# to [77ba9664d4d26f5edd362d75ede90780a2f3c741]
#
# patch "packages/gnash/gnash-minimal.inc"
# from [1bee048015c6fd48b776cf485a13dbb2f2e82b77]
# to [4f073317393d7ee6d728899ab795f4b07e013bf5]
#
============================================================
--- classes/autotools.bbclass a1ec1e20a8e54947ec2b6b362378264caa8dec67
+++ classes/autotools.bbclass 77ba9664d4d26f5edd362d75ede90780a2f3c741
@@ -172,7 +172,7 @@ autotools_stage_dir() {
rmdir "$from" 2> /dev/null || true
if [ -d "$from" ]; then
mkdir -p "$to"
- cp -fpPR "$from"/* "$to"
+ cp -fpPR -t "$to" "$from"/*
fi
}
@@ -205,8 +205,8 @@ autotools_stage_all() {
for i in $las
do
dir=$(dirname $i)
- echo "oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}"
- oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}
+ echo "oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}"
+ oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}
done
else
# Otherwise libtool wasn't used, and lib/ can be copied
@@ -233,3 +233,4 @@ EXPORT_FUNCTIONS do_configure do_install
}
EXPORT_FUNCTIONS do_configure do_install
+
============================================================
--- packages/gnash/gnash-minimal.inc 1bee048015c6fd48b776cf485a13dbb2f2e82b77
+++ packages/gnash/gnash-minimal.inc 4f073317393d7ee6d728899ab795f4b07e013bf5
@@ -2,7 +2,7 @@ DEPENDS = "agg libxml2 libmad zlib boost
HOMEPAGE = "http://www.gnu.org/software/gnash"
LICENSE = "GPL-2"
DEPENDS = "agg libxml2 libmad zlib boost jpeg pango curl freetype"
-PR = "r4"
+PR = "r5"
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
S = ${WORKDIR}/gnash-${PV}
@@ -39,6 +39,10 @@ EXTRA_OECONF="--enable-gui=gtk \
--with-top-level=${STAGING_DIR_HOST}/usr \
"
+# the test for error_t is wrong for uclibc, needs _GNU_SOURCE for correct
+# detection because uclibc does not have argz.h which enables error_t
+CFLAGS += " -D_GNU_SOURCE "
+
PACKAGES =+ " libgnashamf libgnashbase libgnashserver libgnashmedia libltdl"
FILES_libltdl = "${libdir}/gnash/libltdl*.so*"
More information about the Openembedded-commits
mailing list