Package Upgrade

index 2b41090..43f6f37 100644
@@ -24,7 +24,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 
 GCCVERSION ?= "4.9%"
 SDKGCCVERSION ?= "${GCCVERSION}"
-BINUVERSION ?= "2.24"
+BINUVERSION ?= "2.25"
 GLIBCVERSION ?= "2.20"
 UCLIBCVERSION ?= "0.9.33+git%"
 LINUXLIBCVERSION ?= "3.17.7"

similarity index 58%
rename from meta/recipes-devtools/binutils/binutils-2.24.inc
rename to meta/recipes-devtools/binutils/binutils-2.25.inc
index 63c9287..d69b519 100644
@@ -1,5 +1,4 @@
 LIC_FILES_CHKSUM="\
-    file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\
     file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\
     file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674\
     file://COPYING3;md5=d32239bcb673463ab874e80d47fae504\

@@ -25,22 +24,7 @@ SRC_URI = "\
      file://binutils-armv5e.patch \
      file://mips64-default-ld-emulation.patch \
      file://binutils-xlp-support.patch \
-     file://fix-pr15815.patch \
-     file://fix-pr2404.patch \
-     file://fix-pr16476.patch \
-     file://fix-pr16428.patch \
-     file://replace_macros_with_static_inline.patch \
-     file://0001-Fix-MMIX-build-breakage-from-bfd_set_section_vma-cha.patch \
-     file://binutils-uninitialised-warning.patch \
-     file://binutils_CVE-2014-8484.patch \
-     file://binutils_CVE-2014-8485.patch \
-     file://binutils_CVE-2014-8501.patch \
-     file://binutils_CVE-2014-8502_1.patch \
-     file://binutils_CVE-2014-8502.patch \
-     file://binutils_CVE-2014-8503.patch \
-     file://binutils_CVE-2014-8504.patch \
-     file://binutils_CVE-2014-8737.patch \
      "
+SRC_URI[md5sum] = "d9f3303f802a5b6b0bb73a335ab89d66"
+SRC_URI[sha256sum] = "22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923"
 
-SRC_URI[md5sum] = "e0f71a7b2ddab0f8612336ac81d9636b"
-SRC_URI[sha256sum] = "e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137"

similarity index 100%
rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.24.bb
rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.25.bb

similarity index 100%
rename from meta/recipes-devtools/binutils/binutils-cross_2.24.bb
rename to meta/recipes-devtools/binutils/binutils-cross_2.25.bb

similarity index 100%
rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.24.bb
rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.25.bb

index 996c023..eb54076 100644
@@ -106,10 +106,10 @@ Index: binutils-2.24/ld/configure
  
  # Check whether --enable-got was given.
  if test "${enable_got+set}" = set; then :
-Index: binutils-2.24/ld/configure.in
+Index: binutils-2.24/ld/configure.ac
 ===================================================================
---- binutils-2.24.orig/ld/configure.in	2013-12-15 11:46:17.000000000 -0800
-+++ binutils-2.24/ld/configure.in	2013-12-15 11:46:59.810435651 -0800
+--- binutils-2.24.orig/ld/configure.ac	2013-12-15 11:46:17.000000000 -0800
++++ binutils-2.24/ld/configure.ac	2013-12-15 11:46:59.810435651 -0800
 @@ -87,6 +87,16 @@
  AC_SUBST(TARGET_SYSTEM_ROOT)
  AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)

@@ -214,10 +214,10 @@ Index: binutils-2.24/ld/lexsup.c
 ===================================================================
 --- binutils-2.24.orig/ld/lexsup.c	2013-12-15 11:46:17.000000000 -0800
 +++ binutils-2.24/ld/lexsup.c	2013-12-15 11:49:28.950434490 -0800
-@@ -507,6 +507,14 @@
-     OPTION_IGNORE_UNRESOLVED_SYMBOL},
-     '\0', N_("SYMBOL"),
-     N_("Unresolved SYMBOL will not cause an error or warning"), TWO_DASHES },
+@@ -513,6 +513,14 @@ static const struct ld_option ld_options[] =
+   { {"pop-state", no_argument, NULL, OPTION_POP_STATE},
+     '\0', NULL, N_("Pop state of flags governing input file handling"),
+     TWO_DASHES },
 +  { {"no-poison-system-directories", no_argument, NULL,
 +     OPTION_NO_POISON_SYSTEM_DIRECTORIES},
 +    '\0', NULL, N_("Do not warn for -L options using system directories"),

@@ -229,18 +229,18 @@ Index: binutils-2.24/ld/lexsup.c
  };
  
  #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -1442,6 +1450,14 @@
