[oe-commits] org.oe.dev merge of '985da843108cf6ed11892842f921418171e3d429'
mickeyl commit
openembedded-commits at lists.openembedded.org
Wed Feb 20 17:06:00 UTC 2008
merge of '985da843108cf6ed11892842f921418171e3d429'
and '9a694dbde6dd96803bccae08f8e83850e03f2b58'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 1c2a066fe666a7ab871c0b647aa7557802e7960c
ViewMTN: http://monotone.openembedded.org/revision/info/1c2a066fe666a7ab871c0b647aa7557802e7960c
Files:
1
packages/gcc/gcc-package.inc
packages/gcc/gcc_4.0.0.bb
packages/gcc/gcc_4.0.2.bb
packages/gcc/gcc_4.1.0.bb
packages/gcc/gcc_4.1.1.bb
packages/gcc/gcc_4.1.2.bb
packages/gcc/gcc_4.2.1.bb
packages/gcc/gcc_4.2.2.bb
packages/gaim
packages/obsolete/gaim
packages/gaim/files/purple-OE-branding.patch
packages/pidgin/pidgin/purple-OE-branding.patch
packages/gaim/pidgin
packages/pidgin/pidgin
packages/gaim/pidgin.inc
packages/pidgin/pidgin.inc
packages/gaim/pidgin_2.0.2.bb
packages/pidgin/pidgin_2.0.2.bb
packages/gaim/pidgin_2.1.1.bb
packages/pidgin/pidgin_2.1.1.bb
packages/gaim/pidgin_2.2.1.bb
packages/pidgin/pidgin_2.2.1.bb
packages/navit/navit_0.0.3.bb
packages/navit/navit_0.0.4.bb
packages/pidgin
packages/zziplib/files
packages/bvi/bvi-1.3.1/no-strip.patch
packages/zziplib/files/zip_c.patch
packages/zziplib/files/zziplib-0.10-disable-test.patch
packages/zziplib/files/zziplib-autoconf.patch
packages/zziplib/zziplib-native_0.12.83.bb
packages/zziplib/zziplib-native_0.13.49.bb
packages/zziplib/zziplib.inc
packages/zziplib/zziplib_0.12.83.bb
packages/zziplib/zziplib_0.13.49.bb
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/openwrt-sdk.conf
packages/altboot/altboot.inc
packages/altboot/altboot_1.0.8+1.0.9_pre1.bb
packages/altboot/altboot_1.0.8.bb
packages/altboot/altboot_1.1.1+wip-SVNR78.bb
packages/altboot/altboot_svn.bb
packages/bvi/bvi_1.3.1.bb
packages/joe/joe_3.1.bb
packages/navit/navit_cvs.bb
packages/zziplib/zziplib_0.10.82.bb
Diffs:
#
# mt diff -r985da843108cf6ed11892842f921418171e3d429 -r1c2a066fe666a7ab871c0b647aa7557802e7960c
#
#
#
# patch "packages/gcc/gcc-package.inc"
# from [29d6e860f56905f8f155890e57612975fabd4f9b]
# to [e8d0474d4c416cc2ea6765fe1d8938119a1b8ed9]
#
# patch "packages/gcc/gcc_4.0.0.bb"
# from [a8f79504565dce0ccceb3bced8c8c874caf13f5e]
# to [1ea907e9cf461db082a95d72498f977bf9cdf397]
#
# patch "packages/gcc/gcc_4.0.2.bb"
# from [0156b0ed1e59ed7e6319931b8637568457eb1a94]
# to [7b32baa6265a8baeaa95db1f20ef4d3c86499268]
#
# patch "packages/gcc/gcc_4.1.0.bb"
# from [969b03f6753406d3c1fc57118391e227359539c8]
# to [79e5d5565f0a8d820e94e5287f3e4fdd6741d6c6]
#
# patch "packages/gcc/gcc_4.1.1.bb"
# from [ba26064f61c07690d6fc9e80c2083fa783cec5ff]
# to [3714a3e209cfe79de017247adf48c493d22a9f82]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [e59d3a8f06eb5ab8da6c507b3194bde070178cbf]
# to [c44d2580c2ecb17e4aa49c880767ad3078997206]
#
# patch "packages/gcc/gcc_4.2.1.bb"
# from [8af26a60d2ad4ac377a3cb771aae9e6d395bfa58]
# to [24b156595e4214b3b525a3cb63450d3e9798bc1c]
#
# patch "packages/gcc/gcc_4.2.2.bb"
# from [e3cc18f11ea8954870f79c7a095814c2a298871d]
# to [71f991a05f98b5c132567ed6c4ab496016222a4f]
#
============================================================
--- packages/gcc/gcc-package.inc 29d6e860f56905f8f155890e57612975fabd4f9b
+++ packages/gcc/gcc-package.inc e8d0474d4c416cc2ea6765fe1d8938119a1b8ed9
@@ -1,45 +1,58 @@ BINV ?= "${PV}"
gcclibdir ?= "${libdir}/gcc"
BINV ?= "${PV}"
-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 \
- libstdc++-dev libg2c-dev \
- ${PN}-doc"
+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 \
+ libstdc++-dev libg2c-dev \
+ ${PN}-doc \
+"
# We really need HOST_SYS here for some packages and TARGET_SYS for others.
# For now, libgcc is most important so we fix for that - RP.
SHLIBSDIR = "${STAGING_DIR}/${TARGET_SYS}/shlibs"
-FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
- ${bindir}/${TARGET_PREFIX}gccbug \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/include"
-FILES_${PN}-symlinks = "${bindir}/cc \
- ${bindir}/gcc \
- ${bindir}/gccbug"
+FILES_${PN} = "\
+ ${bindir}/${TARGET_PREFIX}gcc \
+ ${bindir}/${TARGET_PREFIX}gccbug \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+"
+FILES_${PN}-symlinks = "\
+ ${bindir}/cc \
+ ${bindir}/gcc \
+ ${bindir}/gccbug \
+"
-FILES_g77 = "${bindir}/${TARGET_PREFIX}g77 \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771"
-FILES_g77-symlinks = "${bindir}/g77 \
- ${bindir}/f77"
+FILES_g77 = "\
+ ${bindir}/${TARGET_PREFIX}g77 \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
+"
+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_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 = "\
+ ${bindir}/${TARGET_PREFIX}cpp \
+ ${base_libdir}/cpp \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
FILES_cpp-symlinks = "${bindir}/cpp"
FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov"
@@ -50,37 +63,48 @@ FILES_libg2c = "${target_libdir}/libg2c.
# Called from within gcc-cross, so libdir is set wrong
FILES_libg2c = "${target_libdir}/libg2c.so.*"
-FILES_libg2c-dev = "${libdir}/libg2c.so \
- ${libdir}/libg2c.a \
- ${libdir}/libfrtbegin.a"
+FILES_libg2c-dev = "\
+ ${libdir}/libg2c.so \
+ ${libdir}/libg2c.a \
+ ${libdir}/libfrtbegin.a \
+"
-FILES_g++ = "${bindir}/${TARGET_PREFIX}g++ \
- ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus"
-FILES_g++-symlinks = "${bindir}/c++ \
- ${bindir}/g++"
+FILES_g++ = "\
+ ${bindir}/${TARGET_PREFIX}g++ \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
+"
+FILES_g++-symlinks = "\
+ ${bindir}/c++ \
+ ${bindir}/g++ \
+"
FILES_libstdc++ = "${libdir}/libstdc++.so.*"
-FILES_libstdc++-dev = "${includedir}/c++/${BINV} \
- ${libdir}/libstdc++.so \
- ${libdir}/libstdc++.la \
- ${libdir}/libstdc++.a \
- ${libdir}/libsupc++.la \
- ${libdir}/libsupc++.a"
+FILES_libstdc++-dev = "\
+ ${includedir}/c++/${BINV} \
+ ${libdir}/libstdc++.so \
+ ${libdir}/libstdc++.la \
+ ${libdir}/libstdc++.a \
+ ${libdir}/libsupc++.la \
+ ${libdir}/libsupc++.a \
+"
FILES_libmudflap = "${libdir}/libmudflap*.so.*"
-FILES_libmudflap-dev = "${libdir}/libmudflap*.so \
- ${libdir}/libmudflap*.a \
- ${libdir}/libmudflap*.a"
+FILES_libmudflap-dev = "\
+ ${libdir}/libmudflap*.so \
+ ${libdir}/libmudflap*.a \
+ ${libdir}/libmudflap*.a \
+"
+FILES_${PN}-doc = "\
+ ${infodir} \
+ ${mandir} \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
+"
-FILES_${PN}-doc = "${infodir} \
- ${mandir} \
- ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README"
-
python do_package() {
- if bb.data.getVar('DEBIAN_NAMES', d, 1):
- bb.data.setVar('PKG_libgcc', 'libgcc1', d)
- bb.build.exec_func('package_do_package', d)
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+ bb.build.exec_func('package_do_package', d)
}
============================================================
--- packages/gcc/gcc_4.0.0.bb a8f79504565dce0ccceb3bced8c8c874caf13f5e
+++ packages/gcc/gcc_4.0.0.bb 1ea907e9cf461db082a95d72498f977bf9cdf397
@@ -1,8 +1,8 @@
-PR = "r2"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r3"
inherit autotools gettext
============================================================
--- packages/gcc/gcc_4.0.2.bb 0156b0ed1e59ed7e6319931b8637568457eb1a94
+++ packages/gcc/gcc_4.0.2.bb 7b32baa6265a8baeaa95db1f20ef4d3c86499268
@@ -1,9 +1,9 @@ DEPENDS = "mpfr gmp"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
DEPENDS = "mpfr gmp"
-PR = "r6"
+PR = "r7"
inherit autotools gettext
============================================================
--- packages/gcc/gcc_4.1.0.bb 969b03f6753406d3c1fc57118391e227359539c8
+++ packages/gcc/gcc_4.1.0.bb 79e5d5565f0a8d820e94e5287f3e4fdd6741d6c6
@@ -1,8 +1,9 @@
-PR = "r2"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r3"
+
DEFAULT_PREFERENCE = "-1"
inherit autotools gettext
============================================================
--- packages/gcc/gcc_4.1.1.bb ba26064f61c07690d6fc9e80c2083fa783cec5ff
+++ packages/gcc/gcc_4.1.1.bb 3714a3e209cfe79de017247adf48c493d22a9f82
@@ -1,8 +1,8 @@
-PR = "r17"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r18"
inherit autotools gettext
============================================================
--- packages/gcc/gcc_4.1.2.bb e59d3a8f06eb5ab8da6c507b3194bde070178cbf
+++ packages/gcc/gcc_4.1.2.bb c44d2580c2ecb17e4aa49c880767ad3078997206
@@ -1,10 +1,10 @@ LICENSE = "GPL"
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 = "r10"
+PR = "r11"
inherit autotools gettext
============================================================
--- packages/gcc/gcc_4.2.1.bb 8af26a60d2ad4ac377a3cb771aae9e6d395bfa58
+++ packages/gcc/gcc_4.2.1.bb 24b156595e4214b3b525a3cb63450d3e9798bc1c
@@ -1,8 +1,8 @@
-PR = "r7"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r8"
inherit autotools gettext
@@ -11,8 +11,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://100-uclibc-conf.patch;patch=1 \
file://103-uclibc-conf-noupstream.patch;patch=1 \
- file://200-uclibc-locale.patch;patch=1 \
- file://203-uclibc-locale-no__x.patch;patch=1 \
+ file://200-uclibc-locale.patch;patch=1 \
+ file://203-uclibc-locale-no__x.patch;patch=1 \
file://204-uclibc-locale-wchar_fix.patch;patch=1 \
file://205-uclibc-locale-update.patch;patch=1 \
file://300-libstdc++-pic.patch;patch=1 \
@@ -20,11 +20,11 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://302-c99-snprintf.patch;patch=1 \
file://303-c99-complex-ugly-hack.patch;patch=1 \
file://304-index_macro.patch;patch=1 \
- file://305-libmudflap-susv3-legacy.patch;patch=1 \
- file://306-libstdc++-namespace.patch;patch=1 \
+ file://305-libmudflap-susv3-legacy.patch;patch=1 \
+ file://306-libstdc++-namespace.patch;patch=1 \
file://307-locale_facets.patch;patch=1 \
- file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
- file://602-sdk-libstdc++-includes.patch;patch=1 \
+ file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+ file://602-sdk-libstdc++-includes.patch;patch=1 \
file://740-sh-pr24836.patch;patch=1 \
file://800-arm-bigendian.patch;patch=1 \
file://904-flatten-switch-stmt-00.patch;patch=1 \
@@ -36,10 +36,10 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://ldflags.patch;patch=1 \
file://zecke-xgcc-cpp.patch;patch=1 \
file://unbreak-armv4t.patch;patch=1 \
- file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
file://cache-amnesia.patch;patch=1 \
- file://gfortran.patch;patch=1 \
- file://pr34130.patch;patch=1 \
+ file://gfortran.patch;patch=1 \
+ file://pr34130.patch;patch=1 \
"
SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.1.tar.gz \
============================================================
--- packages/gcc/gcc_4.2.2.bb e3cc18f11ea8954870f79c7a095814c2a298871d
+++ packages/gcc/gcc_4.2.2.bb 71f991a05f98b5c132567ed6c4ab496016222a4f
@@ -1,8 +1,8 @@
-PR = "r3"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
+PR = "r4"
inherit autotools gettext
@@ -11,8 +11,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://100-uclibc-conf.patch;patch=1 \
file://103-uclibc-conf-noupstream.patch;patch=1 \
- file://200-uclibc-locale.patch;patch=1 \
- file://203-uclibc-locale-no__x.patch;patch=1 \
+ file://200-uclibc-locale.patch;patch=1 \
+ file://203-uclibc-locale-no__x.patch;patch=1 \
file://204-uclibc-locale-wchar_fix.patch;patch=1 \
file://205-uclibc-locale-update.patch;patch=1 \
file://300-libstdc++-pic.patch;patch=1 \
@@ -20,11 +20,11 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://302-c99-snprintf.patch;patch=1 \
file://303-c99-complex-ugly-hack.patch;patch=1 \
file://304-index_macro.patch;patch=1 \
- file://305-libmudflap-susv3-legacy.patch;patch=1 \
- file://306-libstdc++-namespace.patch;patch=1 \
+ file://305-libmudflap-susv3-legacy.patch;patch=1 \
+ file://306-libstdc++-namespace.patch;patch=1 \
file://307-locale_facets.patch;patch=1 \
- file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
- file://602-sdk-libstdc++-includes.patch;patch=1 \
+ file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+ file://602-sdk-libstdc++-includes.patch;patch=1 \
file://740-sh-pr24836.patch;patch=1 \
file://800-arm-bigendian.patch;patch=1 \
file://801-arm-bigendian-eabi.patch;patch=1 \
@@ -37,12 +37,12 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
file://ldflags.patch;patch=1 \
file://zecke-xgcc-cpp.patch;patch=1 \
file://unbreak-armv4t.patch;patch=1 \
- file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
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 \
- file://fortran-static-linking.patch;patch=1 \
+ file://gfortran.patch;patch=1 \
+ file://gcc-4.0.2-e300c2c3.patch;patch=1 \
+ file://pr34130.patch;patch=1 \
+ file://fortran-static-linking.patch;patch=1 \
"
SRC_URI_append_ep93xx = " \
#
# mt diff -r9a694dbde6dd96803bccae08f8e83850e03f2b58 -r1c2a066fe666a7ab871c0b647aa7557802e7960c
#
#
#
# rename "packages/gaim"
# to "packages/obsolete/gaim"
#
# rename "packages/gaim/files/purple-OE-branding.patch"
# to "packages/pidgin/pidgin/purple-OE-branding.patch"
#
# rename "packages/gaim/pidgin"
# to "packages/pidgin/pidgin"
#
# rename "packages/gaim/pidgin.inc"
# to "packages/pidgin/pidgin.inc"
#
# rename "packages/gaim/pidgin_2.0.2.bb"
# to "packages/pidgin/pidgin_2.0.2.bb"
#
# rename "packages/gaim/pidgin_2.1.1.bb"
# to "packages/pidgin/pidgin_2.1.1.bb"
#
# rename "packages/gaim/pidgin_2.2.1.bb"
# to "packages/pidgin/pidgin_2.2.1.bb"
#
# rename "packages/navit/navit_0.0.3.bb"
# to "packages/navit/navit_0.0.4.bb"
#
# add_dir "packages/pidgin"
#
# add_dir "packages/zziplib/files"
#
# add_file "packages/bvi/bvi-1.3.1/no-strip.patch"
# content [8aa06ec85a10a462d26acfa11783ee565de3e70c]
#
# add_file "packages/zziplib/files/zip_c.patch"
# content [5a1b10b7bdfcd3ede45622e769e74a85c073322a]
#
# add_file "packages/zziplib/files/zziplib-0.10-disable-test.patch"
# content [10e988637c7b16ec0764d5e3807f35df8088692a]
#
# add_file "packages/zziplib/files/zziplib-autoconf.patch"
# content [dd5d6aa6448b09b67b5d5406bd1472a22dcaa8b5]
#
# add_file "packages/zziplib/zziplib-native_0.12.83.bb"
# content [ede5c99b34a71e21c2dc525151e4887d1deeedaf]
#
# add_file "packages/zziplib/zziplib-native_0.13.49.bb"
# content [ede5c99b34a71e21c2dc525151e4887d1deeedaf]
#
# add_file "packages/zziplib/zziplib.inc"
# content [9a67bcd8922c5b4d0c3f5af31e526679eec903fe]
#
# add_file "packages/zziplib/zziplib_0.12.83.bb"
# content [9cd2de2ced26f127393f3867ae22cc0735af0f98]
#
# add_file "packages/zziplib/zziplib_0.13.49.bb"
# content [7d6440e10cbf756b2998f5b398f3a20a81455672]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
# to [66432a75530815dc67cbefefa5709c66ca453cf9]
#
# patch "conf/distro/openwrt-sdk.conf"
# from [1107f0f69397f0e0bf38f74a1414c0ec52f30efe]
# to [ea179aceed5e9e4a66d8e68157c441bbb085122f]
#
# patch "packages/altboot/altboot.inc"
# from [336e728d9129e883c155439bd6e2298237b4ef44]
# to [d3809c5f6c0e44f5d01721e72c66baab65ab1cc9]
#
# patch "packages/altboot/altboot_1.0.8+1.0.9_pre1.bb"
# from [afdeba748d44ac6c81823deabecdba5be4f4caf3]
# to [4a2609db809912e107eab9f34853b3748bbc8622]
#
# patch "packages/altboot/altboot_1.0.8.bb"
# from [a63e82e147eb3d71871ae1f06a484f9d14a39db6]
# to [64c42009c72bd11c7dbe56f787bbada179331c7b]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR78.bb"
# from [2ba799e0906a42e4430aa1f44ffae3a2066c1d43]
# to [23034faf0bf4b951b3987f4253824cfdc50c4459]
#
# patch "packages/altboot/altboot_svn.bb"
# from [ff3c96a2e2b55419fb0d7d72dd3d6df341f015e7]
# to [4d5fc6b4d7435abb435a0e72cc534fb6ee5c8d0e]
#
# patch "packages/bvi/bvi_1.3.1.bb"
# from [1177f5638bb0269e077a6f31a022b9216b523c01]
# to [ffe4179f0cc74d71bed9ade8b379b6012dedf284]
#
# patch "packages/joe/joe_3.1.bb"
# from [4ba05bce04e71ee977052415d2841901c2b7264e]
# to [95aad674a62e2ea556e425ac0f9599f8ef669284]
#
# patch "packages/navit/navit_0.0.4.bb"
# from [3ad70f521cf586024807037618604fc516e2a10a]
# to [e43440872b65ba24c36a25cea53949a5151942bb]
#
# patch "packages/navit/navit_cvs.bb"
# from [60cd23b58b422d69f9b6d3fb1d4e070ad166d8eb]
# to [84b02504037047149d67623549871603f92505a8]
#
# patch "packages/zziplib/zziplib_0.10.82.bb"
# from [b7909e20eb3efb7b8edd5047c6ea4d0caba567d1]
# to [d14e1253b687d405b70b234c723cb720e6bffb99]
#
============================================================
--- packages/bvi/bvi-1.3.1/no-strip.patch 8aa06ec85a10a462d26acfa11783ee565de3e70c
+++ packages/bvi/bvi-1.3.1/no-strip.patch 8aa06ec85a10a462d26acfa11783ee565de3e70c
@@ -0,0 +1,13 @@
+--- 1/Makefile.in.org 2001-12-25 15:37:37.000000000 +0200
++++ 1/Makefile.in 2008-02-20 02:54:56.000000000 +0200
+@@ -63,8 +63,8 @@
+ install: all installdirs
+ @echo "Installing bvi"
+ @$(INSTALL_DATA) bvi.1 bmore.1 $(man1dir)
+- @$(INSTALL_PROGRAM) -s bvi $(bindir)
+- @$(INSTALL_PROGRAM) -s bmore $(bindir)
++ @$(INSTALL_PROGRAM) bvi $(bindir)
++ @$(INSTALL_PROGRAM) bmore $(bindir)
+ @$(INSTALL_DATA) bmore.help $(datadir)
+ @if [ -f $(bindir)/bview ]; then rm $(bindir)/bview; fi
+ @if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi
============================================================
--- packages/zziplib/files/zip_c.patch 5a1b10b7bdfcd3ede45622e769e74a85c073322a
+++ packages/zziplib/files/zip_c.patch 5a1b10b7bdfcd3ede45622e769e74a85c073322a
@@ -0,0 +1,15 @@
+From zziplib Debian source package
+--- a/zzip/zip.c 2007-03-19 02:27:49.000000000 +1100
++++ b/zzip/zip.c 2007-11-07 17:40:52.985849197 +1100
+@@ -402,7 +402,10 @@
+ uint16_t u_extras, u_comment, u_namlen;
+
+ if (fd_map)
+- { d = (void*)(fd_map+zz_fd_gap+zz_offset); } /* fd_map+fd_gap==u_rootseek */
++ {
++ d = &dirent;
++ memcpy(d, fd_map+zz_fd_gap+zz_offset, sizeof(*d)); /* fd_map+fd_gap==u_rootseek */
++ }
+ else
+ {
+ if (io->fd.seeks(fd, zz_rootseek+zz_offset, SEEK_SET) < 0)
============================================================
--- packages/zziplib/files/zziplib-0.10-disable-test.patch 10e988637c7b16ec0764d5e3807f35df8088692a
+++ packages/zziplib/files/zziplib-0.10-disable-test.patch 10e988637c7b16ec0764d5e3807f35df8088692a
@@ -0,0 +1,13 @@
+Index: zziplib-0.10.82/bins/zziptest.c
+===================================================================
+--- zziplib-0.10.82.orig/bins/zziptest.c 2008-02-20 12:10:35.000000000 +0100
++++ zziplib-0.10.82/bins/zziptest.c 2008-02-20 12:10:44.000000000 +0100
+@@ -52,7 +52,7 @@
+ }
+ } printf("OK.\n");
+
+-#if 1
++#if 0
+ printf("{check...\n");
+ { struct zzip_dir_hdr * hdr = dir->hdr0;
+
============================================================
--- packages/zziplib/files/zziplib-autoconf.patch dd5d6aa6448b09b67b5d5406bd1472a22dcaa8b5
+++ packages/zziplib/files/zziplib-autoconf.patch dd5d6aa6448b09b67b5d5406bd1472a22dcaa8b5
@@ -0,0 +1,509 @@
+Reworks zziplib's configure and top-level makefile considerably to make
+this package compile in a cross-compilation environment. This has not
+and will not be sent upstream because the author most likely wants it that
+way (lots of MSVC crap).
+
+Index: zziplib-0.13.49/Makefile.am
+===================================================================
+--- zziplib-0.13.49.orig/Makefile.am 2008-02-19 22:54:19.000000000 +0100
++++ zziplib-0.13.49/Makefile.am 2008-02-19 23:37:40.000000000 +0100
+@@ -1,126 +1,10 @@
+-AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip2
+ ACLOCAL_AMFLAGS = -I m4
+-WANT_AUTOMAKE = 1.7
+-WANT_AUTOCONF = 2.57
++WANT_AUTOMAKE = 1.96
++WANT_AUTOCONF = 2.61
+
+ DIST_SUBDIRS = zzip zzipwrap bins test docs SDL
+ SUBDIRS = zzip zzipwrap bins test docs @SDL@
+
+-# see Makefile.mk for the "make rpm" target
+-rpm2: dist-bzip2 $(PACKAGE).spec
+- rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2
+-
+-indent-check:
+- (cd zzip && $(MAKE) `basename $@`)
+-
+-doc docs docu clean-doc clean-docs clean-docu zzip.html zzip.xml zzip.pdf \
+-man mans manpages htmpages unpack clean-unpack changes.htm pdfs \
+-omf install-omf install-doc install-docs install-sf install-man3 install-mans :
+- (cd docs && $(MAKE) `basename $@`)
+-
+-sdl testsdl test-sdl install-sdl :
+- (cd SDL && $(MAKE) `basename $@`)
+-
+-check-test0 check-test1 check-zzdir check-zzcat \
+-check-zzxor check-zzxordir check-zzxorcat \
+-check-sfx check-readme : \
+- (cd test && $(MAKE) `basename $@`)
+-
+-MSVC8 = msvc8/README.TXT msvc8/zip.exe msvc8/test1.zip msvc8/test.zip \
+-msvc8/zzdir.vcproj msvc8/zzipself.vcproj msvc8/zzip.vcproj \
+-msvc8/zziplib.sln msvc8/zzipsetstub.sln msvc8/zzobfuscated.sln \
+-msvc8/zziplib.vcproj msvc8/zzipsetstub.vcproj msvc8/zzobfuscated.vcproj \
+-msvc8/zzcat.sln msvc8/zzipself.bat msvc8/zzip.sln \
+-msvc8/zzcat.vcproj msvc8/zzipself.sln msvc8/zziptest.sln \
+-msvc8/zzdir.sln msvc8/zzipself.txt msvc8/zziptest.vcproj \
+- msvc8/zzipfseeko.vcproj msvc8/zzipmmapped.vcproj
+-
+-MSVC7 = msvc7/pkzip.exe msvc7/test1.zip msvc7/test.zip \
+-msvc7/zzdir.vcproj msvc7/zzipself.vcproj msvc7/zzip.vcproj \
+-msvc7/zziplib.sln msvc7/zzipsetstub.sln msvc7/zzobfuscated.sln \
+-msvc7/zziplib.vcproj msvc7/zzipsetstub.vcproj msvc7/zzobfuscated.vcproj \
+-msvc7/zzcat.sln msvc7/zzipself.bat msvc7/zzip.sln \
+-msvc7/zzcat.vcproj msvc7/zzipself.sln msvc7/zziptest.sln \
+-msvc7/zzdir.sln msvc7/zzipself.txt msvc7/zziptest.vcproj
+-
+-MSVC6 = \
+-msvc6/zzcat.dsp msvc6/zziplib.dsp msvc6/zzipwrap.dsp \
+-msvc6/zzdir.dsp msvc6/zziplib.dsw msvc6/zzobfuscated.dsp \
+-msvc6/zziptest.dsp msvc6/zzip.dsp
+-
+ EXTRA_DIST = zziplib.spec zzipback.sed Makefile.mk \
+- $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps)
+-
+-PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \
+- comp compats msvc6 msvc7
+-# ------------------------------------------------------------------------
+-
+-test-comp:
+- test ! -d testing || rm -r testing
+- mkdir testing
+- (cd testing && tar xzvf ../$(PACKAGE)-$(VERSION).tar.gz)
+- (cd "testing/$(PACKAGE)-$(VERSION)/zziplib" && sh configure)
+- $(MAKE) -C "testing/$(PACKAGE)-$(VERSION)/zziplib"
+- $(MAKE) -C "testing/$(PACKAGE)-$(VERSION)/zziplib" check
+-
+-clean-comp:
+- test ! -d testing || rm -r testing
+-
+-msvc :
+- mkdir bin
+- mkdir lib
+- mkdir include
+- mkdir include/zzip
+- cp $(srcdir)/msvc6/Release/*.exe bin/
+- cp $(srcdir)/msvc6/Release/*.dll bin/
+- cp $(srcdir)/msvc6/Release/*.lib lib/
+- cp $(srcdir)/zzip/*.h include/zzip/
+- zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-bin.zip bin/
+- zip -9r $(srcdir)/$(PACKAGE)-$(VERSION)-msvc6-lib.zip lib/ include/
+- rm -r bin lib include
+-
+-# ------------------------------------------------------------------ zzip64
+-_FILE_OFFSET64 = -D_ZZIP_LARGEFILE -D_FILE_OFFSET_BITS=64
+-_RELEASEINFO64 = "RELEASE_INFO=-release 0-64"
++ $(am__aclocal_m4_deps)
+
+-zzip64-setup: zzip64-setup.tmp
+-zzip64-setup.tmp : zzip/Makefile zzip/_config.h zzip/.deps/* zzip/zziplib.pc
+- - mkdir zzip64
+- cp -a zzip/Makefile zzip/_config.h zzip/.deps/ zzip/zziplib.pc zzip64/
+- date > zzip64.dir
+-zzip64-build: zzip64-build.tmp
+-zzip64-build.tmp : zzip64-setup.tmp $(top_srcdir)/zzip/*
+- cd zzip64 && $(MAKE) "AM_CFLAGS=$(_FILE_OFFSET64)" $(_RELEASEINFO64)
+-zzip64-install: zzip64-install.tmp
+-zzip64-install.tmp : zzip64-build.tmp
+- cd zzip64 && $(MAKE) install $(_RELEASEINFO64)
+- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip64.so
+- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip64.a
+- cd $(DESTDIR)$(libdir) && \
+- sed -e 's/zzip.so/zzip64.so/' \
+- -e 's/zzip.a/zzip64.a/' libzzip.la > libzzip64.la
+- cd $(DESTDIR)$(libdir)/pkgconfig && \
+- sed -e 's/largefile=/largefile= %_FILE_OFFSET64/' \
+- -e 's/-lzzip/-lzzip64/' \
+- -e 's/zziplib/zziplib64/' zziplib.pc > zziplib64.pc
+-zzip32-postinstall:
+- cd $(DESTDIR)$(libdir) && mv libzzip.so libzzip32.so
+- cd $(DESTDIR)$(libdir) && mv libzzip.a libzzip32.a
+- cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
+- cd $(DESTDIR)$(libdir) && ln -s libzzip32.a libzzip.a
+- cd $(DESTDIR)$(libdir) && \
+- sed -e 's/zzip.so/zzip32.so/' \
+- -e 's/zzip.a/zzip32.a/' libzzip.la > libzzip32.la
+- cd $(DESTDIR)$(libdir)/pkgconfig && \
+- sed -e 's/-lzzip/-lzzip32/' \
+- -e 's/zziplib/zziplib32/' zziplib.pc > zziplib32.pc
+-zzip-postinstall:
+- : "the 12.8x and 11.8x and 10.8x packages are all the same actually"
+- cd $(DESTDIR)$(libdir) || exit 1 \
+- ; for i in libzzip*.so.1? ; do : \
+- ; v10=`echo $i | sed -e "s/.so.../.so.10/"` \
+- ; v11=`echo $i | sed -e "s/.so.../.so.11/"` \
+- ; v12=`echo $i | sed -e "s/.so.../.so.12/"` \
+- ; test ! -e $v10 && test -e $v12 && ln -s $v12 $v10 \
+- ; test ! -e $v12 && test -e $v10 && ln -s $v10 $v12 \
+- ; ln -s $v10 $v11 || true; done
+Index: zziplib-0.13.49/configure.ac
+===================================================================
+--- zziplib-0.13.49.orig/configure.ac 2008-02-15 21:56:37.000000000 +0100
++++ zziplib-0.13.49/configure.ac 2008-02-19 23:43:05.000000000 +0100
+@@ -1,12 +1,12 @@
+-AC_INIT(zziplib.spec)
+-AC_PREREQ(2.49)
+-AC_COPYRIGHT([Guido Draheim <guido at gmx.de> for ZZipLib.SF.net])
++AC_PREREQ(2.61)
++AC_INIT([zziplib], [0.13.49], [Guido Draheim <guido at gmx.de>])
++AC_CANONICAL_TARGET
++AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
++
++AC_CONFIG_SRCDIR([zzip/zip.c])
+ AC_REVISION($Revision: 1.9 $)
+-AC_CONFIG_AUX_DIR(uses)
++
+ # =======================================================================
+-AC_CANONICAL_SYSTEM
+-dnl AM_ENABLE_MULTILIB([Makefile],[$host])
+-AX_ENABLE_BUILDDIR_UNAME
+ AC_SET_DEFAULT_PATHS_SYSTEM
+ # -----------------------------------------------------------------------
+ AC_ARG_ENABLE(thread-safe,AC_HELP_STRING(
+@@ -61,8 +61,6 @@
+ AC_SUBST(ZLIB_INCL)
+ AC_SUBST(ZLIB_LDIR)
+ # -----------------------------------------------------------------------
+-AX_SPEC_DEFAULTS
+-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
+ dnl test ".$CFLAGS" = "." && CFLAGS=""
+ AC_PROG_CC
+ dnl test ".$CFLAGS" = "." && test "$GCC" = "yes" && CFLAGS="-O3"
+@@ -77,7 +75,7 @@
+ sed -f $srcdir/zzip/_msvc.sed $srcdir/config.h.in >zzip/_msvc.in
+ AC_CONFIG_HEADERS([config.h])
+ AX_PREFIX_CONFIG_H([zzip/_config.h],[zzip],[config.h])
+-AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in])
++#AX_PREFIX_CONFIG_H([zzip/_msvc.h],[zzip],[zzip/_msvc.in])
+ AM_MAINTAINER_MODE
+
+ AX_CREATE_PKGCONFIG_INFO(dnl
+Index: zziplib-0.13.49/install-sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ zziplib-0.13.49/install-sh 2008-02-19 23:43:36.000000000 +0100
+@@ -0,0 +1,323 @@
++#!/bin/sh
++# install - install a program, script, or datafile
++
++scriptversion=2005-05-14.22
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
++#
++#
++# FSF changes to this file are in the public domain.
++#
++# Calling this script install-sh is preferred over install.sh, to prevent
++# `make' implicit rules from creating a file called install from it
++# when there is no Makefile.
++#
++# This script is compatible with the BSD install script, but was written
++# from scratch. It can only install one file at a time, a restriction
++# shared with many OS's install programs.
++
++# set DOITPROG to echo to test this script
++
++# Don't use :- since 4.3BSD and earlier shells don't like it.
++doit="${DOITPROG-}"
++
++# put in absolute paths if you don't have them in your path; or use env. vars.
++
++mvprog="${MVPROG-mv}"
++cpprog="${CPPROG-cp}"
++chmodprog="${CHMODPROG-chmod}"
++chown%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list