Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77755 by David Michael Leo Brown Jr. for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Jason Flatt" <jflatt AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77755 by David Michael Leo Brown Jr. for review
  • Date: Thu, 13 Apr 2006 20:40:01 +0100 (BST)

Change 77755 by david_brown@dmlb2000-dmlb2004 on 2006/04/13 20:37:13

had these open for a while thought I'd commit
FUNCTIONS added a clean spare libs function
sometimes with installwatch with translation symlinks are brought
into
the stage root along with the file they point to, this is expected
behaviour so we have to remove some of the libs that aren't part of
the spell.
POST_INSTALL's: added calls to this function instead of manually
removing those files

Affected files ...

... //sgl/grimoires/stage_root/gnu/FUNCTIONS#3 edit
... //sgl/grimoires/stage_root/gnu/g++/POST_INSTALL#1 add
... //sgl/grimoires/stage_root/gnu/gcc/POST_INSTALL#1 add
... //sgl/grimoires/stage_root/gnu/gcc34/POST_INSTALL#2 edit
... //sgl/grimoires/stage_root/gnu/gcc40/POST_INSTALL#3 edit
... //sgl/grimoires/stage_root/gnu/gcc41/POST_INSTALL#3 edit

Differences ...

==== //sgl/grimoires/stage_root/gnu/FUNCTIONS#3 (xtext) ====

@@ -51,3 +51,18 @@
ln -vfs $file ${INSTALL_ROOT}/usr/lib/${file%.[0-9].[0-9].[0-9]}
ln -vfs $file ${INSTALL_ROOT}/usr/lib/${file%.[0-9].[0-9]}
}
+
+function gcc_clean_spare_libs()
+{
+ local version=$1
+ shift
+ while [ $# -gt 0 ] ;
+ do
+ local lib=$1
+ shift
+ if ! echo $lib | grep -q "${version}$" ;
+ then
+ rm -vf $lib
+ fi
+ done
+}

==== //sgl/grimoires/stage_root/gnu/gcc34/POST_INSTALL#2 (xtext) ====

@@ -5,7 +5,5 @@
do
mv -v usr/lib/$file usr/lib/$file.6.0.3
done &&
-for file in libstdc++.so libstdc++.so.6 libstdc++.so.6.0.6
-do
- rm -vf usr/lib/$file
-done
+gcc_clean_symlinks usr/lib/lib*
+gcc_clean_spare_libs 6.0.3 usr/lib/lib*

==== //sgl/grimoires/stage_root/gnu/gcc40/POST_INSTALL#3 (xtext) ====

@@ -12,3 +12,5 @@
mv -v usr/lib/$file usr/lib/$file.0.0.0
done
gcc_clean_symlinks usr/lib/lib*
+gcc_clean_spare_libs 6.0.7 usr/lib/libstdc++.*
+gcc_clean_spare_libs 0.0.0 usr/lib/libmudflap* usr/lib/libsupc++*

==== //sgl/grimoires/stage_root/gnu/gcc41/POST_INSTALL#3 (xtext) ====

@@ -3,4 +3,8 @@
rm -vf usr/lib/libsupc++*
rm -vf usr/lib/libstdc++*
rm -vf usr/lib/libmudflap*
+for file in libssp.a libssp.la libssp_nonshared.a libssp_nonshared.la
+do
+ mv usr/lib/$file usr/lib/$file.0.0.0
+done
gcc_clean_symlinks usr/lib/lib*



  • [SM-Commit] PERFORCE change 77755 by David Michael Leo Brown Jr. for review, Perforce Review Daemon, 04/13/2006

Archive powered by MHonArc 2.6.24.

Top of Page