From 23f9d417abc9370bd7495622f84c990f718e7bf5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Oct 2008 09:13:31 +0000 Subject: cpan* bbclass: fix for staging layout changes sdk bblcass: ditto, this time the fix is from poky --- classes/cpan-base.bbclass | 2 +- classes/cpan.bbclass | 2 +- classes/cpan_build.bbclass | 2 +- classes/sdk.bbclass | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass index cc0d11e515..19d431ce72 100644 --- a/classes/cpan-base.bbclass +++ b/classes/cpan-base.bbclass @@ -10,7 +10,7 @@ RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" # Determine the staged version of perl from the perl configuration file def get_perl_version(d): import os, bb, re - cfg = bb.data.expand('${STAGING_DIR}/${HOST_SYS}/perl/config.sh', d) + cfg = bb.data.expand('${STAGING_DIR_HOST}/perl/config.sh', d) try: f = open(cfg, 'r') except IOError: diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 005e7cc0e9..3ff3f3093d 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -15,7 +15,7 @@ export PERL_ARCHLIB = "${STAGING_LIBDIR_NATIVE}/perl/${@get_perl_version(d)}" cpan_do_configure () { yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then - . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh + . ${STAGING_DIR_TARGET}/perl/config.sh if [ "${IS_NEW_PERL}" = "yes" ]; then sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \ -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \ diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass index 63e716c099..c3804ff4cc 100644 --- a/classes/cpan_build.bbclass +++ b/classes/cpan_build.bbclass @@ -25,7 +25,7 @@ DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}" cpan_build_do_configure () { if [ ${@is_target(d)} == "yes" ]; then # build for target - . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh + . ${STAGING_DIR_TARGET}/perl/config.sh if [ "${IS_NEW_PERL}" = "yes" ]; then perl Build.PL --installdirs vendor \ --destdir ${D} \ diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index a94332b92c..6c66eac7ad 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -2,15 +2,24 @@ # or indirectly via dependency. No need to be in 'world'. EXCLUDE_FROM_WORLD = "1" +# Save MULTIMACH_ARCH +OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" +# Save PACKAGE_ARCH OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" +# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it +OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}" +BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}" + STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-sdk" +STAGING_DIR_TARGET = "${STAGING_DIR}/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" HOST_ARCH = "${BUILD_ARCH}" HOST_VENDOR = "${BUILD_VENDOR}" HOST_OS = "${BUILD_OS}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" +#HOST_SYS = "${HOST_ARCH}${TARGET_VENDOR}-${HOST_OS}" CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" -- cgit v1.2.3 From c43cac1ec65bab71076def681418384a512497a6 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Tue, 7 Oct 2008 09:54:04 +0000 Subject: java.bbclass: Fixed oe_makeclasspath classpath generation. --- classes/java.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/java.bbclass b/classes/java.bbclass index 9e51a0b7b2..11a2bf5c0c 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -99,7 +99,7 @@ oe_makeclasspath() { oefatal "oe_makeclasspath: Jar file for '$1' not found at $file" fi - classpath=$classpath$file + classpath=$classpath$delimiter$file delimiter=":" ;; esac -- cgit v1.2.3 From 29889872a04b60606878c216ad3fa5dbbf3023ec Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Tue, 7 Oct 2008 21:05:11 +0000 Subject: base.bbclass: Use 'unzip' for *.jar files as well. --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 540b891669..c76154901e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -636,7 +636,7 @@ def oe_unpack_file(file, data, url = None): cmd = 'gzip -dc %s > %s' % (file, efile) elif file.endswith('.bz2'): cmd = 'bzip2 -dc %s > %s' % (file, efile) - elif file.endswith('.zip'): + elif file.endswith('.zip') or file.endswith('.jar'): cmd = 'unzip -q -o' (type, host, path, user, pswd, parm) = bb.decodeurl(url) if 'dos' in parm: -- cgit v1.2.3 From 3edc90bafa0912873ae40910f7481aec4737dfd8 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Tue, 7 Oct 2008 21:08:06 +0000 Subject: java.bbclass: Make oe_makeclasspath behavior more sane. * return oe_makeclasspath result in variable * check for file existence only when -s is given --- classes/java.bbclass | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'classes') diff --git a/classes/java.bbclass b/classes/java.bbclass index 11a2bf5c0c..620dae79fb 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -70,19 +70,27 @@ oe_jarinstall() { oe_makeclasspath() { # Purpose: Generate a classpath variable from the given Jar file names - # where the ".jar" has been omitted. + # where the ".jar" has been omitted. The string is stored in the script + # variable whose name is given in the first argument to this function. # - # oe_makeclasspath foo baz bar - # Prints ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar - # - # oe_makeclasspath -s foo baz bar - # Prints ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar + # oe_makeclasspath cp foo baz bar + # Stores ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar + # in variable "cp". # + # oe_makeclasspath bootcp -s foo baz bar + # Stores ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar + # in variable "bootcp". + # # Provide the -s at the beginning otherwise strange things happen. - # + # If -s is given the function checks whether the requested jar file exists + # and exits with an error message if it cannot be found. + # dir=${datadir_java} classpath= delimiter= + retval=$1 + + shift while [ "$#" -gt 0 ]; do case "$1" in @@ -95,7 +103,7 @@ oe_makeclasspath() { *) file=$dir/$1.jar - if [ ! -f $file ]; then + if [ -z "$dir" -a ! -f $file ]; then oefatal "oe_makeclasspath: Jar file for '$1' not found at $file" fi @@ -106,7 +114,7 @@ oe_makeclasspath() { shift done - echo $classpath + eval $retval="$classpath" } # Creates a simple wrapper script for your Java program. -- cgit v1.2.3 From 2a82625e1b63d1eb33b37fea6c96b14e02549708 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 8 Oct 2008 22:06:39 +0000 Subject: gettext.bbclass: make it simpler to understand * set the deps for package which can use NLS stuff * filter the deps out if NLS is not requested --- classes/gettext.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'classes') diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass index a1e00e72c1..1c7661ddb9 100644 --- a/classes/gettext.bbclass +++ b/classes/gettext.bbclass @@ -1,16 +1,16 @@ +DEPENDS =+ "gettext-native virtual/libiconv virtual/libintl" +EXTRA_OECONF += "--enable-nls" + def gettext_after_parse(d): import bb # Remove the NLS bits if USE_NLS is no. if bb.data.getVar('USE_NLS', d, 1) == 'no': cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d) cfg += " --disable-nls" - depends = bb.data.getVar('DEPENDS', d, 1) or "" - bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d) bb.data.setVar('EXTRA_OECONF', cfg, d) + depends = bb.data.getVar('DEPENDS', d, 1) or "" + bb.data.setVar('DEPENDS', oe_filter_out('^(gettext-native|virtual/libiconv|virtual/libintl)$', depends, d), d) python () { gettext_after_parse(d) } - -DEPENDS =+ "gettext-native" -EXTRA_OECONF += "--enable-nls" -- cgit v1.2.3 From 355d05a507306d7e18e86fac778e0aaa7f0208d5 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 9 Oct 2008 07:59:28 +0000 Subject: revert last patch as it leads to a build loop. woglinde, please try again. --- classes/gettext.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'classes') diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass index 1c7661ddb9..982d8c8e5c 100644 --- a/classes/gettext.bbclass +++ b/classes/gettext.bbclass @@ -1,16 +1,17 @@ -DEPENDS =+ "gettext-native virtual/libiconv virtual/libintl" -EXTRA_OECONF += "--enable-nls" - def gettext_after_parse(d): import bb # Remove the NLS bits if USE_NLS is no. if bb.data.getVar('USE_NLS', d, 1) == 'no': cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d) cfg += " --disable-nls" - bb.data.setVar('EXTRA_OECONF', cfg, d) depends = bb.data.getVar('DEPENDS', d, 1) or "" - bb.data.setVar('DEPENDS', oe_filter_out('^(gettext-native|virtual/libiconv|virtual/libintl)$', depends, d), d) + bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d) + bb.data.setVar('EXTRA_OECONF', cfg, d) python () { gettext_after_parse(d) } + +DEPENDS =+ "gettext-native" +EXTRA_OECONF += "--enable-nls" + -- cgit v1.2.3 From 426e03a54e3991b6651bf37d54e78494bcb2d20b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 9 Oct 2008 08:02:50 +0000 Subject: gettext.bbclass: revert part of a cset that breaks OE with inifinite loops --- classes/gettext.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass index 1c7661ddb9..a2563466dd 100644 --- a/classes/gettext.bbclass +++ b/classes/gettext.bbclass @@ -1,4 +1,4 @@ -DEPENDS =+ "gettext-native virtual/libiconv virtual/libintl" +DEPENDS =+ "gettext-native" EXTRA_OECONF += "--enable-nls" def gettext_after_parse(d): -- cgit v1.2.3