Gidin pis şeyler, gidin sonra gelirsiniz lazım olursanız...
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# standard python modules
|
||||
from os import getenv
|
||||
from os import getenv, environ
|
||||
|
||||
# pisi modules
|
||||
import pisi.config
|
||||
@@ -50,9 +50,9 @@ class Dirs:
|
||||
class Flags:
|
||||
"""General flags used in actions API"""
|
||||
values = pisi.config.config.values
|
||||
host = values.build.host
|
||||
cflags = values.build.cflags
|
||||
cxxflags = values.build.cflags
|
||||
environ["HOST"] = host = values.build.host
|
||||
environ["CFLAGS"] = cflags = values.build.cflags
|
||||
environ["CXXLAGS"] = cxxflags = values.build.cflags
|
||||
|
||||
class ActionGlobals(pisi.config.Config):
|
||||
const = pisi.constants.const
|
||||
|
||||
Vendored
-1499
File diff suppressed because it is too large
Load Diff
Vendored
-1577
File diff suppressed because it is too large
Load Diff
@@ -1,74 +0,0 @@
|
||||
Note that if you update this patch, please update this one as well:
|
||||
|
||||
eclass/ELT-patches/portage/1.4.1
|
||||
|
||||
The file name can stay 1.4.1, as it will still apply to all versions. Only
|
||||
when a new version of libtool comes out that it do not apply to, then the
|
||||
name should be bumped, but the patch content should stay fairly the same.
|
||||
|
||||
--- ltmain.sh Wed Apr 3 01:19:37 2002
|
||||
+++ ltmain.sh Sun May 26 19:50:52 2002
|
||||
@@ -3940,9 +3940,50 @@
|
||||
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
- newdependency_libs="$newdependency_libs $libdir/$name"
|
||||
+ # We do not want portage's install root ($D) present. Check only for
|
||||
+ # this if the .la is being installed.
|
||||
+ if test "$installed" = yes && test "$D"; then
|
||||
+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
||||
+ else
|
||||
+ mynewdependency_lib="$libdir/$name"
|
||||
+ fi
|
||||
+ # Do not add duplicates
|
||||
+ if test "$mynewdependency_lib"; then
|
||||
+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
||||
+ if test -z "$my_little_ninja_foo_1"; then
|
||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
||||
+ fi
|
||||
+ fi
|
||||
+ ;;
|
||||
+ *)
|
||||
+ if test "$installed" = yes; then
|
||||
+ # Rather use S=WORKDIR if our version of portage supports it.
|
||||
+ # This is because some ebuild (gcc) do not use $S as buildroot.
|
||||
+ if test "$PWORKDIR"; then
|
||||
+ S="$PWORKDIR"
|
||||
+ fi
|
||||
+ # We do not want portage's build root ($S) present.
|
||||
+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
|
||||
+ if test -n "$my_little_ninja_foo_2" && test "$S"; then
|
||||
+ mynewdependency_lib=""
|
||||
+ # We do not want portage's install root ($D) present.
|
||||
+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
|
||||
+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then
|
||||
+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
||||
+ else
|
||||
+ mynewdependency_lib="$deplib"
|
||||
+ fi
|
||||
+ else
|
||||
+ mynewdependency_lib="$deplib"
|
||||
+ fi
|
||||
+ # Do not add duplicates
|
||||
+ if test "$mynewdependency_lib"; then
|
||||
+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
|
||||
+ if test -z "$my_little_ninja_foo_4"; then
|
||||
+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
|
||||
+ fi
|
||||
+ fi
|
||||
;;
|
||||
- *) newdependency_libs="$newdependency_libs $deplib" ;;
|
||||
esac
|
||||
done
|
||||
dependency_libs="$newdependency_libs"
|
||||
@@ -3975,6 +4005,10 @@
|
||||
case $host,$output,$installed,$module,$dlname in
|
||||
*cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
|
||||
esac
|
||||
+ # Do not add duplicates
|
||||
+ if test "$installed" = yes && test "$D"; then
|
||||
+ install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
|
||||
+ fi
|
||||
$echo > $output "\
|
||||
# $outputname - a libtool library file
|
||||
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
|
||||
@@ -1,14 +0,0 @@
|
||||
--- ltmain.sh 2003-02-13 14:54:24.000000000 +0100
|
||||
+++ ltmain.sh 2003-02-13 15:24:49.000000000 +0100
|
||||
@@ -48,6 +48,11 @@ EOF
|
||||
exit 0
|
||||
fi
|
||||
|
||||
+# define variables for historic ltconfig's generated by Libtool 1.3
|
||||
+test -z "$SED" && SED=sed
|
||||
+test -z "$EGREP" && EGREP=egrep
|
||||
+test -z "$LTCC" && LTCC=${CC-gcc}
|
||||
+
|
||||
# The name of this program.
|
||||
progname=`$echo "$0" | ${SED} 's%^.*/%%'`
|
||||
modename="$progname"
|
||||
Reference in New Issue
Block a user