| 1 |
keri 08/08/26 07:33:13 |
| 2 |
|
| 3 |
Added: mozart-1.4.0-dss-libpath.patch |
| 4 |
Log: |
| 5 |
Ensure compiled libdss is used during src_test |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-lang/mozart/files/mozart-1.4.0-dss-libpath.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/files/mozart-1.4.0-dss-libpath.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mozart/files/mozart-1.4.0-dss-libpath.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mozart-1.4.0-dss-libpath.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur mozart-1.4.0.20080704.orig/share/Makefile.boot.in mozart-1.4.0.20080704/share/Makefile.boot.in |
| 17 |
--- mozart-1.4.0.20080704.orig/share/Makefile.boot.in 2004-02-18 20:04:24.000000000 +0000 |
| 18 |
+++ mozart-1.4.0.20080704/share/Makefile.boot.in 2008-08-26 03:01:04.000000000 +0000 |
| 19 |
@@ -38,6 +38,7 @@ |
| 20 |
|
| 21 |
EXE_EXT=@EXE_EXT@ |
| 22 |
|
| 23 |
+BOOTDSS=$(BUILDTOP)/platform/dss |
| 24 |
BOOTEMU=$(BUILDTOP)/platform/emulator/@EMULATOR_EXE@ |
| 25 |
BOOTENG=$(BUILDTOP)/share/ozengine.sh |
| 26 |
BOOTCOM=$(BOOTENG) $(BUILDTOP)/share/lib/ozc$(EXE_EXT) |
| 27 |
@@ -111,8 +112,15 @@ |
| 28 |
endif |
| 29 |
endif |
| 30 |
|
| 31 |
+ifdef @LD_VAR@ |
| 32 |
+LD_VAR=$(BOOTDSS):$(@LD_VAR@) |
| 33 |
+else |
| 34 |
+LD_VAR=$(BOOTDSS) |
| 35 |
+endif |
| 36 |
+ |
| 37 |
boot-%: |
| 38 |
$(MAKE) $* \ |
| 39 |
+ @LD_VAR@=$(LD_VAR) \ |
| 40 |
OZEMULATOR=$(BOOTEMU) \ |
| 41 |
OZENGINE=$(BOOTENG) \ |
| 42 |
OZC="$(BOOTCOM)" \ |
| 43 |
diff -ur mozart-1.4.0.20080704.orig/share/configure mozart-1.4.0.20080704/share/configure |
| 44 |
--- mozart-1.4.0.20080704.orig/share/configure 2004-04-01 10:48:04.000000000 +0000 |
| 45 |
+++ mozart-1.4.0.20080704/share/configure 2008-08-26 03:00:42.000000000 +0000 |
| 46 |
@@ -1408,12 +1408,20 @@ |
| 47 |
;; |
| 48 |
esac |
| 49 |
|
| 50 |
- |
| 51 |
- |
| 52 |
- |
| 53 |
- |
| 54 |
- |
| 55 |
- |
| 56 |
+case $platform in |
| 57 |
+win32*) |
| 58 |
+ LD_VAR=PATH |
| 59 |
+ ;; |
| 60 |
+darwin*) |
| 61 |
+ LD_VAR=DYLD_LIBRARY_PATH |
| 62 |
+ ;; |
| 63 |
+aix*) |
| 64 |
+ LD_VAR=LIBPATH |
| 65 |
+ ;; |
| 66 |
+*) |
| 67 |
+ LD_VAR=LD_LIBRARY_PATH |
| 68 |
+ ;; |
| 69 |
+esac |
| 70 |
|
| 71 |
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 |
| 72 |
echo "configure:1420: checking whether ln -s works" >&5 |
| 73 |
@@ -3896,6 +3904,7 @@ |
| 74 |
s%@WINOZTOOLCXXFLAGS@%$WINOZTOOLCXXFLAGS%g |
| 75 |
s%@WINOZTOOLLDFLAGS@%$WINOZTOOLLDFLAGS%g |
| 76 |
s%@EXE_EXT@%$EXE_EXT%g |
| 77 |
+s%@LD_VAR@%$LD_VAR%g |
| 78 |
s%@LN_S@%$LN_S%g |
| 79 |
s%@M4@%$M4%g |
| 80 |
s%@PERL@%$PERL%g |
Archives