diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-sysadm/attachments/20110205/19174269/attachment.html | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110205/19174269/attachment.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110205/19174269/attachment.html | 281 |
1 files changed, 281 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110205/19174269/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110205/19174269/attachment.html new file mode 100644 index 000000000..6ea89d6ce --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110205/19174269/attachment.html @@ -0,0 +1,281 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[425] merge under/overlinking scripts from rpm-manbo-setup</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>425</dd> +<dt>Author</dt> <dd>tmb</dd> +<dt>Date</dt> <dd>2011-02-05 20:36:23 +0100 (Sat, 05 Feb 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>merge under/overlinking scripts from rpm-manbo-setup</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#rpmrpmsetuptrunkMakefileam">rpm/rpm-setup/trunk/Makefile.am</a></li> +<li><a href="#rpmrpmsetuptrunkNEWS">rpm/rpm-setup/trunk/NEWS</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#rpmrpmsetuptrunkdropldnoundefinedforsharedlibmodulesinlibtool">rpm/rpm-setup/trunk/drop-ld-no-undefined-for-shared-lib-modules-in-libtool</a></li> +<li><a href="#rpmrpmsetuptrunkfixdlsearchpathinlibtoolformultilib">rpm/rpm-setup/trunk/fix-dlsearch-path-in-libtool-for-multilib</a></li> +<li><a href="#rpmrpmsetuptrunkfixlibtoolfrommovingoptionsafterlibs">rpm/rpm-setup/trunk/fix-libtool-from-moving-options-after-libs</a></li> +<li><a href="#rpmrpmsetuptrunkfixlibtoolltmainfromoverlinking">rpm/rpm-setup/trunk/fix-libtool-ltmain-from-overlinking</a></li> +<li><a href="#rpmrpmsetuptrunkforceasneededforsharedlibinlibtool">rpm/rpm-setup/trunk/force-as-needed-for-shared-lib-in-libtool</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="rpmrpmsetuptrunkMakefileam">Modified: rpm/rpm-setup/trunk/Makefile.am</a> +=================================================================== +--- rpm/rpm-setup/trunk/Makefile.am 2011-02-05 18:59:31 UTC (rev 424) ++++ rpm/rpm-setup/trunk/Makefile.am 2011-02-05 19:36:23 UTC (rev 425) +@@ -22,15 +22,20 @@ + + pkg_scripts = \ + brp-compress \ +- brp-strip \ +- brp-strip-comment-note \ ++ brp-strip \ ++ brp-strip-comment-note \ + brp-strip-static-archive \ +- filter.sh \ +- find-lang.pl \ +- find-debuginfo.sh \ +- gem_helper.rb \ +- git-repository--after-tarball \ +- git-repository--apply-patch \ ++ drop-ld-no-undefined-for-shared-lib-modules-in-libtool \ ++ filter.sh \ ++ find-lang.pl \ ++ find-debuginfo.sh \ ++ fix-dlsearch-path-in-libtool-for-multilib \ ++ fix-libtool-from-moving-options-after-libs \ ++ fix-libtool-ltmain-from-overlinking \ ++ force-as-needed-for-shared-lib-in-libtool \ ++ gem_helper.rb \ ++ git-repository--after-tarball \ ++ git-repository--apply-patch \ + http.req \ + magic.prov \ + magic.req \ + +<a id="rpmrpmsetuptrunkNEWS">Modified: rpm/rpm-setup/trunk/NEWS</a> +=================================================================== +--- rpm/rpm-setup/trunk/NEWS 2011-02-05 18:59:31 UTC (rev 424) ++++ rpm/rpm-setup/trunk/NEWS 2011-02-05 19:36:23 UTC (rev 425) +@@ -2,6 +2,7 @@ + - merge rpmrc from rpm-manbo-setup + - merge manbo.macros from rpm-manbo-setup + - merge manbo-build.macros from rpm-manbo-setup ++- merge under/overlinking scripts from rpm-manbo-setup + + Version 1.115 - 9 January 2011, by Oliver Blin + - initial Mageia import + +<a id="rpmrpmsetuptrunkdropldnoundefinedforsharedlibmodulesinlibtool">Added: rpm/rpm-setup/trunk/drop-ld-no-undefined-for-shared-lib-modules-in-libtool</a> +=================================================================== +--- rpm/rpm-setup/trunk/drop-ld-no-undefined-for-shared-lib-modules-in-libtool (rev 0) ++++ rpm/rpm-setup/trunk/drop-ld-no-undefined-for-shared-lib-modules-in-libtool 2011-02-05 19:36:23 UTC (rev 425) +@@ -0,0 +1,47 @@ ++#!/usr/bin/perl ++ ++# applies patch: ++# --- ltmain.sh.pix 2008-05-23 13:51:52.000000000 +0200 ++# +++ ltmain.sh 2008-05-23 13:52:16.000000000 +0200 ++# @@ -1948,6 +1948,11 @@ ++# fi ++# done # argument parsing loop ++# ++# + if test "$module" = yes ; then ++# + # [Manbo-labs] dropping ld option "--no-undefined" which is wrong for plugins ++# + linker_flags=`echo "X $linker_flags" | $Xsed -e 's/ --no-undefined//'` ++# + compiler_flags=`echo "X $compiler_flags" | $Xsed -e 's/ -Wl,--no-undefined//'` ++# + fi ++# + ++# if test -n "$prev"; then ++# $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 ++# $echo "$help" 1>&2 ++ ++# a similar patch has been applied in ltmain.sh in libtool package ++# but this works even if autoreconf is not called ++ ++foreach my $ltmain ('ltmain.sh', glob("*/ltmain.sh")) { ++ open(my $F, '<', $ltmain) or next; ++ ++ print "Modifying $ltmain underlinking for plugins (cf http://wiki.mandriva.com/en/Underlinking)\n"; ++ ++ open(my $G, '>', "$ltmain.new") or exit; ++ while (<$F>) { ++ print $G $_; ++ ++ if ($_ eq " done # argument parsing loop\n") { ++ $modified = 1; ++ print $G <<'EOF'; ++ ++ if test "$module" = yes ; then ++ linker_flags=`echo "X $linker_flags" | $Xsed -e 's/ --no-undefined//'` ++ compiler_flags=`echo "X $compiler_flags" | $Xsed -e 's/ -Wl,--no-undefined//'` ++ fi ++EOF ++ } ++ } ++ ++ rename $ltmain, "$ltmain.drop" ++ and rename "$ltmain.new", $ltmain or print STDERR "modifying $ltmain failed: $!\n"; ++} ++ + + +Property changes on: rpm/rpm-setup/trunk/drop-ld-no-undefined-for-shared-lib-modules-in-libtool +___________________________________________________________________ +<a id="svnexecutable">Added: svn:executable</a> + + * + +<a id="rpmrpmsetuptrunkfixdlsearchpathinlibtoolformultilib">Added: rpm/rpm-setup/trunk/fix-dlsearch-path-in-libtool-for-multilib</a> +=================================================================== +--- rpm/rpm-setup/trunk/fix-dlsearch-path-in-libtool-for-multilib (rev 0) ++++ rpm/rpm-setup/trunk/fix-dlsearch-path-in-libtool-for-multilib 2011-02-05 19:36:23 UTC (rev 425) +@@ -0,0 +1,23 @@ ++#!/bin/sh ++ ++# If configure was generated with libtool that did not have support for ++# run-time library search path (sys_lib_dlsearch_path_spec) autodetection, ++# we replace the hardcoded search path with "/usr/%{_lib} /%{_lib}". ++ ++# Our libtool has autodetection in form of lib64.patch, though it does not ++# handle cases (e.g. Debian) where /usr/lib is valid for multilib archs. ++ ++# Without the correct search path defined, binaries would wrongly get rpath even ++# when the libraries are located in a standard directory. ++ ++CONFIGURE_TOP="${1:-.}" ++LIB="${2:-lib}" ++if [ -e $CONFIGURE_TOP/configure ] && grep -q 'sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"' $CONFIGURE_TOP/configure; then ++ echo "Forcing run-time library search path definition in configure to prevent libtool from adding rpath for standard directories (configure was generated with libtool without support for autodetection)" ++ ++ sed -i \ ++ -e "s,^[ \t]*# Append ld.so.conf contents to the search path, sys_lib_dlsearch_path_spec=\"/usr/${LIB} /${LIB}\"\n\0," \ ++ -e 's,sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra",sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra",' \ ++ $CONFIGURE_TOP/configure ++fi ++ + +<a id="rpmrpmsetuptrunkfixlibtoolfrommovingoptionsafterlibs">Added: rpm/rpm-setup/trunk/fix-libtool-from-moving-options-after-libs</a> +=================================================================== +--- rpm/rpm-setup/trunk/fix-libtool-from-moving-options-after-libs (rev 0) ++++ rpm/rpm-setup/trunk/fix-libtool-from-moving-options-after-libs 2011-02-05 19:36:23 UTC (rev 425) +@@ -0,0 +1,15 @@ ++#!/bin/sh ++ ++CONFIGURE_TOP="${1:-.}" ++if [ -e $CONFIGURE_TOP/configure ] && grep -q -F '$deplibs $compiler_flags' $CONFIGURE_TOP/configure; then ++ echo "Fixing libtool inside configure to pass -Wl,xxx options before libraries" ++ ++ # a similar patch has been applied in libtool in libtool package (#47273) ++ # but this works even if autoreconf is not called ++ ++ sed -i \ ++ -e 's,$deplibs $compiler_flags,$compiler_flags $deplibs,' \ ++ -e 's,$deplibs $postdep_objects $compiler_flags,$compiler_flags $deplibs $postdep_objects,' \ ++ $CONFIGURE_TOP/configure ++fi ++ + + +Property changes on: rpm/rpm-setup/trunk/fix-libtool-from-moving-options-after-libs +___________________________________________________________________ +Added: svn:executable + + * + +<a id="rpmrpmsetuptrunkfixlibtoolltmainfromoverlinking">Added: rpm/rpm-setup/trunk/fix-libtool-ltmain-from-overlinking</a> +=================================================================== +--- rpm/rpm-setup/trunk/fix-libtool-ltmain-from-overlinking (rev 0) ++++ rpm/rpm-setup/trunk/fix-libtool-ltmain-from-overlinking 2011-02-05 19:36:23 UTC (rev 425) +@@ -0,0 +1,14 @@ ++#!/bin/sh ++ ++if [ -e ltmain.sh ]; then ++ echo "Fixing libtool's ltmain.sh to prevent overlinking (cf http://wiki.mandriva.com/en/Overlinking)" ++ ++ # a similar patch has been applied in ltmain.sh in libtool package ++ # but this works even if autoreconf is not called ++ ++ mv ltmain.sh ltmain.sh.orig ++ echo link_all_deplibs=no > ltmain.sh ++ cat ltmain.sh.orig >> ltmain.sh ++ ++ sed -i -s 's/link) libs="$deplibs %DEPLIBS% $dependency_libs"/link) libs="$deplibs %DEPLIBS%"/' ltmain.sh ++fi + +<a id="rpmrpmsetuptrunkforceasneededforsharedlibinlibtool">Added: rpm/rpm-setup/trunk/force-as-needed-for-shared-lib-in-libtool</a> +=================================================================== +--- rpm/rpm-setup/trunk/force-as-needed-for-shared-lib-in-libtool (rev 0) ++++ rpm/rpm-setup/trunk/force-as-needed-for-shared-lib-in-libtool 2011-02-05 19:36:23 UTC (rev 425) +@@ -0,0 +1,14 @@ ++#!/bin/sh ++ ++# replaces ++# tmp_sharedflag='-shared' ;; ++# with ++# tmp_sharedflag='-shared -Wl,--as-needed' ;; ++# ++# since passing -Wl,--as-needed is not enough because libtool moves it ++# after *.o and libs ++ ++if [ -e configure ]; then ++ echo "Forcing -Wl,--as-needed in configure/libtool to workaround libtool bug (cf http://lists.gnu.org/archive/html/libtool-patches/2004-06/msg00002.html)" ++ sed -i "s/^\([ \t]*tmp_sharedflag\)='-shared'/\1='-shared -Wl,--as-needed'/" configure ++fi + + +Property changes on: rpm/rpm-setup/trunk/force-as-needed-for-shared-lib-in-libtool +___________________________________________________________________ +Added: svn:executable + + * + +</pre></div> + +</body> +</html>
\ No newline at end of file |