Mercurial > gub
changeset 4809:5bafc4086a02
Junk literal use of /usr and /cross.
Except where /usr matches (binary/source) input package, or where /usr
must hard match target system: eg, Cygwin or Darwin.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Fri, 14 Nov 2008 14:29:24 +0100 |
| parents | c2c2daf521e7 |
| children | 1d51b056d6f6 |
| files | gub/build.py gub/specs/cross/binutils.py gub/specs/cross/gcc.py gub/specs/debian/cross/gcc-34.py gub/specs/debian/libc6-dev.py gub/specs/fontconfig.py gub/specs/freetype.py gub/specs/guile-config.py gub/specs/guile.py gub/specs/python.py gub/specs/python25.py |
| diffstat | 11 files changed, 28 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/build.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/build.py Fri Nov 14 14:29:24 2008 +0100 @@ -423,7 +423,7 @@ self.system (''' rm -rf %(install_root)s cd %(builddir)s && %(install_command)s -rm -f %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/share/info/dir %(install_root)s%(packaging_suffix_dir)s/%(prefix_dir)s/cross/info/dir %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/info/dir +rm -f %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/share/info/dir %(install_root)s%(packaging_suffix_dir)s/%(prefix_dir)s/%(cross_dir)s/info/dir %(install_root)s%(packaging_suffix_dir)s%(prefix_dir)s/info/dir ''') self.install_license () self.libtool_installed_la_fixups ()
--- a/gub/specs/cross/binutils.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/specs/cross/binutils.py Fri Nov 14 14:29:24 2008 +0100 @@ -21,7 +21,7 @@ def FIXME_breaks_on_some_linuxes_install (self): # please document why this should be removed? cross.AutoBuild.install (self) - self.system ('rm %(install_prefix)s/cross/lib/libiberty.a') + self.system ('rm %(install_prefix)s%(cross_dir)s/lib/libiberty.a') class Binutils__linux__ppc (Binutils): source = Binutils.source
--- a/gub/specs/cross/gcc.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/specs/cross/gcc.py Fri Nov 14 14:29:24 2008 +0100 @@ -73,8 +73,8 @@ self.map_locate (move_target_lib, libdir, 'lib*%(suf)s' % locals ()) def install (self): cross.AutoBuild.install (self) - self.move_target_libs (self.expand ('%(install_root)s/%(cross_prefix)s/%(target_architecture)s')) - self.move_target_libs (self.expand ('%(install_root)s/%(cross_prefix)s/lib')) + self.move_target_libs (self.expand ('%(install_prefix)s%(cross_dir)s/%(target_architecture)s')) + self.move_target_libs (self.expand ('%(install_prefix)s%(cross_dir)s/lib')) class Gcc__from__source (Gcc): def get_build_dependencies (self): @@ -99,7 +99,7 @@ def XXX_WE_NOW_MOVE_ALL_A_LIBS_install (self): Gcc.install (self) self.system (''' -mv %(install_prefix)s/cross/lib/gcc/%(target_architecture)s/%(version)s/libgcc_eh.a %(install_prefix)s/lib +mv %(install_prefix)s%(cross_dir)s/lib/gcc/%(target_architecture)s/%(version)s/libgcc_eh.a %(install_prefix)s/lib ''') Gcc__linux = Gcc__from__source
--- a/gub/specs/debian/cross/gcc-34.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/specs/debian/cross/gcc-34.py Fri Nov 14 14:29:24 2008 +0100 @@ -24,11 +24,11 @@ self.system (''' rm -f %(install_prefix)s/lib/libgcc_s.so rm -f %(install_prefix)s/lib/libgcc_s.so.1 -rm -f %(install_prefix)s/cross/lib/libiberty.a -rm -rf %(install_prefix)s/cross/mipsel-linux/lib/libiberty.a -rm -rf %(install_prefix)s/cross/info -rm -rf %(install_prefix)s/cross/man -rm -rf %(install_prefix)s/cross/share/locale +rm -f %(install_prefix)s%(cross_dir)s/lib/libiberty.a +rm -rf %(install_prefix)s%(cross_dir)s/mipsel-linux/lib/libiberty.a +rm -rf %(install_prefix)s%(cross_dir)s/info +rm -rf %(install_prefix)s%(cross_dir)s/man +rm -rf %(install_prefix)s%(cross_dir)s/share/locale ''') if 'c++' in self.languages (): self.system (''' @@ -36,8 +36,8 @@ rm -rf %(install_prefix)s/lib/libstdc++.la rm -rf %(install_prefix)s/lib/libstdc++.so.6 rm -rf %(install_prefix)s/lib/libstdc++.so -rm -rf %(install_prefix)s/cross/mipsel-linux/lib/libsupc++.a -rm -rf %(install_prefix)s/cross/mipsel-linux/lib/libstdc++.a -rm -rf %(install_prefix)s/cross/mipsel-linux/lib/debug/libstdc++.a +rm -rf %(install_prefix)s%(cross_dir)s/mipsel-linux/lib/libsupc++.a +rm -rf %(install_prefix)s%(cross_dir)s/mipsel-linux/lib/libstdc++.a +rm -rf %(install_prefix)s%(cross_dir)s/mipsel-linux/lib/debug/libstdc++.a ''')
--- a/gub/specs/debian/libc6-dev.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/specs/debian/libc6-dev.py Fri Nov 14 14:29:24 2008 +0100 @@ -17,4 +17,4 @@ '%(srcdir)s/usr/include/%(i)s', env=locals ()) - self.system ('rm -rf %(srcdir)s/usr/include/asm/ %(srcdir)s/usr/include/linux ') + self.system ('rm -rf %(srcdir)s/usr/include/asm/ %(srcdir)s/usr/include/linux')
--- a/gub/specs/fontconfig.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/specs/fontconfig.py Fri Nov 14 14:29:24 2008 +0100 @@ -38,7 +38,7 @@ # yet. # return misc.read_pipe (cmd).strip () - return '-I%(system_prefix)s/usr/include/freetype2' + return '-I%(system_prefix)s/include/freetype2' @context.subst_method def freetype_libs (self): @@ -69,7 +69,7 @@ return (target.AutoBuild.configure_command (self) + misc.join_lines (''' --with-arch=%(target_architecture)s ---with-freetype-config="%(system_prefix)s/cross/bin/freetype-config +--with-freetype-config="%(system_prefix)s%(cross_dir)s/bin/freetype-config --prefix=%(system_prefix)s "'''))
--- a/gub/specs/freetype.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/specs/freetype.py Fri Nov 14 14:29:24 2008 +0100 @@ -49,9 +49,9 @@ # we want /usr/bin/freetype-config must survive. # While cross building, we create an <toolprefix>-freetype-config # and prefer that. - self.system ('mkdir -p %(install_prefix)s/cross/bin/') - self.system ('mv %(install_prefix)s/bin/freetype-config %(install_prefix)s/cross/bin/freetype-config') - self.munge_ft_config ('%(install_prefix)s/cross/bin/freetype-config') + self.system ('mkdir -p %(install_prefix)s%(cross_dir)s/bin/') + self.system ('mv %(install_prefix)s/bin/freetype-config %(install_prefix)s%(cross_dir)s/bin/freetype-config') + self.munge_ft_config ('%(install_prefix)s%(cross_dir)s/bin/freetype-config') class Freetype__mingw (Freetype): def xxconfigure (self):
--- a/gub/specs/guile-config.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/specs/guile-config.py Fri Nov 14 14:29:24 2008 +0100 @@ -16,7 +16,7 @@ test "$1" = "link" && echo "-L$prefix/lib -lguile -lgmp" exit 0 ''', - '%(install_prefix)s/cross/bin/guile-config', + '%(install_prefix)s%(cross_dir)s/bin/guile-config', permissions=0755) class Guile_config__debian (build.SdkBuild): @@ -35,5 +35,5 @@ test "$1" = "link" && echo "-L$prefix/lib -lguile -ldl -lcrypt -lm" exit 0 ''', - '%(install_prefix)s/cross/bin/guile-config', + '%(install_prefix)s%(cross_dir)s/bin/guile-config', permissions=0755)
--- a/gub/specs/guile.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/specs/guile.py Fri Nov 14 14:29:24 2008 +0100 @@ -109,8 +109,8 @@ test "$1" = "link" && echo "-L$prefix/lib -lguile -lgmp" exit 0 ''', - '%(install_prefix)s/cross/bin/%(target_architecture)s-guile-config') - self.chmod ('%(install_prefix)s/cross/bin/%(target_architecture)s-guile-config', 0755) + '%(install_prefix)s%(cross_dir)s/bin/%(target_architecture)s-guile-config') + self.chmod ('%(install_prefix)s%(cross_dir)s/bin/%(target_architecture)s-guile-config', 0755) class Guile__mingw (Guile): source = Guile.source
--- a/gub/specs/python.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/specs/python.py Fri Nov 14 14:29:24 2008 +0100 @@ -67,9 +67,9 @@ cfg = re.sub ('@PYTHON_VERSION@', self.expand ('%(version)s'), cfg) cfg = re.sub ('@PREFIX@', self.expand ('%(system_prefix)s/'), cfg) cfg = re.sub ('@PYTHON_FOR_BUILD@', sys.executable, cfg) - self.dump (cfg, '%(install_prefix)s/cross/bin/python-config', + self.dump (cfg, '%(install_prefix)s%(cross_dir)s/bin/python-config', expand_string=False) - self.system ('chmod +x %(install_prefix)s/cross/bin/python-config') + self.system ('chmod +x %(install_prefix)s%(cross_dir)s/bin/python-config') ### Ugh. @context.subst_method @@ -129,7 +129,7 @@ def install (self): Python.install (self) self.file_sub ([('extra = ""', 'extra = "-lpython2.4 -lpthread"')], - '%(install_prefix)s/cross/bin/python-config') + '%(install_prefix)s%(cross_dir)s/bin/python-config') def rename_so (logger, fname): dll = re.sub ('\.so*', '.dll', fname)
--- a/gub/specs/python25.py Fri Nov 14 14:25:56 2008 +0100 +++ b/gub/specs/python25.py Fri Nov 14 14:29:24 2008 +0100 @@ -60,9 +60,9 @@ cfg = re.sub ('@PYTHON_VERSION@', self.expand ('%(version)s'), cfg) cfg = re.sub ('@PREFIX@', self.expand ('%(system_prefix)s/'), cfg) cfg = re.sub ('@PYTHON_FOR_BUILD@', sys.executable, cfg) - self.dump (cfg, '%(install_prefix)s/cross/bin/python-config', + self.dump (cfg, '%(install_prefix)s%(cross_dir)s/bin/python-config', expand_string=False) - self.system ('chmod +x %(install_prefix)s/cross/bin/python-config') + self.system ('chmod +x %(install_prefix)s%(cross_dir)s/bin/python-config') ### Ugh.