diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support/popt')
4 files changed, 77 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-support/popt/popt/disable_tests.patch b/import-layers/yocto-poky/meta/recipes-support/popt/popt/disable_tests.patch new file mode 100644 index 000000000..016cf66a2 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/popt/popt/disable_tests.patch @@ -0,0 +1,21 @@ +Use of $(top_srcdir) in TESTS is an error which causes +automake-1.13 to abort. Just remove tests. + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd popt-1.16/Makefile.am popt-1.16/Makefile.am +--- popt-1.16/Makefile.am 2010-05-04 23:55:54.000000000 +0300 ++++ popt-1.16/Makefile.am 2013-01-02 13:34:29.540361391 +0200 +@@ -34,11 +34,6 @@ + + noinst_SCRIPTS = testit.sh + +-TESTS_ENVIRONMENT = \ +-test1="$(top_builddir)/test1" +- +-TESTS = $(top_srcdir)/testit.sh +- + include_HEADERS = popt.h + + usrlibdir = $(libdir) diff --git a/import-layers/yocto-poky/meta/recipes-support/popt/popt/pkgconfig_fix.patch b/import-layers/yocto-poky/meta/recipes-support/popt/popt/pkgconfig_fix.patch new file mode 100644 index 000000000..0bddbf8c9 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/popt/popt/pkgconfig_fix.patch @@ -0,0 +1,15 @@ +Upstream-Status: Pending + +Install the pkgconfig file into libdir. + +--- popt-1.16.orig/Makefile.am 2012-04-26 13:42:54.021139813 +0800 ++++ popt-1.16/Makefile.am 2012-04-26 13:36:03.552096912 +0800 +@@ -47,7 +47,7 @@ + libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c + libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ + +-pkgconfigdir = $(prefix)/lib/pkgconfig ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = popt.pc + + if HAVE_LD_VERSION_SCRIPT diff --git a/import-layers/yocto-poky/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch b/import-layers/yocto-poky/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch new file mode 100644 index 000000000..91bca96a5 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch @@ -0,0 +1,21 @@ +Upstream-Status: pending + +This patch avoids this error with automake 1.12: + +| configure.ac:49: error: automatic de-ANSI-fication support has been removed + +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +2012/05/02 + +Index: popt-1.16/configure.ac +=================================================================== +--- popt-1.16.orig/configure.ac ++++ popt-1.16/configure.ac +@@ -46,7 +46,6 @@ AC_GCC_TRADITIONAL + AC_SYS_LARGEFILE + + AC_ISC_POSIX +-AM_C_PROTOTYPES + + AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h) + diff --git a/import-layers/yocto-poky/meta/recipes-support/popt/popt_1.16.bb b/import-layers/yocto-poky/meta/recipes-support/popt/popt_1.16.bb new file mode 100644 index 000000000..cb13a815e --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-support/popt/popt_1.16.bb @@ -0,0 +1,20 @@ +SUMMARY = "Library for parsing command line options" +HOMEPAGE = "http://rpm5.org/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" +PR = "r3" + +SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \ + file://pkgconfig_fix.patch \ + file://popt_fix_for_automake-1.12.patch \ + file://disable_tests.patch \ + " + +SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33" +SRC_URI[sha256sum] = "e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8" + +inherit autotools gettext + +BBCLASSEXTEND = "native nativesdk" |
