Mercurial > vanilla

annotate lib/libffi/set-libdir.patch @ 286:0ab6d3c4d4fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
x11/xprop: initial import, closes #1379
author David Demelier <markand@malikania.fr>
date Fri, 22 Mar 2019 20:45:00 +0100
parents 38560371e332
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
154
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 --- configure.ac.orig 2019-03-12 14:38:16.655783859 +0100
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ configure.ac 2019-03-12 14:38:26.358552083 +0100
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -592,24 +592,7 @@
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
4
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 # These variables are only ever used when we cross-build to X86_WIN32.
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 # And we only support this with GCC, so...
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 -if test "x$GCC" = "xyes"; then
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 - if test -n "$with_cross_host" &&
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 - test x"$with_cross_host" != x"no"; then
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 - toolexecdir="${exec_prefix}"/'$(target_alias)'
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 - toolexeclibdir="${toolexecdir}"/lib
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 - else
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 - toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 - toolexeclibdir="${libdir}"
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 - fi
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 - multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 - case $multi_os_directory in
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 - .) ;; # Avoid trailing /.
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 - ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 - esac
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 - AC_SUBST(toolexecdir)
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 -else
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 - toolexeclibdir="${libdir}"
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 -fi
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 +toolexeclibdir="${libdir}"
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 AC_SUBST(toolexeclibdir)
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
27
38560371e332 lib/libffi: forgot patch
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])