teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a patch for libtool-2.2.6a that allows building/installing 

latest glib successfully.

--HG--
extra : convert_revision : 9e2e6a342ce833c45902e0bb2e6173a8633351f2
This commit is contained in:
Juan RP 2008-09-28 07:07:01 +02:00
parent 6ff0c41308
commit 75a8b0aa46
2 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
templates/libtool-2.2.6a-fix-ltmain.sh.diff Normal file
View File

@ -0,0 +1,84 @@
--- libltdl/config/ltmain.m4sh.orig 2008-09-07 17:54:53.000000000 +0000
+++ libltdl/config/ltmain.m4sh 2008-09-28 04:35:05.000000000 +0000
@@ -1576,8 +1576,8 @@
# At present, this check doesn't affect windows .dll's that
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
- test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ #test "$inst_prefix_dir" = "$destdir" && \
+ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -5275,7 +5275,7 @@
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ add_dir="$add_dir -L$inst_prefix_dir"
;;
esac
fi
@@ -5336,8 +5336,8 @@
add="-l$name"
elif test "$hardcode_automatic" = yes; then
if test -n "$inst_prefix_dir" &&
- test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ test -f "$inst_prefix_dir" ; then
+ add="$inst_prefix_dir"
else
add="$libdir/$linklib"
fi
@@ -5348,7 +5348,7 @@
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ add_dir="$add_dir -L$inst_prefix_dir"
;;
esac
fi
--- libltdl/config/ltmain.sh.orig 2008-09-07 17:56:33.000000000 +0000
+++ libltdl/config/ltmain.sh 2008-09-28 04:34:38.000000000 +0000
@@ -2018,8 +2018,8 @@
# At present, this check doesn't affect windows .dll's that
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
- test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ #test "$inst_prefix_dir" = "$destdir" && \
+ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -5717,7 +5717,7 @@
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ add_dir="$add_dir -L$inst_prefix_dir"
;;
esac
fi
@@ -5778,8 +5778,8 @@
add="-l$name"
elif test "$hardcode_automatic" = yes; then
if test -n "$inst_prefix_dir" &&
- test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ test -f "$inst_prefix_dir" ; then
+ add="$inst_prefix_dir"
else
add="$libdir/$linklib"
fi
@@ -5790,7 +5790,7 @@
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ add_dir="$add_dir -L$inst_prefix_dir"
;;
esac
fi

2
templates/libtool-2.2.6a.tmpl
View File

@ -11,6 +11,8 @@ pkgname=${_mypkgname}a
# Suffix extraction, only supported: zip and tar/tar+(gz|bzip2).
extract_sufx=".tar.gz"
patch_files="libtool-2.2.6a-fix-ltmain.sh.diff"
# Use this if extracted directory from source distribution file
# is not the same than pkgname.
wrksrc=${_mypkgname}