diff options
| author |   Guy Martin <gmsoft@gentoo.org> | 2006-06-02 20:38:24 +0000 |
|---|---|---|
| committer | Guy Martin <gmsoft@gentoo.org> | 2006-06-02 20:38:24 +0000 |
| commit | 828803338d71685653357778b5f6a9c6fe9d9e47 (patch) | |
| tree | eee79ada44e8e6e6d986fd524a89fae5c45b9225 /x11-libs/qt/files | |
| parent | version bump (diff) | |
| download | historical-828803338d71685653357778b5f6a9c6fe9d9e47.tar.gz historical-828803338d71685653357778b5f6a9c6fe9d9e47.tar.bz2 historical-828803338d71685653357778b5f6a9c6fe9d9e47.zip | |
Fixed parisc asm to build on linux.
Package-Manager: portage-2.0.54-r2
Diffstat (limited to 'x11-libs/qt/files')
| -rw-r--r-- | x11-libs/qt/files/digest-qt-4.1.3 | 2 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt4-parisc-linux.diff | 35 |
2 files changed, 35 insertions, 2 deletions
diff --git a/x11-libs/qt/files/digest-qt-4.1.3 b/x11-libs/qt/files/digest-qt-4.1.3 index 7f09c54afeab..49f91c518173 100644 --- a/x11-libs/qt/files/digest-qt-4.1.3 +++ b/x11-libs/qt/files/digest-qt-4.1.3 @@ -1,3 +1 @@ MD5 c6fc6934bfca458dde6e6370a2ed0101 qt-x11-opensource-src-4.1.3.tar.gz 32200887 -RMD160 ecd103f99b2d1ca4b88e749faee5553b8c1c53e2 qt-x11-opensource-src-4.1.3.tar.gz 32200887 -SHA256 1323af63fcb0b8aef52b90a6a2b81dbe1d7d929ba3ef02209940536c3ec06143 qt-x11-opensource-src-4.1.3.tar.gz 32200887 diff --git a/x11-libs/qt/files/qt4-parisc-linux.diff b/x11-libs/qt/files/qt4-parisc-linux.diff new file mode 100644 index 000000000000..5e7c262fac03 --- /dev/null +++ b/x11-libs/qt/files/qt4-parisc-linux.diff @@ -0,0 +1,35 @@ +diff -uNr qt-x11-opensource-src-4.1.3.orig/src/corelib/arch/parisc/arch.pri qt-x11-opensource-src-4.1.3/src/corelib/arch/parisc/arch.pri +--- qt-x11-opensource-src-4.1.3.orig/src/corelib/arch/parisc/arch.pri 2006-06-02 15:35:32.000000000 +0200 ++++ qt-x11-opensource-src-4.1.3/src/corelib/arch/parisc/arch.pri 2006-06-02 15:39:49.000000000 +0200 +@@ -8,6 +8,14 @@ + DEPENDPATH += $$ARCH_CPP;$$ARCH_H + + HEADERS += $$ARCH_H/qatomic.h +-SOURCES += $$ARCH_CPP/q_ldcw.s \ +- $$ARCH_CPP/qatomic.cpp ++SOURCES += $$ARCH_CPP/qatomic.cpp ++ ++UNAME = $$system(uname -s) ++ ++contains( UNAME, [lL]inux ) { ++ SOURCES += $$ARCH_CPP/q_ldcw-Linux.s ++} else { ++ SOURCES += $$ARCH_CPP/q_ldcw.s ++} ++ + +diff -uNr qt-x11-opensource-src-4.1.3.orig/src/corelib/arch/parisc/q_ldcw-Linux.s qt-x11-opensource-src-4.1.3/src/corelib/arch/parisc/q_ldcw-Linux.s +--- qt-x11-opensource-src-4.1.3.orig/src/corelib/arch/parisc/q_ldcw-Linux.s 1970-01-01 01:00:00.000000000 +0100 ++++ qt-x11-opensource-src-4.1.3/src/corelib/arch/parisc/q_ldcw-Linux.s 2006-06-02 15:36:02.000000000 +0200 +@@ -0,0 +1,11 @@ ++ ++ .align 4 ++ .text ++ .EXPORT q_ldcw,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR ++q_ldcw: ++ .PROC ++ .CALLINFO FRAME=0,CALLS,SAVE_RP ++ ldcw 0(%r26),%r1 ++ bv %r0(%r2) ++ copy %r1,%r28 ++ .PROCEND |