From 493556b4dfb1e16d117dfd71209a7cde106cbddf Mon Sep 17 00:00:00 2001 From: Bogdan Marinescu Date: Mon, 27 May 2013 15:14:48 +0300 Subject: autogen-native: upgraded to 5.17.4 (From OE-Core rev: 849d98a45b3f21f55bfecdd9daf494a632d53a48) Signed-off-by: Bogdan Marinescu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../autogen/autogen-native_5.17.3.bb | 34 ---------------------- .../autogen/autogen-native_5.17.4.bb | 34 ++++++++++++++++++++++ meta/recipes-devtools/autogen/files/guile.patch | 19 ++++++------ 3 files changed, 43 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-devtools/autogen/autogen-native_5.17.3.bb create mode 100644 meta/recipes-devtools/autogen/autogen-native_5.17.4.bb (limited to 'meta/recipes-devtools/autogen') diff --git a/meta/recipes-devtools/autogen/autogen-native_5.17.3.bb b/meta/recipes-devtools/autogen/autogen-native_5.17.3.bb deleted file mode 100644 index b101966..0000000 --- a/meta/recipes-devtools/autogen/autogen-native_5.17.3.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "AutoGen is a tool to manage programs that contain large amounts of repetitious text." -DESCRIPTION = "AutoGen is a tool designed to simplify the creation and\ - maintenance of programs that contain large amounts of repetitious text.\ - It is especially valuable in programs that have several blocks of text\ - that must be kept synchronized." -HOMEPAGE = "http://www.gnu.org/software/autogen/" -SECTION = "devel" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ - file://guile.patch" - -SRC_URI[md5sum] = "2d14ced1c28f71e61bb7c58e93317a40" -SRC_URI[sha256sum] = "2f795c224fac899ec3a801a9a32aad2a8104fe926dcc1994cc0797f9a3f4e97d" - -DEPENDS = "guile-native libtool-native libxml2-native" -RDEPENDS = "automake pkgconfig" - -inherit autotools native - -# Following line will be needed for the non-native target recipe. -#CFLAGS += "-L${STAGING_LIBDIR} -lguile-2.0 -lgc -pthread -I${STAGING_INCDIR}/guile/2.0 -I${STAGING_INCDIR}" - -# autogen-native links against libguile which may have been relocated with sstate -# these environment variables ensure there isn't a relocation issue -export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" -export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" - -do_install_append () { - create_wrapper ${D}/${bindir}/autogen \ - GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ - GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache -} diff --git a/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb b/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb new file mode 100644 index 0000000..e5234c2 --- /dev/null +++ b/meta/recipes-devtools/autogen/autogen-native_5.17.4.bb @@ -0,0 +1,34 @@ +SUMMARY = "AutoGen is a tool to manage programs that contain large amounts of repetitious text." +DESCRIPTION = "AutoGen is a tool designed to simplify the creation and\ + maintenance of programs that contain large amounts of repetitious text.\ + It is especially valuable in programs that have several blocks of text\ + that must be kept synchronized." +HOMEPAGE = "http://www.gnu.org/software/autogen/" +SECTION = "devel" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \ + file://guile.patch" + +SRC_URI[md5sum] = "09f074cba57610bf4ef1147e01c8ae90" +SRC_URI[sha256sum] = "cd2585f4794d0e9d7f2cb0b9af4f2bd429946e718473edf1cf8c49f081ca71ed" + +DEPENDS = "guile-native libtool-native libxml2-native" +RDEPENDS = "automake pkgconfig" + +inherit autotools native + +# Following line will be needed for the non-native target recipe. +#CFLAGS += "-L${STAGING_LIBDIR} -lguile-2.0 -lgc -pthread -I${STAGING_INCDIR}/guile/2.0 -I${STAGING_INCDIR}" + +# autogen-native links against libguile which may have been relocated with sstate +# these environment variables ensure there isn't a relocation issue +export GUILE_LOAD_PATH = "${STAGING_DATADIR_NATIVE}/guile/2.0" +export GUILE_LOAD_COMPILED_PATH = "${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache" + +do_install_append () { + create_wrapper ${D}/${bindir}/autogen \ + GUILE_LOAD_PATH=${STAGING_DATADIR_NATIVE}/guile/2.0 \ + GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache +} diff --git a/meta/recipes-devtools/autogen/files/guile.patch b/meta/recipes-devtools/autogen/files/guile.patch index 09b441b..8a77dba 100644 --- a/meta/recipes-devtools/autogen/files/guile.patch +++ b/meta/recipes-devtools/autogen/files/guile.patch @@ -1,14 +1,14 @@ -Disable the autoconf macros that use dpkg (!) and guile-config to determine what -version and where guile is installed, and just use pkg-config directly (guile-config is a deprecated wrapper around pkg-config). - -Signed-off-by: Ross Burton -Upstream-Status: Pending (should be submitted) +Disable the autoconf macros that use dpkg (!) and guile-config to determine what +version and where guile is installed, and just use pkg-config directly (guile-config is a deprecated wrapper around pkg-config). + + Signed-off-by: Ross Burton + Upstream-Status: Pending (should be submitted) diff --git a/config/ag_macros.m4 b/config/ag_macros.m4 -index c69b11c..915968b 100644 +index 9914a65..b6db97a 100644 --- a/config/ag_macros.m4 +++ b/config/ag_macros.m4 -@@ -175,124 +175,12 @@ return 0;], +@@ -175,123 +175,12 @@ return 0;], AC_DEFUN([AG_WITHLIB_GUILE],[ @@ -69,8 +69,6 @@ index c69b11c..915968b 100644 - test -n "${f}" && ag_cv_with_libguile_libs="${f}" && \ - AC_MSG_NOTICE([guile-config used for LIBS: $f]) ;; - esac -- fi ## disabled by request -- - case "X${ag_cv_with_libguile_cflags}" in - Xyes|Xno|X ) - ag_cv_with_libguile_cflags="" ;; @@ -107,6 +105,7 @@ index c69b11c..915968b 100644 - [ag_cv_with_libguile=yes], - [ag_cv_with_libguile=no]) # end of AC_LINK_IFELSE - ]) # end of AC_CACHE_VAL for ag_cv_with_libguile +- fi ## disabled by request - AC_MSG_RESULT([${ag_cv_with_libguile}]) - AC_SUBST([LIBGUILE_CFLAGS]) - AC_SUBST([LIBGUILE_LIBS]) @@ -138,7 +137,7 @@ index c69b11c..915968b 100644 ]) # end of AC_DEFUN of AG_WITHLIB_GUILE -@@ -312,40 +200,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[ +@@ -311,40 +200,10 @@ AC_DEFUN([AG_WITHCONF_GUILE_VER],[ AC_DEFUN([AG_TEST_GUILE_VERSION],[ -- cgit v1.1