diff options
Diffstat (limited to 'package/cgilib/patches/patch-ltmain_sh')
| -rw-r--r-- | package/cgilib/patches/patch-ltmain_sh | 140 |
1 files changed, 0 insertions, 140 deletions
diff --git a/package/cgilib/patches/patch-ltmain_sh b/package/cgilib/patches/patch-ltmain_sh deleted file mode 100644 index f2e06e38b..000000000 --- a/package/cgilib/patches/patch-ltmain_sh +++ /dev/null @@ -1,140 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cgilib-0.7.orig/ltmain.sh 2008-04-29 23:33:55.000000000 +0200 -+++ cgilib-0.7/ltmain.sh 2011-01-14 20:26:24.000000000 +0100 -@@ -43,8 +43,8 @@ EXIT_FAILURE=1 - - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION="1.5.26 Debian 1.5.26-4" --TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" -+VERSION=1.5.26 -+TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)" - - # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -250,6 +250,20 @@ func_win32_libid () - # arg is usually of the form 'gcc ...' - func_infer_tag () - { -+ # FreeBSD-specific: where we install compilers with non-standard names -+ tag_compilers_CC="*cc cc* *gcc gcc*" -+ tag_compilers_CXX="*c++ c++* *g++ g++*" -+ base_compiler=`set -- "$@"; echo $1` -+ -+ # If $tagname isn't set, then try to infer if the default "CC" tag applies -+ if test -z "$tagname"; then -+ for zp in $tag_compilers_CC; do -+ case $base_compiler in -+ $zp) tagname="CC"; break;; -+ esac -+ done -+ fi -+ - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -@@ -290,7 +304,22 @@ func_infer_tag () - break - ;; - esac -- fi -+ -+ # FreeBSD-specific: try compilers based on inferred tag -+ if test -z "$tagname"; then -+ eval "tag_compilers=\$tag_compilers_${z}" -+ if test -n "$tag_compilers"; then -+ for zp in $tag_compilers; do -+ case $base_compiler in -+ $zp) tagname=$z; break;; -+ esac -+ done -+ if test -n "$tagname"; then -+ break -+ fi -+ fi -+ fi -+ fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command -@@ -1651,6 +1680,7 @@ EOF - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" -+ deplibs="$deplibs $arg" - continue - ;; - -@@ -1676,7 +1706,7 @@ EOF - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. -@@ -2135,10 +2165,7 @@ EOF - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; -- link) -- libs="$deplibs %DEPLIBS%" -- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -- ;; -+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi - if test "$pass" = dlopen; then -@@ -2157,6 +2184,29 @@ EOF - else - compiler_flags="$compiler_flags $deplib" - fi -+ -+ case $linkmode in -+ lib) -+ deplibs="$deplib $deplibs" -+ test "$pass" = conv && continue -+ newdependency_libs="$deplib $newdependency_libs" -+ ;; -+ prog) -+ if test "$pass" = conv; then -+ deplibs="$deplib $deplibs" -+ continue -+ fi -+ if test "$pass" = scan; then -+ deplibs="$deplib $deplibs" -+ else -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ fi -+ ;; -+ *) -+ ;; -+ esac # linkmode -+ - continue - ;; - -l*) -@@ -3272,11 +3322,6 @@ EOF - revision="$number_minor" - lt_irix_increment=no - ;; -- *) -- $echo "$modename: unknown library version type \`$version_type'" 1>&2 -- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit $EXIT_FAILURE -- ;; - esac - ;; - no) -@@ -4788,6 +4833,9 @@ static const void *lt_preloaded_setup() - ;; - esac - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit $EXIT_FAILURE |