1
0
forked from pool/virtualbox

Accepting request 60271 from Virtualization:VirtualBox_backports

The python package isn't installed correctly, and contains an unnecessary shared library due to a build / config bug.  It is also missing pre-compiled python (pyc).

OBS-URL: https://build.opensuse.org/request/show/60271
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=29
This commit is contained in:
Michal Seben 2011-02-08 07:32:31 +00:00 committed by Git OBS Bridge
parent 3d1e51595e
commit dfc3f3acc1
3 changed files with 1716 additions and 27 deletions

View File

@ -0,0 +1,47 @@
--- VirtualBox-4.0.2_OSE.orig/src/libs/xpcom18a4/python/gen_python_deps.py 2011-01-14 20:15:09.000000000 +0000
+++ VirtualBox-4.0.2_OSE/src/libs/xpcom18a4/python/gen_python_deps.py 2011-02-07 05:36:42.427567000 +0000
@@ -68,7 +68,7 @@
else:
multi = 1
- if multi == 0:
+ if not multi:
prefixes = ["/usr"]
versions = [str(sys.version_info[0])+'.'+str(sys.version_info[1])]
@@ -86,22 +86,23 @@
for v in versions:
for p in prefixes:
c = checkPair(p, v, dllpre, dllsuff, bitness_magic)
- if c is not None:
+ if c:
known[v] = c
break
- keys = known.keys()
- # we want default to be the lowest versioned Python
- keys.sort()
- d = None
# We need separator other than newline, to sneak through $(shell)
sep = "|"
- for k in keys:
- if d is None:
- d = k
- vers = k.replace('.', '')
- print_vars(vers, known[k], sep, bitness_magic)
- if d is not None:
- print_vars("DEF", known[d], sep, bitness_magic)
+
+ if not known:
+ # this type of problem should be detected in configure
+ # print_vars("DEF", defaultpaths, sep, bitness_magic)
+ pass
+ if multi:
+ for ver, paths in known.items():
+ print_vars(ver.replace('.', ''), paths, sep, bitness_magic)
+ else:
+ ver = versions[0]
+ paths = known[ver]
+ print_vars(ver.replace('.', ''), paths, sep, bitness_magic)
if __name__ == '__main__':
main(sys.argv)

15
vbox-xpcom-kmk.diff Normal file
View File

@ -0,0 +1,15 @@
--- VirtualBox-4.0.2_OSE.orig/src/libs/xpcom18a4/Makefile.kmk 2011-01-14 20:19:30.000000000 +0000
+++ VirtualBox-4.0.2_OSE/src/libs/xpcom18a4/Makefile.kmk 2011-02-05 18:09:05.797482000 +0000
@@ -471,9 +471,11 @@
xpidl_CFLAGS = \
$(libIDL_config_cflags)
xpidl_LDFLAGS = \
- $(libIDL_config_libs)
+ $(filter-out -l%,$(libIDL_config_libs))
xpidl_LDFLAGS.linux = \
$(VBOX_LD_as_needed)
+ xpidl_LIBS = \
+ $(patsubst -l%,%,$(filter -l%,$(libIDL_config_libs)))
endif
#

File diff suppressed because it is too large Load Diff