Mega patch to improve how build dependencies are handled and
how packages are found. First: I removed all these *-deps.db files and only a single file is used now "build-depends.db"; it's smaller and will be easier to handle in the future... when "run-depends.db" is added :-) Second: there's no need to specify version of package anymore; before you had to do: $ pkgfs.sh install git-1.6.0.2 now you only do: $ pkgfs.sh install git This will read the variables located at PKGFS_TEMPLATESDIR/git.tmpl and will the install the version that is there. --HG-- extra : convert_revision : 9e3e5d70965a69c76f59e322b7c7b674d627af52
This commit is contained in:
parent
4cd4543c72
commit
e9def74b60
175 changed files with 473 additions and 308 deletions
84
templates/libtool-fix-ltmain.sh.diff
Normal file
84
templates/libtool-fix-ltmain.sh.diff
Normal 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
|
Loading…
Add table
Add a link
Reference in a new issue