Changeset 14711


Ignorieren:
Zeitstempel:
03.06.2018 20:52:35 (vor 2 Wochen)
Autor:
er13
Nachricht:

libtool: cleanup patches (no functional changes)

Ort:
trunk/make/libs/libtool/patches
Dateien:
5 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/libs/libtool/patches/001-force_dlopen_deplibs.libtool.patch

    r7380 r14711  
    1 --- ltdl.m4 2008-02-01 17:33:31.000000000 +0100 
    2 +++ ltdl.m4 2010-03-20 17:05:00.000000000 +0100 
     1--- ltdl.m4 
     2+++ ltdl.m4 
    33@@ -186,10 +186,8 @@ 
    44     ;; 
     
    1212  
    1313  
    14 --- libltdl/acinclude.m4    2008-02-01 17:38:42.000000000 +0100 
    15 +++ libltdl/acinclude.m4    2010-03-20 17:05:00.000000000 +0100 
     14--- libltdl/acinclude.m4 
     15+++ libltdl/acinclude.m4 
    1616@@ -6842,10 +6842,8 @@ 
    1717     ;; 
     
    2525  
    2626  
    27 --- libltdl/configure   2008-02-01 17:38:49.000000000 +0100 
    28 +++ libltdl/configure   2010-03-20 17:05:05.000000000 +0100 
     27--- libltdl/configure 
     28+++ libltdl/configure 
    2929@@ -21484,13 +21484,11 @@ 
    3030 fi 
  • trunk/make/libs/libtool/patches/100-libdir_path.libtool.patch

    r7380 r14711  
    1 --- Makefile.in.orig    2008-02-01 16:38:41.000000000 +0000 
    2 +++ Makefile.in 2009-10-26 11:52:52.000000000 +0000 
    3 @@ -797,6 +797,7 @@ 
    4     -rm -f ltmain.shT 
    5     date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \ 
    6     sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \ 
    7 +       -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \ 
    8         -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT 
    9     mv -f ltmain.shT $@ || \ 
    10     (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT) 
    11 --- ltmain.in.orig  2008-02-01 16:12:00.000000000 +0000 
    12 +++ ltmain.in   2009-10-26 11:52:52.000000000 +0000 
     1--- ltmain.in 
     2+++ ltmain.in 
    133@@ -5695,7 +5695,7 @@ 
    144          $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 
     
    2919        dlprefiles="$newdlprefiles" 
    3020      else 
    31 --- Makefile.am.orig    2008-02-01 16:11:59.000000000 +0000 
    32 +++ Makefile.am 2009-10-26 11:52:52.000000000 +0000 
     21--- Makefile.am 
     22+++ Makefile.am 
    3323@@ -67,6 +67,7 @@ 
    3424    -rm -f ltmain.shT 
     
    3929    mv -f ltmain.shT $@ || \ 
    4030    (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT) 
     31--- Makefile.in 
     32+++ Makefile.in 
     33@@ -797,6 +797,7 @@ 
     34    -rm -f ltmain.shT 
     35    date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \ 
     36    sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \ 
     37+       -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \ 
     38        -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT 
     39    mv -f ltmain.shT $@ || \ 
     40    (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT) 
  • trunk/make/libs/libtool/patches/110-no_rpath.libtool.patch

    r7380 r14711  
    1 --- acinclude.m4    2008-02-01 17:38:35.000000000 +0100 
    2 +++ acinclude.m4    2010-03-20 17:51:42.000000000 +0100 
     1--- acinclude.m4 
     2+++ acinclude.m4 
    33@@ -4655,7 +4655,7 @@ 
    44 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    3030 # Whether we need a single -rpath flag with a separated argument. 
    3131 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    32 --- cdemo/acinclude.m4  2008-02-01 17:38:49.000000000 +0100 
    33 +++ cdemo/acinclude.m4  2010-03-20 18:07:31.000000000 +0100 
     32--- cdemo/acinclude.m4 
     33+++ cdemo/acinclude.m4 
    3434@@ -4655,7 +4655,7 @@ 
    3535 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    6161 # Whether we need a single -rpath flag with a separated argument. 
    6262 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    63 --- cdemo/configure 2008-02-01 17:38:55.000000000 +0100 
    64 +++ cdemo/configure 2010-03-20 18:07:31.000000000 +0100 
     63--- cdemo/configure 
     64+++ cdemo/configure 
    6565@@ -10765,7 +10765,7 @@ 
    6666 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    208208 # Whether we need a single -rpath flag with a separated argument. 
    209209 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC 
    210 --- configure   2008-02-01 17:38:42.000000000 +0100 
    211 +++ configure   2010-03-20 17:51:42.000000000 +0100 
     210--- configure 
     211+++ configure 
    212212@@ -11388,7 +11388,7 @@ 
    213213 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    355355 # Whether we need a single -rpath flag with a separated argument. 
    356356 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC 
    357 --- demo/acinclude.m4   2008-02-01 17:38:55.000000000 +0100 
    358 +++ demo/acinclude.m4   2010-03-20 18:07:30.000000000 +0100 
     357--- demo/acinclude.m4 
     358+++ demo/acinclude.m4 
    359359@@ -4655,7 +4655,7 @@ 
    360360 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    386386 # Whether we need a single -rpath flag with a separated argument. 
    387387 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    388 --- demo/configure  2008-02-01 17:39:01.000000000 +0100 
    389 +++ demo/configure  2010-03-20 18:07:30.000000000 +0100 
     388--- demo/configure 
     389+++ demo/configure 
    390390@@ -11171,7 +11171,7 @@ 
    391391 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    533533 # Whether we need a single -rpath flag with a separated argument. 
    534534 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC 
    535 --- depdemo/acinclude.m4    2008-02-01 17:39:01.000000000 +0100 
    536 +++ depdemo/acinclude.m4    2010-03-20 18:07:32.000000000 +0100 
     535--- depdemo/acinclude.m4 
     536+++ depdemo/acinclude.m4 
    537537@@ -4655,7 +4655,7 @@ 
    538538 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    564564 # Whether we need a single -rpath flag with a separated argument. 
    565565 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    566 --- depdemo/configure   2008-02-01 17:39:07.000000000 +0100 
    567 +++ depdemo/configure   2010-03-20 18:07:32.000000000 +0100 
     566--- depdemo/configure 
     567+++ depdemo/configure 
    568568@@ -11060,7 +11060,7 @@ 
    569569 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    711711 # Whether we need a single -rpath flag with a separated argument. 
    712712 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC 
    713 --- f77demo/acinclude.m4    2008-02-01 17:39:31.000000000 +0100 
    714 +++ f77demo/acinclude.m4    2010-03-20 18:07:31.000000000 +0100 
     713--- f77demo/acinclude.m4 
     714+++ f77demo/acinclude.m4 
    715715@@ -4655,7 +4655,7 @@ 
    716716 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    742742 # Whether we need a single -rpath flag with a separated argument. 
    743743 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    744 --- f77demo/configure   2008-02-01 17:39:38.000000000 +0100 
    745 +++ f77demo/configure   2010-03-20 18:07:31.000000000 +0100 
     744--- f77demo/configure 
     745+++ f77demo/configure 
    746746@@ -11741,7 +11741,7 @@ 
    747747 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    889889 # Whether we need a single -rpath flag with a separated argument. 
    890890 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC 
    891 --- libltdl/acinclude.m4    2008-02-01 17:38:42.000000000 +0100 
    892 +++ libltdl/acinclude.m4    2010-03-20 17:51:42.000000000 +0100 
     891--- libltdl/acinclude.m4 
     892+++ libltdl/acinclude.m4 
    893893@@ -4655,7 +4655,7 @@ 
    894894 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    920920 # Whether we need a single -rpath flag with a separated argument. 
    921921 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    922 --- libltdl/configure   2008-02-01 17:38:49.000000000 +0100 
    923 +++ libltdl/configure   2010-03-20 17:51:42.000000000 +0100 
     922--- libltdl/configure 
     923+++ libltdl/configure 
    924924@@ -11255,7 +11255,7 @@ 
    925925 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    10671067 # Whether we need a single -rpath flag with a separated argument. 
    10681068 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC 
    1069 --- libtool.m4  2008-02-01 17:26:47.000000000 +0100 
    1070 +++ libtool.m4  2010-03-20 17:51:42.000000000 +0100 
     1069--- libtool.m4 
     1070+++ libtool.m4 
    10711071@@ -4655,7 +4655,7 @@ 
    10721072 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    10981098 # Whether we need a single -rpath flag with a separated argument. 
    10991099 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    1100 --- mdemo/acinclude.m4  2008-02-01 17:39:07.000000000 +0100 
    1101 +++ mdemo/acinclude.m4  2010-03-20 17:53:01.000000000 +0100 
     1100--- mdemo/acinclude.m4 
     1101+++ mdemo/acinclude.m4 
    11021102@@ -4655,7 +4655,7 @@ 
    11031103 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    11291129 # Whether we need a single -rpath flag with a separated argument. 
    11301130 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    1131 --- mdemo/configure 2008-02-01 17:39:13.000000000 +0100 
    1132 +++ mdemo/configure 2010-03-20 17:55:39.000000000 +0100 
     1131--- mdemo/configure 
     1132+++ mdemo/configure 
    11331133@@ -11186,7 +11186,7 @@ 
    11341134 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    12761276 # Whether we need a single -rpath flag with a separated argument. 
    12771277 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC 
    1278 --- mdemo2/acinclude.m4 2008-02-01 17:39:13.000000000 +0100 
    1279 +++ mdemo2/acinclude.m4 2010-03-20 18:07:32.000000000 +0100 
     1278--- mdemo2/acinclude.m4 
     1279+++ mdemo2/acinclude.m4 
    12801280@@ -4655,7 +4655,7 @@ 
    12811281 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    13071307 # Whether we need a single -rpath flag with a separated argument. 
    13081308 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    1309 --- mdemo2/configure    2008-02-01 17:39:19.000000000 +0100 
    1310 +++ mdemo2/configure    2010-03-20 18:07:32.000000000 +0100 
     1309--- mdemo2/configure 
     1310+++ mdemo2/configure 
    13111311@@ -10873,7 +10873,7 @@ 
    13121312 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    14541454 # Whether we need a single -rpath flag with a separated argument. 
    14551455 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC 
    1456 --- pdemo/acinclude.m4  2008-02-01 17:39:19.000000000 +0100 
    1457 +++ pdemo/acinclude.m4  2010-03-20 18:07:30.000000000 +0100 
     1456--- pdemo/acinclude.m4 
     1457+++ pdemo/acinclude.m4 
    14581458@@ -4655,7 +4655,7 @@ 
    14591459 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    14851485 # Whether we need a single -rpath flag with a separated argument. 
    14861486 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    1487 --- pdemo/configure 2008-02-01 17:39:25.000000000 +0100 
    1488 +++ pdemo/configure 2010-03-20 18:07:31.000000000 +0100 
     1487--- pdemo/configure 
     1488+++ pdemo/configure 
    14891489@@ -10876,7 +10876,7 @@ 
    14901490 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    16321632 # Whether we need a single -rpath flag with a separated argument. 
    16331633 hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC 
    1634 --- tagdemo/acinclude.m4    2008-02-01 17:39:25.000000000 +0100 
    1635 +++ tagdemo/acinclude.m4    2010-03-20 18:07:31.000000000 +0100 
     1634--- tagdemo/acinclude.m4 
     1635+++ tagdemo/acinclude.m4 
    16361636@@ -4655,7 +4655,7 @@ 
    16371637 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
     
    16631663 # Whether we need a single -rpath flag with a separated argument. 
    16641664 hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
    1665 --- tagdemo/configure   2008-02-01 17:39:31.000000000 +0100 
    1666 +++ tagdemo/configure   2010-03-20 18:07:32.000000000 +0100 
     1665--- tagdemo/configure 
     1666+++ tagdemo/configure 
    16671667@@ -11299,7 +11299,7 @@ 
    16681668 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address 
  • trunk/make/libs/libtool/patches/120-libdir_search.libtool.patch

    r7380 r14711  
    1 --- ltmain.in.orig  2009-10-26 11:52:52.000000000 +0000 
    2 +++ ltmain.in   2009-10-26 11:52:53.000000000 +0000 
     1--- ltmain.in 
     2+++ ltmain.in 
    33@@ -2462,8 +2462,14 @@ 
    44        absdir="$abs_ladir" 
     
    77-       dir="$libdir" 
    88-       absdir="$libdir" 
    9 +            # Adding 'libdir' from the .la file to our library search paths 
    10 +            # breaks crosscompilation horribly.  We cheat here and don't add 
    11 +            # it, instead adding the path where we found the .la.  -CL 
     9+       # Adding 'libdir' from the .la file to our library search paths 
     10+       # breaks crosscompilation horribly.  We cheat here and don't add 
     11+       # it, instead adding the path where we found the .la.  -CL 
    1212+       dir="$abs_ladir" 
    1313+       absdir="$abs_ladir" 
  • trunk/make/libs/libtool/patches/130-no_recheck.libtool.patch

    r7380 r14711  
    1 --- libltdl/Makefile.am 2008-02-01 17:28:07.000000000 +0100 
    2 +++ libltdl/Makefile.am 2010-03-20 17:10:00.000000000 +0100 
     1--- libltdl/Makefile.am 
     2+++ libltdl/Makefile.am 
    33@@ -29,4 +29,4 @@ 
    44  
     
    77-   $(SHELL) ./config.status --recheck 
    88+#  $(SHELL) ./config.status --recheck 
    9 --- libltdl/Makefile.in 2008-02-01 17:38:48.000000000 +0100 
    10 +++ libltdl/Makefile.in 2010-03-20 17:10:00.000000000 +0100 
     9--- libltdl/Makefile.in 
     10+++ libltdl/Makefile.in 
    1111@@ -257,7 +257,7 @@ 
    1212    esac; 
     
    2727 # Otherwise a system limit (for SysV at least) may be exceeded. 
    2828 .NOEXPORT: 
    29 --- Makefile.am 2008-02-01 17:11:59.000000000 +0100 
    30 +++ Makefile.am 2010-03-20 17:10:00.000000000 +0100 
     29--- Makefile.am 
     30+++ Makefile.am 
    3131@@ -56,7 +56,7 @@ 
    3232    libltdl/config-h.in 
     
    3838  
    3939 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status 
    40 --- Makefile.in 2008-02-01 17:38:41.000000000 +0100 
    41 +++ Makefile.in 2010-03-20 17:10:00.000000000 +0100 
     40--- Makefile.in 
     41+++ Makefile.in 
    4242@@ -303,7 +303,7 @@ 
    4343    esac; 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.