1From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001
2From: Graham Leggett <minfrin@apache.org>
3Date: Tue, 31 Dec 2019 21:26:02 +0000
4Subject: [PATCH] Revert: Add the ability to cross compile APR.
5
6git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872147 13f79535-47bb-0310-9956-ffa450edef68
7
8[Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c]
9Signed-off-by: Peter Seiderer <ps.report@gmx.net>
10---
11 CHANGES       |  2 --
12 apr-config.in | 22 ----------------------
13 2 files changed, 24 deletions(-)
14
15diff --git a/CHANGES b/CHANGES
16index 71b2f0e..e751c90 100644
17--- a/CHANGES
18+++ b/CHANGES
19@@ -56,8 +56,6 @@ Changes for APR 1.7.1
20   *) Don't try to use PROC_PTHREAD by default when cross compiling.
21      [Yann Ylavic]
22
23-  *) Add the ability to cross compile APR. [Graham Leggett]
24-
25   *) While cross-compiling, the tools/gen_test_char could not
26      be executed at build time, use AX_PROG_CC_FOR_BUILD to
27      build native tools/gen_test_char
28diff --git a/apr-config.in b/apr-config.in
29index 4873fc0..84b4073 100644
30--- a/apr-config.in
31+++ b/apr-config.in
32@@ -48,14 +48,6 @@ APR_LIBNAME="@APR_LIBNAME@"
33 # NOTE: the following line is modified during 'make install': alter with care!
34 location=@APR_CONFIG_LOCATION@
35
36-# absolute path, but not installed path - we're cross compiling
37-case "$0" in
38-  "${bindir}/"*) ;;
39-  "/"*)         location=crosscompile;
40-                APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;;
41-  *)            ;;
42-esac
43-
44 show_usage()
45 {
46     cat << EOF
47@@ -101,8 +93,6 @@ fi
48
49 if test "$location" = "installed"; then
50     LA_FILE="$libdir/lib${APR_LIBNAME}.la"
51-elif test "$location" = "crosscompile"; then
52-    LA_FILE="$APR_TARGET_DIR/$libdir/lib${APR_LIBNAME}.la"
53 else
54     LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la"
55 fi
56@@ -132,8 +122,6 @@ while test $# -gt 0; do
57     --includedir)
58     if test "$location" = "installed"; then
59         flags="$includedir"
60-    elif test "$location" = "crosscompile"; then
61-        flags="$APR_TARGET_DIR/$includedir"
62     elif test "$location" = "source"; then
63         flags="$APR_SOURCE_DIR/include"
64     else
65@@ -166,8 +154,6 @@ while test $# -gt 0; do
66     --includes)
67     if test "$location" = "installed"; then
68         flags="$flags -I$includedir $EXTRA_INCLUDES"
69-    elif test "$location" = "crosscompile"; then
70-        flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES"
71     elif test "$location" = "source"; then
72         flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
73     else
74@@ -182,8 +168,6 @@ while test $# -gt 0; do
75     --installbuilddir)
76     if test "$location" = "installed"; then
77         echo "${installbuilddir}"
78-    elif test "$location" = "crosscompile"; then
79-        echo "$APR_TARGET_DIR/${installbuilddir}"
80     elif test "$location" = "source"; then
81         echo "$APR_SOURCE_DIR/build"
82     else
83@@ -200,8 +184,6 @@ while test $# -gt 0; do
84     if test "$location" = "installed"; then
85         ### avoid using -L if libdir is a "standard" location like /usr/lib
86         flags="$flags -L$libdir -l${APR_LIBNAME}"
87-    elif test "$location" = "crosscompile"; then
88-        flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}"
89     else
90         ### this surely can't work since the library is in .libs?
91         flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
92@@ -219,8 +201,6 @@ while test $# -gt 0; do
93         # Since the user is specifying they are linking with libtool, we
94         # *know* that -R will be recognized by libtool.
95         flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
96-    elif test "$location" = "crosscompile"; then
97-        flags="$flags  -L${APR_TARGET_DIR}/$libdir  -l${APR_LIBNAME}"
98     else
99         flags="$flags $LA_FILE"
100     fi
101@@ -245,8 +225,6 @@ while test $# -gt 0; do
102     --apr-libtool)
103     if test "$location" = "installed"; then
104         echo "${installbuilddir}/libtool"
105-    elif test "$location" = "crosscompile"; then
106-        echo "$APR_TARGET_DIR/${installbuilddir}/build"
107     else
108         echo "$APR_BUILD_DIR/libtool"
109     fi
110--
1112.39.2
112
113