| 1 |
ssuominen 11/11/18 21:23:27 |
| 2 |
|
| 3 |
Added: xfce4-dev-tools-4.9.0-update_libtool_syntax.patch |
| 4 |
Log: |
| 5 |
Upstream patch to support LT_PREREQ and LT_INIT libtool syntax. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/xfce4-dev-tools/files/xfce4-dev-tools-4.9.0-update_libtool_syntax.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xfce4-dev-tools/files/xfce4-dev-tools-4.9.0-update_libtool_syntax.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/xfce4-dev-tools/files/xfce4-dev-tools-4.9.0-update_libtool_syntax.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xfce4-dev-tools-4.9.0-update_libtool_syntax.patch |
| 16 |
=================================================================== |
| 17 |
From 56cde58238898e5659c39f5e713ee0362ba772d9 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Nick Schermer <nick@××××.org> |
| 19 |
Date: Thu, 03 Nov 2011 18:27:32 +0000 |
| 20 |
Subject: Add support for LT_PREREQ (bug #6920). |
| 21 |
|
| 22 |
Support LT_PREREQ as the new alternative of AC_PROG_LIBTOOL. If |
| 23 |
the latter is used, show a message with information how to switch |
| 24 |
to LT_PREREQ. |
| 25 |
--- |
| 26 |
diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in.in |
| 27 |
index a7dbd3f..0ba203f 100644 |
| 28 |
--- a/scripts/xdt-autogen.in.in |
| 29 |
+++ b/scripts/xdt-autogen.in.in |
| 30 |
@@ -415,7 +415,25 @@ if test -z "${XDT_PROG_LIBTOOLIZE}"; then |
| 31 |
fi |
| 32 |
fi |
| 33 |
for configure_ac_file in $CONFIGURE_AC_FILES; do |
| 34 |
+ runlibtoolize=0 |
| 35 |
if grep -q "^AC_PROG_LIBTOOL" "${configure_ac_file}"; then |
| 36 |
+ cat >&2 <<EOF |
| 37 |
+xdt-autogen: It is recommended to use LT_PREREQ([2.2.6]) and |
| 38 |
+ LT_INIT([disable-static]) in your configure.ac |
| 39 |
+ file and remove AC_PROG_LIBTOOL and AC_DISABLE_STATIC. |
| 40 |
+ |
| 41 |
+ See http://bugzilla.xfce.org/show_bug.cgi?id=6920 for |
| 42 |
+ more information. |
| 43 |
+ |
| 44 |
+EOF |
| 45 |
+ runlibtoolize=1 |
| 46 |
+ fi; |
| 47 |
+ |
| 48 |
+ if grep -q "^LT_PREREQ" "${configure_ac_file}"; then |
| 49 |
+ runlibtoolize=1 |
| 50 |
+ fi; |
| 51 |
+ |
| 52 |
+ if test $runlibtoolize -eq 1; then |
| 53 |
(${XDT_PROG_LIBTOOLIZE} --version) </dev/null >/dev/null 2>&0 || { |
| 54 |
cat >&2 <<EOF |
| 55 |
xdt-autogen: You must have "libtool" installed on your system. |
| 56 |
@@ -608,7 +626,7 @@ XGETTEXT_ARGS = @XGETTEXT_ARGS@ |
| 57 |
fi |
| 58 |
fi |
| 59 |
|
| 60 |
- if grep -q "^AC_PROG_LIBTOOL" "${configure_ac_file}"; then |
| 61 |
+ if grep -q -e "^AC_PROG_LIBTOOL" -e "^LT_PREREQ" "${configure_ac_file}"; then |
| 62 |
(echo "Running ${XDT_PROG_LIBTOOLIZE} --force --copy..." && |
| 63 |
cd "${source_dir}" && |
| 64 |
${XDT_PROG_LIBTOOLIZE} --force --copy) || exit 1 |
| 65 |
-- |
| 66 |
cgit |
Archives