-               einfo (_("%P%X: --hash-size needs a numeric argument\n"));
-           }
-           break;
+@@ -1474,6 +1482,14 @@ parse_args (unsigned argc, char **argv)
+ 	      free (oldp);
+ 	    }
+ 	  break;
 +
-+   case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
-+     command_line.poison_system_directories = FALSE;
-+     break;
++	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
++	  command_line.poison_system_directories = FALSE;
++	  break;
 +
-+   case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
-+     command_line.error_poison_system_directories = TRUE;
-+     break;
++	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
++	  command_line.error_poison_system_directories = TRUE;
++	  break;
  	}
      }
  

@@ -248,10 +248,10 @@ Index: binutils-2.24/ld/ldlex.h
 ===================================================================
 --- binutils-2.24.orig/ld/ldlex.h	2013-12-15 11:46:17.000000000 -0800
 +++ binutils-2.24/ld/ldlex.h	2013-12-15 11:47:43.230435299 -0800
-@@ -138,6 +138,8 @@
-   OPTION_DEFAULT_SCRIPT,
-   OPTION_PRINT_OUTPUT_FORMAT,
+@@ -140,6 +140,8 @@ enum option_values
    OPTION_IGNORE_UNRESOLVED_SYMBOL,
+   OPTION_PUSH_STATE,
+   OPTION_POP_STATE,
 +  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
 +  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
  };

496 lines not on this page · raw message

67 lines not on this page · raw message

102 lines not on this page · raw message

60 lines not on this page · raw message

89 lines not on this page · raw message

523 lines not on this page · raw message

47 lines not on this page · raw message

75 lines not on this page · raw message

177 lines not on this page · raw message

deleted file mode 100644
index 9f53f41..0000000
@@ -1,36 +0,0 @@
-This patch fixes the problem where libiberty is not installed in spite of
-asking it via --enable-install-libiberty, the problem is that target_header_dir
-is reset explicitly which means libiberty.a will never get installed
-
-also check
-
-https://sourceware.org/bugzilla/show_bug.cgi?id=15815
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Index: binutils-2.24/libiberty/configure
-===================================================================
---- binutils-2.24.orig/libiberty/configure	2013-12-16 00:08:09.280103157 -0800
-+++ binutils-2.24/libiberty/configure	2013-12-16 00:08:29.753436339 -0800
-@@ -5507,7 +5507,6 @@
- 
- setobjs=
- CHECK=
--target_header_dir=
- if test -n "${with_target_subdir}"; then
- 
-   # We are being configured as a target library.  AC_REPLACE_FUNCS
-Index: binutils-2.24/libiberty/configure.ac
-===================================================================
---- binutils-2.24.orig/libiberty/configure.ac	2013-11-08 02:13:49.000000000 -0800
-+++ binutils-2.24/libiberty/configure.ac	2013-12-16 00:07:45.133436672 -0800
-@@ -405,7 +405,6 @@
- 
- setobjs=
- CHECK=
--target_header_dir=
- if test -n "${with_target_subdir}"; then
- 
-   # We are being configured as a target library.  AC_REPLACE_FUNCS

123 lines not on this page · raw message

220 lines not on this page · raw message

76 lines not on this page · raw message

804 lines not on this page · raw message

index 51eaf0b..e668faa 100644

Lines of this file are not shown. View the raw message.

188 lines not on this page · raw message

similarity index 100%
rename from meta/recipes-devtools/binutils/binutils_2.24.bb
rename to meta/recipes-devtools/binutils/binutils_2.25.bb

similarity index 90%
rename from meta/recipes-devtools/autogen/autogen-native_5.18.3.bb
rename to meta/recipes-devtools/autogen/autogen-native_5.18.4.bb
index abc0a42..302ba79 100644
@@ -13,8 +13,8 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
            file://increase-timeout-limit.patch \
            file://mk-tpl-config.sh-force-exit-value-to-be-0-in-subproc.patch"
 
-SRC_URI[md5sum] = "0fb6b003423e004d94e0119c2390078f"
-SRC_URI[sha256sum] = "73d05a689105eb9b8be54f32498c99ddbd360776fc61cf45be6a2a4eb4a40039"
+SRC_URI[md5sum] = "6f48029cc839303d28496e1609868938"
+SRC_URI[sha256sum] = "3cd9f81a8ae7c6865bb9bbbe16c4307a243a1373d0b315a83571cbba1fff725d"
 
 DEPENDS = "guile-native libtool-native libxml2-native"
 

similarity index 73%
rename from meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb
rename to meta/recipes-devtools/mklibs/mklibs-native_0.1.40.bb
index 9885561..b2fcae5 100644
@@ -12,11 +12,7 @@ SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.x
 	file://sysrooted-ldso.patch \
 "
 
