From 2a401a2959b5ba8948077883c159d3cdcfe268e3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 28 Jul 2020 13:49:43 +0100 Subject: popt: upgrade to 1.18 All our patches are upstreamed so drop them. (From OE-Core rev: aeb48eb989a42846fbaed6b7f3a5a3d951d11e23) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/popt/popt/disable_tests.patch | 21 --------------------- meta/recipes-support/popt/popt/pkgconfig_fix.patch | 15 --------------- .../popt/popt/popt_fix_for_automake-1.12.patch | 21 --------------------- meta/recipes-support/popt/popt_1.16.bb | 22 ---------------------- meta/recipes-support/popt/popt_1.18.bb | 15 +++++++++++++++ 5 files changed, 15 insertions(+), 79 deletions(-) delete mode 100644 meta/recipes-support/popt/popt/disable_tests.patch delete mode 100644 meta/recipes-support/popt/popt/pkgconfig_fix.patch delete mode 100644 meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch delete mode 100644 meta/recipes-support/popt/popt_1.16.bb create mode 100644 meta/recipes-support/popt/popt_1.18.bb (limited to 'meta/recipes-support/popt') diff --git a/meta/recipes-support/popt/popt/disable_tests.patch b/meta/recipes-support/popt/popt/disable_tests.patch deleted file mode 100644 index 016cf66a27..0000000000 --- a/meta/recipes-support/popt/popt/disable_tests.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 -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/meta/recipes-support/popt/popt/pkgconfig_fix.patch b/meta/recipes-support/popt/popt/pkgconfig_fix.patch deleted file mode 100644 index 0bddbf8c94..0000000000 --- a/meta/recipes-support/popt/popt/pkgconfig_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/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 deleted file mode 100644 index 7d74aadffe..0000000000 --- a/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 -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/meta/recipes-support/popt/popt_1.16.bb b/meta/recipes-support/popt/popt_1.16.bb deleted file mode 100644 index 27e49c2ca2..0000000000 --- a/meta/recipes-support/popt/popt_1.16.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Library for parsing command line options" -HOMEPAGE = "http://rpm5.org/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" -PR = "r3" - -DEPENDS = "virtual/libiconv" - -SRC_URI = "http://anduin.linuxfromscratch.org/BLFS/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" diff --git a/meta/recipes-support/popt/popt_1.18.bb b/meta/recipes-support/popt/popt_1.18.bb new file mode 100644 index 0000000000..022ece5f47 --- /dev/null +++ b/meta/recipes-support/popt/popt_1.18.bb @@ -0,0 +1,15 @@ +SUMMARY = "Library for parsing command line options" +HOMEPAGE = "https://www.rpm.org/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" + +DEPENDS = "virtual/libiconv" + +SRC_URI = "http://ftp.rpm.org/popt/releases/popt-1.x/${BP}.tar.gz" +SRC_URI[sha256sum] = "5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1" + +inherit autotools gettext + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf