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