-SRC_URI[md5sum] = "38a579a531401eb76f4bab4ccfb774a2"
-SRC_URI[sha256sum] = "fa2881ab4fe72b0504878357f1fc6b17920459b56e8a60dfb083ca28fb64e733"
+SRC_URI[md5sum] = "e1dafe5f962caa9dc5f2651c0723812a"
+SRC_URI[sha256sum] = "1db24ae779d21ccfed49f22e49a2b7ee43ec0e9197bc206d81cd02f96e91e125"
 
 inherit autotools gettext native pythonnative
-
-do_configure_prepend() {
-	sed "s+MKLIBS_VERSION+${PV}+" ${S}/configure.ac
-}

similarity index 89%
rename from meta/recipes-devtools/automake/automake_1.14.1.bb
rename to meta/recipes-devtools/automake/automake_1.15.bb
index be73d19..d5b6e9e 100644
@@ -22,8 +22,8 @@ SRC_URI += " file://python-libdir.patch \
             file://py-compile-compile-only-optimized-byte-code.patch \
             file://buildtest.patch"
 
-SRC_URI[md5sum] = "d052a3e884631b9c7892f2efce542d75"
-SRC_URI[sha256sum] = "814c2333f350ce00034a1fe718e0e4239998ceea7b0aff67e9fd273ed6dfc23b"
+SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3"
+SRC_URI[sha256sum] = "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924"
 
 do_install_append () {
     install -d ${D}${datadir}

similarity index 77%
rename from meta/recipes-devtools/libtool/libtool-2.4.2.inc
rename to meta/recipes-devtools/libtool/libtool-2.4.4.inc
index 0f1964b..643fd52 100644
@@ -5,31 +5,27 @@ Libtool hides the complexity of generating special library types \
 HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
 SECTION = "devel"
 LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
-    file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
-
-INC_PR = "r6"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c "
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://trailingslash.patch \
            file://rename-with-sysroot.patch \
            file://use-sysroot-in-libpath.patch \
            file://fix-final-rpath.patch \
-           file://avoid_absolute_paths_for_general_utils.patch \
            file://fix-rpath.patch \
-	   file://respect-fstack-protector.patch \
            file://norm-rpath.patch \
            file://dont-depend-on-help2man.patch \
            file://fix-resolve-lt-sysroot.patch \
           "
 
-SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
-SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
+SRC_URI[md5sum] = "353ed373fd3c6d7e47a1f4a8728d966b"
+SRC_URI[sha256sum] = "159d4e20c201f929e3562536d3ae6b5e605403fa4bb4e72ef197a4e162c3fedf"
 
 do_compile_prepend () {
 	# Sometimes this file doesn't get rebuilt, force the issue
-	rm -f ${S}/libltdl/config/ltmain.sh
-	make libltdl/config/ltmain.sh
+	rm -f ${S}/build-aux/ltmain.sh
+	make build-aux/ltmain.sh
 	./config.status
 }
 

similarity index 52%
rename from meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
rename to meta/recipes-devtools/libtool/libtool-cross_2.4.4.bb
index 34aae0b..8478802 100644
@@ -1,6 +1,5 @@
 require libtool-${PV}.inc
 
-PR = "${INC_PR}.1"
 PACKAGES = ""
 SRC_URI += "file://prefix.patch"
 SRC_URI += "file://fixinstall.patch"

@@ -18,17 +17,18 @@ do_install () {
 	install -d ${D}${bindir_crossscripts}/
 	install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool
 	install -d ${D}${bindir_crossscripts}/
-	install -m 0755 libtoolize ${D}${bindir_crossscripts}/
-	install -d ${D}${target_datadir}/libtool/config/
+	GREP='/bin/grep' SED='sed' ${S}/build-aux/inline-source libtoolize > ${D}${bindir_crossscripts}/libtoolize
+	chmod 0755 ${D}${bindir_crossscripts}/libtoolize
+	install -d ${D}${target_datadir}/libtool/build-aux/
 	install -d ${D}${target_datadir}/aclocal/
-	install -c ${S}/libltdl/config/compile ${D}${target_datadir}/libtool/config/
-	install -c ${S}/libltdl/config/config.guess ${D}${target_datadir}/libtool/config/
-	install -c ${S}/libltdl/config/config.sub ${D}${target_datadir}/libtool/config/
-	install -c ${S}/libltdl/config/depcomp ${D}${target_datadir}/libtool/config/
-	install -c ${S}/libltdl/config/install-sh ${D}${target_datadir}/libtool/config/
-	install -c ${S}/libltdl/config/missing ${D}${target_datadir}/libtool/config/
-	install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${target_datadir}/libtool/config/
-	install -c -m 0644 ${S}/libltdl/m4/*.m4 ${D}${target_datadir}/aclocal/
+	install -c ${S}/build-aux/compile ${D}${target_datadir}/libtool/build-aux/
+	install -c ${S}/build-aux/config.guess ${D}${target_datadir}/libtool/build-aux/
+	install -c ${S}/build-aux/config.sub ${D}${target_datadir}/libtool/build-aux/
+	install -c ${S}/build-aux/depcomp ${D}${target_datadir}/libtool/build-aux/
+	install -c ${S}/build-aux/install-sh ${D}${target_datadir}/libtool/build-aux/
+	install -c ${S}/build-aux/missing ${D}${target_datadir}/libtool/build-aux/
+	install -c -m 0644 ${S}/build-aux/ltmain.sh ${D}${target_datadir}/libtool/build-aux/
+	install -c -m 0644 ${S}/m4/*.m4 ${D}${target_datadir}/aclocal/
 }
 
 SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess"

similarity index 96%
rename from meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
rename to meta/recipes-devtools/libtool/libtool-native_2.4.4.bb
index f03859e..4c5218a 100644
@@ -2,7 +2,6 @@ require libtool-${PV}.inc
 
 DEPENDS = ""
 
-PR = "${INC_PR}.1"
 SRC_URI += "file://prefix.patch"
 
 inherit native

deleted file mode 100644
index 3c751ed..0000000
@@ -1,39 +0,0 @@
-Upstream-Status: Pending
-
-On some distro the path of utils like sed, grep etc are different than the
-buildhost system.
- This was causing runtime issue while running libtoolize from the 
-libtool-nativesdk package.
-  This patch takes out the absolute paths of these utils, and put 
-responsibility on the end-user to set correct paths for these utilities to be 
-found out.
-
-Nitin A Kamble <[email protected]>
-2011/02/18
-
-
-Index: libtool-2.4.2/libltdl/config/general.m4sh
-===================================================================
---- libtool-2.4.2.orig/libltdl/config/general.m4sh
-+++ libtool-2.4.2/libltdl/config/general.m4sh
-@@ -45,15 +45,15 @@ progpath="$0"
- M4SH_VERBATIM([[
- : ${CP="cp -f"}
- test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
--: ${EGREP="@EGREP@"}
--: ${FGREP="@FGREP@"}
--: ${GREP="@GREP@"}
--: ${LN_S="@LN_S@"}
-+: ${EGREP="egrep"}
-+: ${FGREP="fgrep"}
-+: ${GREP="grep"}
-+: ${LN_S="ln -s"}
- : ${MAKE="make"}
- : ${MKDIR="mkdir"}
- : ${MV="mv -f"}
- : ${RM="rm -f"}
--: ${SED="@SED@"}
-+: ${SED="sed"}
- : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
- : ${Xsed="$SED -e 1s/^X//"}
- 

index 67552b0..fd4084c 100644
@@ -1,24 +1,30 @@
 Upstream-Status: Inappropriate
 
 Signed-off-by: Marko Lindqvist <[email protected]>
-diff -Nurd libtool-2.4.2/Makefile.am libtool-2.4.2/Makefile.am
---- libtool-2.4.2/Makefile.am	2011-10-17 13:17:04.000000000 +0300
-+++ libtool-2.4.2/Makefile.am	2013-01-01 22:03:36.865586811 +0200
-@@ -327,17 +327,6 @@
-	cd $(srcdir)/doc && \
-	  $(MAKEINFO) --no-headers $(MAKEINFOFLAGS) -o notes.txt notes.texi
+Updated by: Robert Yang <[email protected]>
 
--dist_man1_MANS		= $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -404,21 +404,6 @@ $(notes_txt): $(notes_texi)
+ 	$(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \
+ 	    $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)'
+ 
+-dist_man1_MANS		= $(libtool_1) $(libtoolize_1)
 -MAINTAINERCLEANFILES	+= $(dist_man1_MANS)
 -update_mans = \
 -  PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \
--  $(HELP2MAN) --output=$@
--$(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh
--	$(update_mans) --help-option=--help-all libtool
--$(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in
--	$(update_mans) libtoolize
+-  $(HELP2MAN) --output='$@'
 -
+-# It's wrong to make distributed files (e.g. $(libtool_1)) rely on
+-# files created in the build tree, so instead we regenerate the
+-# manual pages if the sources for the build-tree files we want to
+-# run have changed.
+-$(libtool_1): $(ltmain_sh)
+-	$(AM_V_GEN)$(update_mans) --help-option=--help-all libtool
+-$(libtoolize_1): $(libtoolize_in)
+-	$(AM_V_GEN)$(update_mans) libtoolize
 -
+ 
  ## ------------- ##
  ## Installation. ##
- ## ------------- ##

index 6f9d321..5c9f8cc 100644
@@ -7,13 +7,13 @@ This works around the issue until it gets sorted out upstream.
 Fix suggested by Richard Purdie <[email protected]>
 Signed-off-by: Scott Garman <[email protected]>
 Signed-off-by: Randy Witt <[email protected]>
+Updated by: Robert Yang <[email protected]>
 
-Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.4.2/libltdl/config/ltmain.m4sh
-@@ -7268,9 +7268,11 @@
- 	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -7569,9 +7569,11 @@ EOF
+ 	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
  	  for libdir in $rpath; do
  	    if test -n "$hardcode_libdir_flag_spec"; then
 +		  func_replace_sysroot "$libdir"

@@ -24,9 +24,9 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
 -		func_replace_sysroot "$libdir"
 -		libdir=$func_replace_sysroot_result
  		if test -z "$hardcode_libdirs"; then
- 		  hardcode_libdirs="$libdir"
+ 		  hardcode_libdirs=$libdir
  		else
-@@ -7999,6 +8001,10 @@
+@@ -8301,6 +8303,10 @@ EOF
        hardcode_libdirs=
        for libdir in $compile_rpath $finalize_rpath; do
  	if test -n "$hardcode_libdir_flag_spec"; then

@@ -36,8 +36,8 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
 +	  libdir=$func_stripname_result
  	  if test -n "$hardcode_libdir_separator"; then
  	    if test -z "$hardcode_libdirs"; then
- 	      hardcode_libdirs="$libdir"
-@@ -8050,6 +8056,10 @@
+ 	      hardcode_libdirs=$libdir
+@@ -8352,6 +8358,10 @@ EOF
        hardcode_libdirs=
        for libdir in $finalize_rpath; do
  	if test -n "$hardcode_libdir_flag_spec"; then

@@ -47,4 +47,4 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
 +	  libdir=$func_stripname_result
  	  if test -n "$hardcode_libdir_separator"; then
  	    if test -z "$hardcode_libdirs"; then
- 	      hardcode_libdirs="$libdir"
+ 	      hardcode_libdirs=$libdir

index 44e9fe1..1bd9598 100644
@@ -10,17 +10,18 @@ I have also reported the problem to libtool here
 http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html
 
 Signed-off-by: Hans Beckerus <hans.beckerus at gmail.com>
+Updated by: Robert Yang <[email protected]>
 ---
-diff -ur libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libtool.m4
---- libtool-2.4.2.orig/libltdl/m4/libtool.m4	2013-09-13 22:37:43.647282945 +0200
-+++ libtool-2.4.2/libltdl/m4/libtool.m4	2013-09-14 10:27:37.168178605 +0200
-@@ -1234,16 +1234,21 @@
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1225,16 +1225,21 @@ dnl lt_sysroot will always be passed unquoted.  We quote it here
  dnl in case the user passed a directory name.
  lt_sysroot=
- case ${with_libtool_sysroot} in #(
+ case $with_libtool_sysroot in #(
 - yes)
 + no)
-    if test "$GCC" = yes; then
+    if test yes = "$GCC"; then
       lt_sysroot=`$CC --print-sysroot 2>/dev/null`
 +     # Treat "/" the same a an unset sysroot. It seems to be more
 +     # compatible across host platforms that way!?

@@ -37,5 +38,5 @@ diff -ur libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libto
 - no|'')
 -   ;; #(
   *)
-    AC_MSG_RESULT([${with_libtool_sysroot}])
+    AC_MSG_RESULT([$with_libtool_sysroot])
     AC_MSG_ERROR([The sysroot must be an absolute path.])

index 1571178..a2ec947 100644
@@ -6,10 +6,12 @@ RP 23/9/2011
 
 Upstream-Status: Pending
 
-Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
+Updated by: Robert Yang <[email protected]>
+
+Index: libtool-2.4.2/build-aux/ltmain.in
 ===================================================================
---- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.4.2/libltdl/config/ltmain.m4sh
+--- libtool-2.4.2.orig/build-aux/ltmain.in
++++ libtool-2.4.2/build-aux/ltmain.in
 @@ -7286,8 +7286,14 @@ EOF
  		  esac
  		fi

index 279c07b..8f343bf 100644
@@ -16,12 +16,13 @@ Upstream-Status: Inappropriate [upstream are unlikely to take a patch like this]
 
 RP 2011/11/16
 
-Index: libtool-2.4/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.4.orig/libltdl/config/ltmain.m4sh	2011-11-16 14:50:01.070383779 +0000
-+++ libtool-2.4/libltdl/config/ltmain.m4sh	2011-11-16 15:27:13.582310413 +0000
-@@ -2163,7 +2163,7 @@
- 	dir="$func_dirname_result"
+Updated by: Robert Yang <[email protected]>
+
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -2355,7 +2355,7 @@ func_mode_install ()
+ 	dir=$func_dirname_result
  	func_append dir "$objdir"
  
 -	if test -n "$relink_command"; then

@@ -29,16 +30,16 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
        # Strip any trailing slash from the destination.
        func_stripname '' '/' "$libdir"
        destlibdir=$func_stripname_result
-@@ -2202,7 +2202,7 @@
+@@ -2394,7 +2394,7 @@ func_mode_install ()
  	  shift
  
- 	  srcname="$realname"
--	  test -n "$relink_command" && srcname="$realname"T
+ 	  srcname=$realname
+-	  test -n "$relink_command" && srcname=${realname}T
 +	  test "$fast_install" = no && test -n "$relink_command" && srcname="$realname"T
  
  	  # Install the shared library and build the symlinks.
  	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-@@ -5856,15 +5856,15 @@
+@@ -6162,15 +6162,15 @@ func_mode_link ()
  	    # Hardcode the library path.
  	    # Skip directories that are in the system default run-time
  	    # search path.

@@ -63,7 +64,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
  	    case " $sys_lib_dlsearch_path " in
  	    *" $libdir "*) ;;
  	    *)
-@@ -5930,15 +5930,15 @@
+@@ -6236,15 +6236,15 @@ func_mode_link ()
  	    # Hardcode the library path.
  	    # Skip directories that are in the system default run-time
  	    # search path.

@@ -88,14 +89,14 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
  	    case " $sys_lib_dlsearch_path " in
  	    *" $libdir "*) ;;
  	    *)
-@@ -6284,8 +6284,8 @@
- 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+@@ -6590,8 +6590,8 @@ func_mode_link ()
+ 		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		  test -z "$libdir" && \
- 		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+ 		    func_fatal_error "'$deplib' is not a valid libtool archive"
 -		  test "$absdir" != "$libdir" && \
--		    func_warning "\`$deplib' seems to be moved"
+-		    func_warning "'$deplib' seems to be moved"
 +		  #test "$absdir" != "$libdir" && \
-+		  #  func_warning "\`$deplib' seems to be moved"
++		  #  func_warning "'$deplib' seems to be moved"
  
- 		  path="-L$absdir"
+ 		  path=-L$absdir
  		fi

index dce1576..1e4c65e 100644
@@ -7,9 +7,11 @@ RPATH in the generated binary.  Normalize before comparision.
 Signed-off-by: Andy Ross <[email protected]>
 Upstream-Status: Pending
 
-diff -ur a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
---- a/libltdl/config/ltmain.m4sh	2012-08-16 13:58:55.058900363 -0700
-+++ b/libltdl/config/ltmain.m4sh	2012-08-22 11:01:34.191345989 -0700
+Updated by: Robert Yang <[email protected]>
+
+diff -ur a/build-aux/ltmain.in b/build-aux/ltmain.in
+--- a/build-aux/ltmain.in	2012-08-16 13:58:55.058900363 -0700
++++ b/build-aux/ltmain.in	2012-08-22 11:01:34.191345989 -0700
 @@ -7288,8 +7288,10 @@
  	      else
                  # We only want to hardcode in an rpath if it isn't in the

147 lines not on this page · raw message

155 lines not on this page · raw message

53 lines not on this page · raw message

index bb7a761..e8824d7 100644
@@ -11,11 +11,12 @@ Merged a patch received from Gary Thomas <[email protected]>
 Date: 2010/07/12
 Nitin A Kamble <[email protected]>
 
-Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.4.2/libltdl/config/ltmain.m4sh
-@@ -2167,8 +2167,15 @@ func_mode_install ()
+Updated by: Robert Yang <[email protected]>
+
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -2356,8 +2356,15 @@ func_mode_install ()
  	func_append dir "$objdir"
  
  	if test -n "$relink_command"; then

index 0cd66ad..6af99f3 100644
@@ -6,16 +6,16 @@ i.e. when lt_sysroot is not set, it will still behave the same and add
 -L/usr/lib to the relink command.
 
 -Khem Raj <[email protected]>
+Updated by: Robert Yang <[email protected]>
 
-Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
-===================================================================
---- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.4.2/libltdl/config/ltmain.m4sh
-@@ -6138,7 +6138,7 @@ func_mode_link ()
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -6421,7 +6421,7 @@ func_mode_link ()
  	      fi
  	    else
  	      # We cannot seem to hardcode it, guess we'll fake it.
--	      add_dir="-L$libdir"
+-	      add_dir=-L$libdir
 +	      add_dir="-L$lt_sysroot$libdir"
  	      # Try looking first in the location we're being installed to.
  	      if test -n "$inst_prefix_dir"; then

similarity index 91%
rename from meta/recipes-devtools/libtool/libtool_2.4.2.bb
rename to meta/recipes-devtools/libtool/libtool_2.4.4.bb
index 6064312..45f1b2f 100644
@@ -1,7 +1,5 @@
 require libtool-${PV}.inc
 
-PR = "${INC_PR}.0"
-
 RDEPENDS_${PN} += "bash"
 
 #

@@ -23,6 +21,6 @@ do_install_append () {
 libtool_sysroot_preprocess () {
 	rm -rf ${SYSROOT_DESTDIR}${bindir}/*
 	rm -rf ${SYSROOT_DESTDIR}${datadir}/aclocal/*
-	rm -rf ${SYSROOT_DESTDIR}${datadir}/libtool/config/*
+	rm -rf ${SYSROOT_DESTDIR}${datadir}/libtool/build-aux/*
 }
 

similarity index 97%
rename from meta/recipes-devtools/libtool/nativesdk-libtool_2.4.2.bb
rename to meta/recipes-devtools/libtool/nativesdk-libtool_2.4.4.bb
index 7b5c97a..508eade 100644
@@ -1,7 +1,5 @@
 require libtool-${PV}.inc
 
-PR = "${INC_PR}.0"
-
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:"
 
 SRC_URI += "file://prefix.patch"

new file mode 100644
index 0000000..8bde02a
@@ -0,0 +1,32 @@
+From d480d837ff57e855d1cf0b63054d6b1ad7aaf2ee Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Tue, 6 Jan 2015 17:54:43 -0800
+Subject: [PATCH] Makefile.am: remove ACLOCAL_AMFLAGS = -I shave -I m4
+
+Fixed:
+libtoolize:   error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with ACLOCAL_AMFLAGS=-I shave.
+
+They are already included by configure.ac:
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([shave])
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ Makefile.am |    2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8baa62c..6679f77 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,3 @@
+-ACLOCAL_AMFLAGS = -I shave -I m4
+-
+ SUBDIRS = libbb libopkg src tests utils man
+ 
+ 
+-- 
+1.7.9.5
+

index 2cca63c..0d08bf9 100644
@@ -5,6 +5,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
            file://add-exclude.patch \
            file://opkg-configure.service \
            file://libopkg-opkg_remove.c-avoid-remove-pkg-repeatly-with.patch \
+           file://remove-ACLOCAL_AMFLAGS-I-shave-I-m4.patch \
 "
 
 S = "${WORKDIR}/${BPN}-${PV}"

similarity index 58%
rename from meta/recipes-core/gettext/gettext-0.18.3.2/parallel.patch
rename to meta/recipes-core/gettext/gettext-0.19.4/parallel.patch
index f2c567d..c8e2c94 100644
@@ -21,16 +21,3 @@ Signed-off-by: Joe Slater <[email protected]>
  # Which classes to export from the shared library.
  MOOPPFLAGS += --dllexport=styled_ostream
  
---- a/gettext-tools/src/Makefile.am
-+++ b/gettext-tools/src/Makefile.am
-@@ -229,8 +229,8 @@ libgettextsrc_la_LDFLAGS += -Wl,--export
- endif
- 
- # No need to install libgettextsrc.a, except on AIX.
--install-exec-local: install-libLTLIBRARIES install-exec-clean
--install-exec-clean:
-+install-exec-local: install-exec-clean
-+install-exec-clean: install-libLTLIBRARIES
- 	case "@host_os@" in \
- 	  aix*) ;; \
- 	  *) $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a ;; \

53 lines not on this page · raw message

deleted file mode 100644
index e0335a3d1c601013c28cf0792805dbadc3b32f89..0000000000000000000000000000000000000000
GIT binary patch

43 lines not on this page · raw message

similarity index 76%
rename from meta/recipes-core/gettext/gettext-minimal-0.18.3.2/COPYING
rename to meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING
index 3485c5a..8d11d1d 100644
@@ -1,4 +1,4 @@
-dnl Copyright (C) 1997-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.

86 lines not on this page · raw message

new file mode 100644
index 0000000000000000000000000000000000000000..b04ba55032e45b1d11545df227a1e9ca26bebf8e
GIT binary patch

similarity index 98%
rename from meta/recipes-core/gettext/gettext-minimal-0.18.3.2/config.rpath
rename to meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath
index c38b914..b625621 100755
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2013 Free Software Foundation, Inc.
+#   Copyright 1996-2014 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <[email protected]>, 1996
 #

@@ -367,11 +367,7 @@ else
     dgux*)
       hardcode_libdir_flag_spec='-L$libdir'
       ;;
-    freebsd2.2*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    freebsd2*)
+    freebsd2.[01]*)
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;

@@ -548,13 +544,11 @@ case "$host_os" in
   dgux*)
     library_names_spec='$libname$shrext'
     ;;
+  freebsd[23].*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
   freebsd* | dragonfly*)
-    case "$host_os" in
-      freebsd[123]*)
-        library_names_spec='$libname$shrext$versuffix' ;;
-      *)
-        library_names_spec='$libname$shrext' ;;
-    esac
+    library_names_spec='$libname$shrext'
     ;;
   gnu*)
     library_names_spec='$libname$shrext'

similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-0.18.3.2/remove-potcdate.sin
rename to meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin

similarity index 86%
rename from meta/recipes-core/gettext/gettext-minimal-native_0.18.3.2.bb
rename to meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
index 2b43b97..ca97315 100644
@@ -8,14 +8,13 @@ SRC_URI = "file://aclocal.tgz \
            file://Makefile.in.in \
            file://remove-potcdate.sin \
            file://COPYING \
-           file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \
 "
 
 INHIBIT_DEFAULT_DEPS = "1"
 INHIBIT_AUTOTOOLS_DEPS = "1"
 
 LICENSE = "FSF-Unlimited"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0854da868a929923087141d9d7aba7d5"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1b20675cd5158442f6007d022f46b35b"
 
 inherit native
 

similarity index 97%
rename from meta/recipes-core/gettext/gettext_0.18.3.2.bb
rename to meta/recipes-core/gettext/gettext_0.19.4.bb
index 65d4103..cebf6c7 100644
@@ -18,8 +18,8 @@ PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--
 
 LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread "
 
-SRC_URI[md5sum] = "241aba309d07aa428252c74b40a818ef"
-SRC_URI[sha256sum] = "d1a4e452d60eb407ab0305976529a45c18124bd518d976971ac6dc7aa8b4c5d7"
+SRC_URI[md5sum] = "d3511af1e604a3478900d2c2b4a4a48e"
+SRC_URI[sha256sum] = "8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f"
 
 inherit autotools texinfo
 

index cf9dcfd..d50a86e 100644
@@ -45,6 +45,12 @@ tex_texinfo = "texmf/tex/texinfo"
 
 inherit gettext autotools
 
+do_configure_prepend () {
+	# autotools_do_configure updates po/Makefile.in.in, we also need
+	# update po_document.
+	cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/
+}
+
 do_compile_prepend() {
 	if [ -d tools ];then
 		oe_runmake -C tools/gnulib/lib

deleted file mode 100644
index d1c9fe5..0000000
@@ -1,31 +0,0 @@
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Saul Wold <[email protected]>
-
-Index: texi2html-5.0/po_document/Makefile.in.in
-===================================================================
---- texi2html-5.0.orig/po_document/Makefile.in.in
-+++ texi2html-5.0/po_document/Makefile.in.in
-@@ -9,7 +9,7 @@
- # General Public License and is *not* in the public domain.
- #
- # Origin: gettext-0.17
--GETTEXT_MACRO_VERSION = 0.17
-+GETTEXT_MACRO_VERSION = 0.18
- 
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
-Index: texi2html-5.0/po_messages/Makefile.in.in
-===================================================================
---- texi2html-5.0.orig/po_messages/Makefile.in.in
-+++ texi2html-5.0/po_messages/Makefile.in.in
-@@ -9,7 +9,7 @@
- # General Public License and is *not* in the public domain.
- #
- # Origin: gettext-0.17
--GETTEXT_MACRO_VERSION = 0.17
-+GETTEXT_MACRO_VERSION = 0.18
- 
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@

index aa5f1fd..eac289e 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 PR = "r2"
 
 SRC_URI     = "${SAVANNAH_GNU_MIRROR}/texi2html/${BPN}-${PV}.tar.bz2 \
-               file://fix_gettext_version.patch"
+               "
 
 SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54"
 SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa"

@@ -15,15 +15,10 @@ SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89
 inherit autotools gettext texinfo
 
 do_configure_prepend() {
-	# Make a directory for the old gettext setup
-	if [ ! -d ${S}/po ]; then
-		mkdir ${S}/po
-	fi
-}
-
-do_configure_append() {
-	# Clean up the phony po directory
-	rm -rf ${S}/po
+	# autotools_do_configure updates po/Makefile.in.in, we also need
+	# update po_document.
+	cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/
+	cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_messages/
 }
 
 do_install_append () {