Move all to deprecated folder.

This commit is contained in:
2016-11-16 21:57:57 +01:00
parent 01738a7684
commit 05de7d6c04
9777 changed files with 0 additions and 0 deletions

View File

@@ -0,0 +1,12 @@
diff -ru popt-1.14_vanilla/popthelp.c popt-1.14_no-wchar/popthelp.c
--- popt-1.14_vanilla/popthelp.c 2008-03-27 17:33:08.000000000 +0000
+++ popt-1.14_no-wchar/popthelp.c 2008-04-10 05:44:43.000000000 +0000
@@ -15,7 +15,7 @@
#include <sys/ioctl.h>
#endif
-#define POPT_WCHAR_HACK
+/* #define POPT_WCHAR_HACK */
#ifdef POPT_WCHAR_HACK
#include <wchar.h> /* for mbsrtowcs */
/*@access mbstate_t @*/

View File

@@ -0,0 +1,38 @@
Make sure we can autoreconfigure popt
This commit makes a few changes in the popt build system to allow it
to be autoreconfigured with modern autotools:
- the TESTS variable shouldn't be using $(top_srcdir), and since we
don't care about tests in Buildroot, we just disable it.
- the AM_C_PROTOTYPES macro is deprecated and should no longer be
used, causes an error with autoconf/automake.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/Makefile.am
===================================================================
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,8 +37,6 @@
TESTS_ENVIRONMENT = \
test1="$(top_builddir)/test1"
-TESTS = $(top_srcdir)/testit.sh
-
include_HEADERS = popt.h
usrlibdir = $(libdir)
Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@
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)

View File

@@ -0,0 +1,41 @@
Detect glob_pattern_p()
The current popt build system tests the existence of <glob.h>, and
then assumes that if __GLIBC__ is defined, then glob_pattern_p() must
be available. Unfortunately, that's not true with uClibc: <glob.h> may
be installed, but not necessarily the GNU glob extensions... and
uClibc defines __GLIBC__. This is causing build issues with certain
uClibc toolchains that do not have GNU glob extensions enabled.
To fix this, this patch adds an AC_CHECK_FUNCS() test for
glob_pattern_p, and uses that to find out whether glob_pattern_p() is
available or not.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@
AC_CHECK_FUNC(setreuid, [], [
AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
])
-AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom)
+AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom glob_pattern_p)
AM_GNU_GETTEXT([external])
AM_ICONV_LINK
Index: b/poptconfig.c
===================================================================
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -42,7 +42,7 @@
/*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
#endif /* __LCLINT__ */
-#if !defined(__GLIBC__)
+#if !defined(HAVE_GLOB_PATTERN_P)
/* Return nonzero if PATTERN contains any metacharacters.
Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
static int

View File

@@ -0,0 +1,47 @@
From 470755ccc353b59107c957972d908cbde4942c8d Mon Sep 17 00:00:00 2001
From: Fabio Porcedda <fabio.porcedda@gmail.com>
Date: Sun, 1 Mar 2015 21:13:48 +0100
Subject: [PATCH] popt.pc: add the libintl library to the Libs.private field
If static linking and libintl is used, the program that uses the popt
library needs to link to the libintl library too so add the libintl
library to the libs.private field because is useful for programs that call
pkg-config --static --libs popt
they get the libintl library too:
-L<...> -lpopt -lintl
This patch was already sent upstream:
http://rpm5.org/community/popt-devel/0294.html
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
configure.ac | 1 +
popt.pc.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/configure.ac b/configure.ac
index e8eb238..816d272 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,7 @@ popt_sysconfdir="${sysconfdir}"
eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory])
+AC_SUBST([POPT_PKGCONFIG_LIBS_PRIVATE],"$LIBINTL")
# Define a (hope) portable Libs pkgconfig directive that
# - Don't harm if the default library search path include ${libdir}
diff --git a/popt.pc.in b/popt.pc.in
index a86437c..0acfdb9 100644
--- a/popt.pc.in
+++ b/popt.pc.in
@@ -6,5 +6,6 @@ includedir=@includedir@
Name: popt
Version: @VERSION@
Description: popt library.
+Libs.private: @POPT_PKGCONFIG_LIBS_PRIVATE@
Libs: @POPT_PKGCONFIG_LIBS@
Cflags: -I${includedir}
--
2.3.1

View File

@@ -0,0 +1,6 @@
config BR2_PACKAGE_POPT
bool "popt"
help
Popt is a C library for parsing command line parameters.
http://rpm5.org

View File

@@ -0,0 +1,2 @@
# Locally calculated:
sha256 e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 popt-1.16.tar.gz

View File

@@ -0,0 +1,27 @@
################################################################################
#
# popt
#
################################################################################
POPT_VERSION = 1.16
POPT_SITE = http://rpm5.org/files/popt
POPT_INSTALL_STAGING = YES
POPT_LICENSE = MIT
POPT_LICENSE_FILES = COPYING
POPT_AUTORECONF = YES
POPT_GETTEXTIZE = YES
ifeq ($(BR2_PACKAGE_GETTEXT),y)
POPT_DEPENDENCIES += gettext
endif
POPT_CONF_ENV = ac_cv_va_copy=yes
ifeq ($(BR2_PACKAGE_LIBICONV),y)
POPT_CONF_ENV += am_cv_lib_iconv=yes
POPT_CONF_OPTS += --with-libiconv-prefix=$(STAGING_DIR)/usr
endif
$(eval $(autotools-package))
$(eval $(host-autotools-package))