diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/expat/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/expat/files')
-rw-r--r-- | dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch | 31 | ||||
-rw-r--r-- | dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch | 24 | ||||
-rw-r--r-- | dev-libs/expat/files/expat-2.2.1-posix-shell.patch | 26 |
3 files changed, 0 insertions, 81 deletions
diff --git a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch deleted file mode 100644 index 9bf9bfe44929..000000000000 --- a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9502963fd2e84ac529950f3a6f4173d86b93b5d2 Mon Sep 17 00:00:00 2001 -From: Kerin Millar <kfm@plushkava.net> -Date: Thu, 29 Jun 2017 16:51:18 +0100 -Subject: [PATCH] conftools/get-version.sh: Use printf rather than try to infer - non-portable echo options - ---- - expat/conftools/get-version.sh | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - -diff --git a/expat/conftools/get-version.sh b/expat/conftools/get-version.sh -index a70e0fb..91e5c64 100755 ---- a/conftools/get-version.sh -+++ b/conftools/get-version.sh -@@ -32,15 +32,4 @@ MAJOR_VERSION="`sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp' $hdr`" - MINOR_VERSION="`sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' $hdr`" - MICRO_VERSION="`sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' $hdr`" - --# Determine how to tell echo not to print the trailing \n. This is --# similar to Autoconf's @ECHO_C@ and @ECHO_N@; however, we don't --# generate this file via autoconf (in fact, get-version.sh is used --# to *create* ./configure), so we just do something similar inline. --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ;; -- *) ECHO_N= ECHO_C='\c' ;; --esac -- --echo $ECHO_N "$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$ECHO_C" -+printf '%s.%s.%s' "$MAJOR_VERSION" "$MINOR_VERSION" "$MICRO_VERSION" diff --git a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch b/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch deleted file mode 100644 index 6ceb7d9993fc..000000000000 --- a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 602e6c78ca750c082b72f8cdf4a38839b312959f Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 18 Jun 2017 18:55:10 +0200 -Subject: [PATCH] configure.ac: Fix mis-detection of getrandom on Debian - GNU/kFreeBSD (#50) - -There is no such thing but we need to link (not just compile) to realize. ---- - expat/configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/expat/configure.ac b/expat/configure.ac -index 1357c9a..444c002 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ - - - AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)]) --AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include <stdlib.h> /* for NULL */ - #include <sys/random.h> - int main() { diff --git a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch b/dev-libs/expat/files/expat-2.2.1-posix-shell.patch deleted file mode 100644 index ab680451d8e0..000000000000 --- a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e5e25fac1698d9ea8dbb2e51c18d1072254b5f4b Mon Sep 17 00:00:00 2001 -From: spzeidler <spz@netbsd.org> -Date: Sun, 18 Jun 2017 14:30:22 +0200 -Subject: [PATCH] Fix sh syntax in configure.ac (#49) - -The old '==' sh-is-not-C issue -It doesn't matter in bash, but some other sh don't like it, so it's a portability issue ---- - expat/configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/expat/configure.ac b/expat/configure.ac -index e48c32e..1357c9a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -220,8 +220,8 @@ AS_HELP_STRING([--disable-xml-context], - [Do not retain context around the current parse point]), - [enable_xml_context=${enableval}]) - AS_IF([test "x${enable_xml_context}" != "xno"], [ -- AS_IF([test "x${enable_xml_context}" == "xyes" \ -- -o "x${enable_xml_context}" == "x"], [ -+ AS_IF([test "x${enable_xml_context}" = "xyes" \ -+ -o "x${enable_xml_context}" = "x"], [ - enable_xml_context=1024 - ]) - AC_DEFINE_UNQUOTED([XML_CONTEXT_BYTES], [${enable_xml_context}], |