← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openoffice.org-l10n/karmic

« back to all changes in this revision

Viewing changes to ooo-build/patches/dev300/odk-use-correct-L.diff

  • Committer: Bazaar Package Importer
  • Author(s): Chris Cheney
  • Date: 2009-05-26 18:00:00 UTC
  • Revision ID: james.westby@ubuntu.com-20090526180000-t5otxzhj1rru5ovt
Tags: 1:3.1.0-3ubuntu2
* Copy of the openoffice.org source.
  - debian/changelog: Change source name.
  - debian/control.in: Change source name.
  - debian/control: Regenerate control file.

* Correct path to splitgsi in convert2po.
* Disable gsi-export for Rosetta due to bug in localize.pl.
* Reenable building on sparc.
* Switch boost to 1.38.
* Resynchronise with ooo-build-3-1 (271b85e5ce6b601d75d0693b9c937d1eabd069dc).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/dev300/odk-use-correct-L.diff
 
1
Index: setsdkenv_unix.sh.in
 
2
===================================================================
 
3
--- odk/setsdkenv_unix.sh.in    (Revision 271835)
 
4
+++ odk/setsdkenv_unix.sh.in    (Arbeitskopie)
 
5
@@ -278,34 +278,37 @@
 
6
     export STLDEBUG
 
7
 fi
 
8
 
 
9
-# For URE, prepare symbolic links for libraries:
 
10
-rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \
 
11
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
 
12
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
 
13
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
 
14
+if [ "$platform" != "Mac OS X" ]; then
 
15
+    # For URE, prepare symbolic links for libraries:
 
16
+    rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \
 
17
+        "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
 
18
+        "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
 
19
+        "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
 
20
 
 
21
-if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
 
22
-then
 
23
-    rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
 
24
-fi
 
25
+    if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
 
26
+    then
 
27
+        rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
 
28
+    fi
 
29
 
 
30
 
 
31
-if [ "${OO_SDK_URE_HOME}" ]
 
32
-then
 
33
+    if [ "${OO_SDK_URE_HOME}" ]
 
34
+    then
 
35
     mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
 
36
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
 
37
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
 
38
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
 
39
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
 
40
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
 
41
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
 
42
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
 
43
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
 
44
+        ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
 
45
+            "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
 
46
+        ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
 
47
+            "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
 
48
+        ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
 
49
+            "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
 
50
+        ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
 
51
+            "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
 
52
 
 
53
-    if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
 
54
-    then
 
55
-       ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
 
56
-           "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
 
57
+        if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
 
58
+        then
 
59
+           ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
 
60
+               "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
 
61
+        fi
 
62
+
 
63
     fi
 
64
 
 
65
 fi
 
66
Index: setsdkenv_unix.csh.in
 
67
===================================================================
 
68
--- odk/setsdkenv_unix.csh.in   (Revision 271798)
 
69
+++ odk/setsdkenv_unix.csh.in   (Arbeitskopie)
 
70
@@ -236,32 +236,34 @@
 
71
     setenv STLDEBUG ""
 
72
 endif
 
73
 
 
74
-
 
75
-# For URE, prepare symbolic links for libraries:
 
76
-rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.so" \
 
77
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
 
78
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
 
79
-    "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
 
80
-
 
81
-if ( -e "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
 
82
-    rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
 
83
-endif
 
84
-
 
85
-if ( "${OO_SDK_URE_HOME}" != "" ) then
 
86
-    mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
 
87
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
 
88
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
 
89
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
 
90
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
 
91
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
 
92
-        "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
 
93
-    ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
 
94
+if ( "$platform" != "Mac OS X" ) then
 
95
+    # For URE, prepare symbolic links for libraries:
 
96
+    rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.so" \
 
97
+        "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
 
98
+        "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
 
99
         "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
 
100
-
 
101
-    if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
 
102
-       ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
 
103
-           "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
 
104
+    
 
105
+    if ( -e "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
 
106
+        rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
 
107
     endif
 
108
+    
 
109
+    if ( "${OO_SDK_URE_HOME}" != "" ) then
 
110
+        mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
 
111
+        ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
 
112
+            "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
 
113
+        ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
 
114
+            "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
 
115
+        ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
 
116
+            "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
 
117
+        ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
 
118
+            "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
 
119
+    
 
120
+        if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
 
121
+       ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
 
122
+           "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
 
123
+        endif
 
124
+    
 
125
+    endif
 
126
 
 
127
 endif
 
128
 
 
129
Index: settings/settings.mk
 
130
===================================================================
 
131
--- odk/settings/settings.mk    (Revision 271835)
 
132
+++ odk/settings/settings.mk    (Arbeitskopie)
 
133
@@ -216,7 +216,7 @@
 
134
 COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) -M $(PRJ)/settings/component.uno.map
 
135
 
 
136
 EXE_LINK_FLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -Bdirect -z defs
 
137
-LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)"
 
138
+LINK_LIBS=-L$(OUT)/lib -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
 
139
 LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
 
140
 
 
141
 ifeq "$(PROCTYPE)" "sparc64"
 
142
@@ -362,7 +362,7 @@
 
143
 
 
144
 #EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
 
145
 EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive
 
146
-LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)"
 
147
+LINK_LIBS=-L$(OUT)/lib -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
 
148
 LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
 
149
 
 
150
 ifneq "$(OO_SDK_URE_HOME)" ""
 
151
@@ -570,7 +570,7 @@
 
152
 
 
153
 EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined 
 
154
 #EXE_LINK_FLAGS+=-Wl,-export-dynamic -Wl,-z,defs
 
155
-LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS)
 
156
+LINK_LIBS=-L$(OUT)/lib -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)" $(PTHREAD_LIBS)
 
157
 LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
 
158
 
 
159
 ifneq "$(OO_SDK_URE_HOME)" ""