libtool: merge some patches from yocto for cross builds.
This commit is contained in:
Juan RP
parent
0fffda3b45
commit
3617ce499e
6 changed files with 862 additions and 47 deletions
|
|
@ -1,28 +1,11 @@
|
|||
# Template file for 'libltdl-devel'.
|
||||
#
|
||||
depends="libltdl"
|
||||
depends="libltdl>=${version}"
|
||||
short_desc="GNU Libtool Dynamic Module Loader development files"
|
||||
long_desc="
|
||||
The libltdl package contains the GNU Libtool Dynamic Module Loader, a
|
||||
library that provides a consistent, portable interface which simplifies the
|
||||
process of using dynamic modules.
|
||||
|
||||
These runtime libraries are needed by programs that link directly to the
|
||||
system-installed ltdl libraries; they are not needed by software built using the
|
||||
rest of the GNU Autotools (including GNU Autoconf and GNU Automake).
|
||||
|
||||
This package contains development files required by libltdl."
|
||||
|
||||
|
||||
do_install()
|
||||
{
|
||||
mkdir -p ${DESTDIR}/usr/lib
|
||||
mkdir -p ${DESTDIR}/usr/share/aclocal
|
||||
mkdir -p ${DESTDIR}/usr/share/libtool
|
||||
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
|
||||
mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
|
||||
mv ${SRCPKGDESTDIR}/usr/share/aclocal/ltdl.m4 \
|
||||
${DESTDIR}/usr/share/aclocal
|
||||
mv ${SRCPKGDESTDIR}/usr/share/libtool/libltdl \
|
||||
${DESTDIR}/usr/share/libtool
|
||||
do_install() {
|
||||
vmove usr/include usr
|
||||
vmove "usr/lib/*.a" usr/lib
|
||||
vmove usr/share/aclocal/ltdl.m4 usr/share/aclocal
|
||||
vmove usr/share/libtool/libltdl usr/share/libtool
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,8 @@
|
|||
# Template file for 'libltdl'.
|
||||
#
|
||||
short_desc="Runtime libraries for GNU Libtool Dynamic Module Loader"
|
||||
long_desc="
|
||||
This package contains the GNU Libtool Dynamic Module Loader, a
|
||||
library that provides a consistent, portable interface which simplifies the
|
||||
process of using dynamic modules.
|
||||
|
||||
These runtime libraries are needed by programs that link directly to the
|
||||
system-installed ltdl libraries; they are not needed by software built using the
|
||||
rest of the GNU Autotools (including GNU Autoconf and GNU Automake)."
|
||||
|
||||
replaces="libtool-ltdl>=0"
|
||||
|
||||
do_install()
|
||||
{
|
||||
mkdir -p ${DESTDIR}/usr/lib
|
||||
mv ${SRCPKGDESTDIR}/usr/lib/libltdl.so* ${DESTDIR}/usr/lib
|
||||
do_install() {
|
||||
vmove "usr/lib/libltdl.so*" usr/lib
|
||||
}
|
||||
|
|
|
|||
30
srcpkgs/libtool/patches/0001-tralingslash.patch
Normal file
30
srcpkgs/libtool/patches/0001-tralingslash.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
A command like /bin/sh ../../i586-poky-linux-libtool --mode=install /usr/bin/install -c gck-roots-store-standalone.la '/media/data1/builds/poky1/tmp/work/core2-poky-linux/gnome-keyring-2.26.1-r1/image/usr/lib/gnome-keyring/standalone/' fails (e.g. gnome-keyring or pulseaudio)
|
||||
|
||||
This is because libdir has a trailing slash which breaks the comparision.
|
||||
|
||||
RP 2/1/10
|
||||
|
||||
Merged a patch received from Gary Thomas <gary@mlbassoc.com>
|
||||
|
||||
Date: 2010/07/12
|
||||
Nitin A Kamble <nitin.a.kamble@intel.com>
|
||||
|
||||
--- libltdl/config/ltmain.m4sh
|
||||
+++ libltdl/config/ltmain.m4sh
|
||||
@@ -1634,8 +1634,15 @@ func_mode_install ()
|
||||
dir="$dir$objdir"
|
||||
|
||||
if test -n "$relink_command"; then
|
||||
+ # Strip any trailing slash from the destination.
|
||||
+ func_stripname '' '/' "$libdir"
|
||||
+ destlibdir=$func_stripname_result
|
||||
+
|
||||
+ func_stripname '' '/' "$destdir"
|
||||
+ s_destdir=$func_stripname_result
|
||||
+
|
||||
# Determine the prefix the user has applied to our future dir.
|
||||
- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
|
||||
+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
|
||||
|
||||
# Don't allow the user to place us outside of our expected
|
||||
# location b/c this prevents finding dependent libraries that
|
||||
796
srcpkgs/libtool/patches/0002-rename-with-sysroot.patch
Normal file
796
srcpkgs/libtool/patches/0002-rename-with-sysroot.patch
Normal file
|
|
@ -0,0 +1,796 @@
|
|||
This patch renames the --with-sysroot option to --with-libtool-sysroot
|
||||
to avoid namespace conflict with binutils, gcc and other toolchain
|
||||
components.
|
||||
|
||||
I also reported the problem to libtool here
|
||||
|
||||
http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
|
||||
|
||||
-Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
--- configure
|
||||
+++ configure
|
||||
@@ -786,7 +786,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
with_gnu_ld
|
||||
'
|
||||
@@ -1451,7 +1451,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -6798,29 +6798,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- libltdl/configure
|
||||
+++ libltdl/configure
|
||||
@@ -739,7 +739,7 @@ with_pic
|
||||
enable_fast_install
|
||||
enable_dependency_tracking
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
enable_ltdl_install
|
||||
'
|
||||
@@ -1388,7 +1388,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -6004,29 +6004,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- libltdl/m4/libtool.m4
|
||||
+++ libltdl/m4/libtool.m4
|
||||
@@ -1180,27 +1180,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr
|
||||
# ----------------
|
||||
AC_DEFUN([_LT_WITH_SYSROOT],
|
||||
[AC_MSG_CHECKING([for sysroot])
|
||||
-AC_ARG_WITH([sysroot],
|
||||
-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
|
||||
+AC_ARG_WITH([libtool-sysroot],
|
||||
+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).],
|
||||
-[], [with_sysroot=no])
|
||||
+[], [with_libtool_sysroot=no])
|
||||
|
||||
dnl lt_sysroot will always be passed unquoted. We quote it here
|
||||
dnl in case the user passed a directory name.
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- AC_MSG_RESULT([${with_sysroot}])
|
||||
+ AC_MSG_RESULT([${with_libtool_sysroot}])
|
||||
AC_MSG_ERROR([The sysroot must be an absolute path.])
|
||||
;;
|
||||
esac
|
||||
--- tests/cdemo/configure
|
||||
+++ tests/cdemo/configure
|
||||
@@ -726,7 +726,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1373,7 +1373,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -5884,29 +5884,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- tests/demo/configure
|
||||
+++ tests/demo/configure
|
||||
@@ -730,7 +730,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1377,7 +1377,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -5882,29 +5882,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- tests/depdemo/configure
|
||||
+++ tests/depdemo/configure
|
||||
@@ -728,7 +728,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1375,7 +1375,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -5879,29 +5879,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- tests/f77demo/configure
|
||||
+++ tests/f77demo/configure
|
||||
@@ -730,7 +730,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1382,7 +1382,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -6864,29 +6864,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- tests/fcdemo/configure
|
||||
+++ tests/fcdemo/configure
|
||||
@@ -731,7 +731,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1383,7 +1383,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -6963,29 +6963,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- tests/mdemo/configure
|
||||
+++ tests/mdemo/configure
|
||||
@@ -734,7 +734,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1381,7 +1381,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -5911,29 +5911,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- tests/mdemo2/configure
|
||||
+++ tests/mdemo2/configure
|
||||
@@ -726,7 +726,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1373,7 +1373,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -5884,29 +5884,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- tests/pdemo/configure
|
||||
+++ tests/pdemo/configure
|
||||
@@ -729,7 +729,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1376,7 +1376,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -5887,29 +5887,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- tests/sysroot.at
|
||||
+++ tests/sysroot.at
|
||||
@@ -64,7 +64,7 @@ while read file; do
|
||||
done])
|
||||
|
||||
LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
|
||||
-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
|
||||
+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
|
||||
|
||||
#???
|
||||
if test "$shlibpath_var" = PATH; then
|
||||
@@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign])
|
||||
AC_PROG_CC
|
||||
AC_CONFIG_SRCDIR([lib2.c])
|
||||
LT_INIT
|
||||
-sysroot=$with_sysroot
|
||||
+sysroot=$with_libtool_sysroot
|
||||
AC_SUBST([sysroot])
|
||||
AC_OUTPUT(Makefile)
|
||||
]])
|
||||
@@ -155,7 +155,7 @@ AM_INIT_AUTOMAKE([foreign])
|
||||
AC_PROG_CC
|
||||
AC_CONFIG_SRCDIR([prog.c])
|
||||
LT_INIT
|
||||
-sysroot=$with_sysroot
|
||||
+sysroot=$with_libtool_sysroot
|
||||
AC_SUBST([sysroot])
|
||||
AC_OUTPUT(Makefile)
|
||||
]])
|
||||
--- tests/tagdemo/configure
|
||||
+++ tests/tagdemo/configure
|
||||
@@ -736,7 +736,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
with_gnu_ld
|
||||
'
|
||||
@@ -1392,7 +1392,7 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
- --with-sysroot=DIR Search for dependent libraries within DIR
|
||||
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
|
||||
(or the compiler's sysroot if not specified).
|
||||
|
||||
Some influential environment variables:
|
||||
@@ -6907,29 +6907,29 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
|
||||
$as_echo_n "checking for sysroot... " >&6; }
|
||||
|
||||
-# Check whether --with-sysroot was given.
|
||||
-if test "${with_sysroot+set}" = set; then :
|
||||
- withval=$with_sysroot;
|
||||
+# Check whether --with-libtool-sysroot was given.
|
||||
+if test "${with_libtool_sysroot+set}" = set; then :
|
||||
+ withval=$with_libtool_sysroot;
|
||||
else
|
||||
- with_sysroot=no
|
||||
+ with_libtool_sysroot=no
|
||||
fi
|
||||
|
||||
|
||||
lt_sysroot=
|
||||
-case ${with_sysroot} in #(
|
||||
+case ${with_libtool_sysroot} in #(
|
||||
yes)
|
||||
if test "$GCC" = yes; then
|
||||
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
||||
fi
|
||||
;; #(
|
||||
/*)
|
||||
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
|
||||
+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
||||
;; #(
|
||||
no|'')
|
||||
;; #(
|
||||
*)
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
|
||||
-$as_echo "${with_sysroot}" >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
|
||||
+$as_echo "${with_libtool_sysroot}" >&6; }
|
||||
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
|
||||
;;
|
||||
esac
|
||||
--- tests/testsuite
|
||||
+++ tests/testsuite
|
||||
@@ -25277,7 +25277,7 @@ $at_traceon; }
|
||||
|
||||
|
||||
LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
|
||||
-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
|
||||
+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
|
||||
|
||||
#???
|
||||
if test "$shlibpath_var" = PATH; then
|
||||
@@ -25475,7 +25475,7 @@ AM_INIT_AUTOMAKE([foreign])
|
||||
AC_PROG_CC
|
||||
AC_CONFIG_SRCDIR([lib2.c])
|
||||
LT_INIT
|
||||
-sysroot=$with_sysroot
|
||||
+sysroot=$with_libtool_sysroot
|
||||
AC_SUBST([sysroot])
|
||||
AC_OUTPUT(Makefile)
|
||||
_ATEOF
|
||||
@@ -25652,7 +25652,7 @@ AM_INIT_AUTOMAKE([foreign])
|
||||
AC_PROG_CC
|
||||
AC_CONFIG_SRCDIR([prog.c])
|
||||
LT_INIT
|
||||
-sysroot=$with_sysroot
|
||||
+sysroot=$with_libtool_sysroot
|
||||
AC_SUBST([sysroot])
|
||||
AC_OUTPUT(Makefile)
|
||||
_ATEOF
|
||||
@@ -25993,7 +25993,7 @@ $at_traceon; }
|
||||
|
||||
|
||||
LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
|
||||
-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
|
||||
+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
|
||||
|
||||
#???
|
||||
if test "$shlibpath_var" = PATH; then
|
||||
@@ -26191,7 +26191,7 @@ AM_INIT_AUTOMAKE([foreign])
|
||||
AC_PROG_CC
|
||||
AC_CONFIG_SRCDIR([lib2.c])
|
||||
LT_INIT
|
||||
-sysroot=$with_sysroot
|
||||
+sysroot=$with_libtool_sysroot
|
||||
AC_SUBST([sysroot])
|
||||
AC_OUTPUT(Makefile)
|
||||
_ATEOF
|
||||
@@ -26368,7 +26368,7 @@ AM_INIT_AUTOMAKE([foreign])
|
||||
AC_PROG_CC
|
||||
AC_CONFIG_SRCDIR([prog.c])
|
||||
LT_INIT
|
||||
-sysroot=$with_sysroot
|
||||
+sysroot=$with_libtool_sysroot
|
||||
AC_SUBST([sysroot])
|
||||
AC_OUTPUT(Makefile)
|
||||
_ATEOF
|
||||
@@ -26709,7 +26709,7 @@ $at_traceon; }
|
||||
|
||||
|
||||
LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
|
||||
-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
|
||||
+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
|
||||
|
||||
#???
|
||||
if test "$shlibpath_var" = PATH; then
|
||||
@@ -26907,7 +26907,7 @@ AM_INIT_AUTOMAKE([foreign])
|
||||
AC_PROG_CC
|
||||
AC_CONFIG_SRCDIR([lib2.c])
|
||||
LT_INIT
|
||||
-sysroot=$with_sysroot
|
||||
+sysroot=$with_libtool_sysroot
|
||||
AC_SUBST([sysroot])
|
||||
AC_OUTPUT(Makefile)
|
||||
_ATEOF
|
||||
@@ -27084,7 +27084,7 @@ AM_INIT_AUTOMAKE([foreign])
|
||||
AC_PROG_CC
|
||||
AC_CONFIG_SRCDIR([prog.c])
|
||||
LT_INIT
|
||||
-sysroot=$with_sysroot
|
||||
+sysroot=$with_libtool_sysroot
|
||||
AC_SUBST([sysroot])
|
||||
AC_OUTPUT(Makefile)
|
||||
_ATEOF
|
||||
18
srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch
Normal file
18
srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
When using sysroot we should append it to libdir, which is helpful in
|
||||
cross builds as the system is staged in the sysroot. For normal builds,
|
||||
i.e. when lt_sysroot is not set, it will still behave the same and add
|
||||
-L/usr/lib to the relink command.
|
||||
|
||||
-Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
--- libltdl/config/ltmain.m4sh
|
||||
+++ libltdl/config/ltmain.m4sh
|
||||
@@ -6122,7 +6122,7 @@ func_mode_link ()
|
||||
fi
|
||||
else
|
||||
# We cannot seem to hardcode it, guess we'll fake it.
|
||||
- add_dir="-L$libdir"
|
||||
+ add_dir="-L$lt_sysroot$libdir"
|
||||
# Try looking first in the location we're being installed to.
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
case $libdir in
|
||||
|
|
@ -1,20 +1,19 @@
|
|||
# Template build file for 'libtool'
|
||||
pkgname=libtool
|
||||
version=2.4.2
|
||||
revision=4
|
||||
revision=5
|
||||
noarch=yes
|
||||
depends="tar sed"
|
||||
makedepends="perl automake help2man"
|
||||
subpackages="libltdl libltdl-devel"
|
||||
build_style=gnu-configure
|
||||
homepage="http://www.gnu.org/software/libtool"
|
||||
distfiles="http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version.tar.xz"
|
||||
build_style=gnu-configure
|
||||
depends="tar sed"
|
||||
short_desc="Generic library support"
|
||||
short_desc="Generic library support script"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="GPL-2"
|
||||
checksum=1d7b6862c1ed162e327f083a6f78f40eae29218f0db8c38393d61dab764c4407
|
||||
long_desc="
|
||||
This is GNU libtool, a generic library support script. Libtool hides
|
||||
the complexity of generating special library types (such as shared
|
||||
libraries) befind a consistent interface."
|
||||
|
||||
build_requires=21
|
||||
noarch=yes
|
||||
subpackages="libltdl libltdl-devel"
|
||||
pre_configure() {
|
||||
./bootstrap
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue