diff options
Diffstat (limited to 'fix_install.patch')
| -rw-r--r-- | fix_install.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/fix_install.patch b/fix_install.patch new file mode 100644 index 000000000000..75f391ce0ed4 --- /dev/null +++ b/fix_install.patch @@ -0,0 +1,70 @@ +diff --git a/install.py b/install.py +index c1f7f06..9e6f0c6 100755 +--- a/install.py ++++ b/install.py +@@ -43,24 +43,24 @@ def getDestRoot (file, dir): + else: + f += file + return f +- ++ + def install (file, dir, mode): + f = getDest (file, dir) + print ("install: " + f) + run ('install -d ' + dest + prefix + dir) +- run ('install -m ' + `mode` + ' ' + file + ' ' + dest + prefix + dir + '/') ++ run ('install -m ' + str(mode) + ' ' + file + ' ' + dest + prefix + dir + '/') + + def install_root (file, dir, mode): +- f = getDestRoot (file, dir) +- print ("install: " + f) +- run ('install -d ' + dest + dir) +- run ('install -m ' + `mode` + ' ' + file + ' ' + dest + dir + '/') ++ f = getDestRoot (file, dir) ++ print ("install: " + f) ++ run ('install -d ' + dest + dir) ++ run ('install -m ' + str(mode) + ' ' + file + ' ' + dest + dir + '/') + + def link (dir, file, linkname): + f = getDest (linkname, dir) + print ("install link: " + f) + run ('cd ' + dest + prefix + dir + ' && ln -sf ' + file + ' ' + linkname) +- ++ + parser = OptionParser() + parser.add_option ("-l", "--libdir", dest="libdir", help="path to directory for shared libraries (lib or lib64).") + parser.add_option ("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST") +@@ -91,22 +91,21 @@ else: + + + if os.path.isfile ('build/bin/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION): +- install ('build/bin/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, libdir, 644) +- link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION_MAJOR) +- link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so') ++ install ('build/bin/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, libdir, 644) ++ link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION_MAJOR) ++ link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so') + elif os.path.isfile ('build/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION): +- install ('build/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, libdir, 644) +- link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION_MAJOR) +- link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so') ++ install ('build/libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, libdir, 644) ++ link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION_MAJOR) ++ link (libdir, 'libxmlbird.so.' + version.LIBXMLBIRD_SO_VERSION, ' libxmlbird.so') + elif os.path.isfile ('build/bin/libxmlbird.' + version.LIBXMLBIRD_SO_VERSION + '.dylib'): +- install ('build/bin/libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', libdir, 644) +- link (libdir, 'libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', ' libxmlbird.dylib.' + version.LIBXMLBIRD_SO_VERSION_MAJOR) +- link (libdir, 'libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', ' libxmlbird.dylib') ++ install ('build/bin/libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', libdir, 644) ++ link (libdir, 'libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', ' libxmlbird.dylib.' + version.LIBXMLBIRD_SO_VERSION_MAJOR) ++ link (libdir, 'libxmlbird-' + version.LIBXMLBIRD_SO_VERSION + '.dylib', ' libxmlbird.dylib') + else: +- print ("Can't find libxmlbird.") +- exit (1) ++ print ("Can't find libxmlbird.") ++ exit (1) + + install ('build/xmlbird/xmlbird.h', '/include', 644) + install ('build/xmlbird.vapi', '/share/vala/vapi', 644) + install ('build/xmlbird.pc', libdir + '/pkgconfig', 644) +- |